diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ServiceWorkOrdersTypeController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ServiceWorkOrdersTypeController.java new file mode 100644 index 0000000..90c08a0 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ServiceWorkOrdersTypeController.java @@ -0,0 +1,106 @@ +package org.dromara.property.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.property.domain.bo.ServiceWorkOrdersTypeBo; +import org.dromara.property.domain.vo.ServiceWorkOrdersTypeVo; +import org.dromara.property.service.IServiceWorkOrdersTypeService; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 【工单类型】 + * 前端访问路由地址为:/system/workOrdersType + * + * @author mocheng + * @date 2025-07-09 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/workOrdersType") +public class ServiceWorkOrdersTypeController extends BaseController { + + private final IServiceWorkOrdersTypeService serviceWorkOrdersTypeService; + + /** + * 查询【工单类型】列表 + */ + @SaCheckPermission("system:workOrdersType:list") + @GetMapping("/list") + public TableDataInfo list(ServiceWorkOrdersTypeBo bo, PageQuery pageQuery) { + return serviceWorkOrdersTypeService.queryPageList(bo, pageQuery); + } + + /** + * 导出【工单类型】列表 + */ + @SaCheckPermission("system:workOrdersType:export") + @Log(title = "【导出工单类型】", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ServiceWorkOrdersTypeBo bo, HttpServletResponse response) { + List list = serviceWorkOrdersTypeService.queryList(bo); + ExcelUtil.exportExcel(list, "【工单类型】", ServiceWorkOrdersTypeVo.class, response); + } + + /** + * 获取【工单类型】详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("system:workOrdersType:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + return R.ok(serviceWorkOrdersTypeService.queryById(id)); + } + + /** + * 新增【工单类型】 + */ + @SaCheckPermission("system:workOrdersType:add") + @Log(title = "【新增工单类型】", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ServiceWorkOrdersTypeBo bo) { + return toAjax(serviceWorkOrdersTypeService.insertByBo(bo)); + } + + /** + * 修改【工单类型】 + */ + @SaCheckPermission("system:workOrdersType:edit") + @Log(title = "【工单类型】", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ServiceWorkOrdersTypeBo bo) { + return toAjax(serviceWorkOrdersTypeService.updateByBo(bo)); + } + + /** + * 删除【工单类型】 + * + * @param ids 主键串 + */ + @SaCheckPermission("system:workOrdersType:remove") + @Log(title = "【工单类型】", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("ids") Long[] ids) { + return toAjax(serviceWorkOrdersTypeService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServiceWorkOrders.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServiceWorkOrders.java index d81b717..84bc78d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServiceWorkOrders.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServiceWorkOrders.java @@ -42,12 +42,12 @@ public class ServiceWorkOrders extends TenantEntity { /** * 工单类型 */ - private Long type; + private int type; /** * 状态 */ - private Long status; + private int status; /** * 派单时间 @@ -92,7 +92,7 @@ public class ServiceWorkOrders extends TenantEntity { /** * 是否超时 */ - private Long isTimeOut; + private int isTimeOut; /** * 创建人id diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServiceWorkOrdersType.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServiceWorkOrdersType.java new file mode 100644 index 0000000..1fd0801 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServiceWorkOrdersType.java @@ -0,0 +1,75 @@ +package org.dromara.property.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 【工单类型】对象 service_work_orders_type + * + * @author mocheng + * @date 2025-07-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("service_work_orders_type") +public class ServiceWorkOrdersType extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id") + private Long id; + + /** + * 工单类型编号 + */ + private String orderTypeNo; + + /** + * 工单类型名称 + */ + private String orderTypeName; + + /** + * 运作模式 + */ + private String operationMode; + + /** + * 排序值 + */ + private int sort; + + /** + * 累计工单数量 + */ + private int number; + + /** + * 是否支持转单(0支持,1不支持) + */ + private int isTransfers; + + /** + * 创建人id + */ + private Long createById; + + /** + * 更新人id + */ + private Long updateById; + + /** + * 搜索值 + */ + private String searchValue; + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/MeetBookingBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/MeetBookingBo.java index 37fe972..9e1f749 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/MeetBookingBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/MeetBookingBo.java @@ -39,11 +39,6 @@ public class MeetBookingBo extends BaseEntity { */ private Long meetId; - /** - * 会议室地址 - */ - private String meetLocation; - /** * 所属单位 */ @@ -54,10 +49,6 @@ public class MeetBookingBo extends BaseEntity { */ private String person; - /** - * 联系方式 - */ - private String phone; /** * 预定开始时间 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ServiceWorkOrdersBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ServiceWorkOrdersBo.java index 29f7db8..e70aa69 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ServiceWorkOrdersBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ServiceWorkOrdersBo.java @@ -12,7 +12,7 @@ import org.dromara.property.domain.ServiceWorkOrders; import java.util.Date; /** - * 【请填写功能名称】业务对象 service_work_orders + * 【工单处理】业务对象 service_work_orders * * @author mocheng * @date 2025-07-07 @@ -41,12 +41,12 @@ public class ServiceWorkOrdersBo extends BaseEntity { /** * 工单类型 */ - private Long type; + private int type; /** * 状态 */ - private Long status; + private int status; /** * 派单时间 @@ -91,7 +91,7 @@ public class ServiceWorkOrdersBo extends BaseEntity { /** * 是否超时 */ - private Long isTimeOut; + private int isTimeOut; /** * 创建人id diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ServiceWorkOrdersTypeBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ServiceWorkOrdersTypeBo.java new file mode 100644 index 0000000..3951c90 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/ServiceWorkOrdersTypeBo.java @@ -0,0 +1,73 @@ +package org.dromara.property.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.property.domain.ServiceWorkOrdersType; + +/** + * 【工单类型】业务对象 service_work_orders_type + * + * @author mocheng + * @date 2025-07-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ServiceWorkOrdersType.class, reverseConvertGenerate = false) +public class ServiceWorkOrdersTypeBo extends BaseEntity { + + /** + * id + */ + @NotNull(message = "id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 工单类型编号 + */ + private String orderTypeNo; + + /** + * 工单类型名称 + */ + private String orderTypeName; + + /** + * 运作模式 + */ + private String operationMode; + + /** + * 排序值 + */ + private int sort; + + /** + * 累计工单数量 + */ + private int number; + + /** + * 是否支持转单(0支持,1不支持) + */ + private int isTransfers; + + /** + * 创建人id + */ + private Long createById; + + /** + * 更新人id + */ + private Long updateById; + + /** + * 搜索值 + */ + private String searchValue; + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersTypeVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersTypeVo.java new file mode 100644 index 0000000..a5b4276 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersTypeVo.java @@ -0,0 +1,89 @@ +package org.dromara.property.domain.vo; + +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.property.domain.ServiceWorkOrdersType; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 【工单类型】视图对象 service_work_orders_type + * + * @author mocheng + * @date 2025-07-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ServiceWorkOrdersType.class) +public class ServiceWorkOrdersTypeVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ExcelProperty(value = "id") + private Long id; + + /** + * 工单类型编号 + */ + @ExcelProperty(value = "工单类型编号") + private String orderTypeNo; + + /** + * 工单类型名称 + */ + @ExcelProperty(value = "工单类型名称") + private String orderTypeName; + + /** + * 运作模式 + */ + @ExcelProperty(value = "运作模式") + private String operationMode; + + /** + * 排序值 + */ + @ExcelProperty(value = "排序值") + private int sort; + + /** + * 累计工单数量 + */ + @ExcelProperty(value = "累计工单数量") + private int number; + + /** + * 是否支持转单(0支持,1不支持) + */ + @ExcelProperty(value = "是否支持转单(0支持,1不支持)") + private int isTransfers; + + /** + * 创建人id + */ + @ExcelProperty(value = "创建人id") + private Long createById; + + /** + * 更新人id + */ + @ExcelProperty(value = "更新人id") + private Long updateById; + + /** + * 搜索值 + */ + @ExcelProperty(value = "搜索值") + private String searchValue; + + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersVo.java index 6032f45..d20b40b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersVo.java @@ -13,7 +13,7 @@ import java.util.Date; /** - * 【请填写功能名称】视图对象 service_work_orders + * 【工单处理】视图对象 service_work_orders * * @author mocheng * @date 2025-07-07 @@ -48,13 +48,13 @@ public class ServiceWorkOrdersVo implements Serializable { * 工单类型 */ @ExcelProperty(value = "工单类型") - private Long type; + private int type; /** * 状态 */ @ExcelProperty(value = "状态") - private Long status; + private int status; /** * 派单时间 @@ -108,7 +108,7 @@ public class ServiceWorkOrdersVo implements Serializable { * 是否超时 */ @ExcelProperty(value = "是否超时") - private Long isTimeOut; + private int isTimeOut; /** * 创建人id diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServiceWorkOrdersMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServiceWorkOrdersMapper.java index e6c9a8a..7c81441 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServiceWorkOrdersMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServiceWorkOrdersMapper.java @@ -6,7 +6,7 @@ import org.dromara.property.domain.ServiceWorkOrders; import org.dromara.property.domain.vo.ServiceWorkOrdersVo; /** - * 【请填写功能名称】Mapper接口 + * 【工单处理】Mapper接口 * * @author mocheng * @date 2025-07-07 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServiceWorkOrdersTypeMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServiceWorkOrdersTypeMapper.java new file mode 100644 index 0000000..ab4f88d --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServiceWorkOrdersTypeMapper.java @@ -0,0 +1,17 @@ +package org.dromara.property.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.property.domain.ServiceWorkOrdersType; +import org.dromara.property.domain.vo.ServiceWorkOrdersTypeVo; + +/** + * 【工单类型】Mapper接口 + * + * @author mocheng + * @date 2025-07-09 + */ +@Mapper +public interface ServiceWorkOrdersTypeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IServiceWorkOrdersService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IServiceWorkOrdersService.java index 16163d8..632a74f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IServiceWorkOrdersService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IServiceWorkOrdersService.java @@ -9,7 +9,7 @@ import java.util.Collection; import java.util.List; /** - * 【请填写功能名称】Service接口 + * 【工单处理】Service接口 * * @author mocheng * @date 2025-07-07 @@ -17,48 +17,48 @@ import java.util.List; public interface IServiceWorkOrdersService { /** - * 查询【请填写功能名称】 + * 查询【工单处理】 * * @param id 主键 - * @return 【请填写功能名称】 + * @return 【工单处理】 */ ServiceWorkOrdersVo queryById(Long id); /** - * 分页查询【请填写功能名称】列表 + * 分页查询【工单处理】列表 * * @param bo 查询条件 * @param pageQuery 分页参数 - * @return 【请填写功能名称】分页列表 + * @return 【工单处理】分页列表 */ TableDataInfo queryPageList(ServiceWorkOrdersBo bo, PageQuery pageQuery); /** - * 查询符合条件的【请填写功能名称】列表 + * 查询符合条件的【工单处理】列表 * * @param bo 查询条件 - * @return 【请填写功能名称】列表 + * @return 【工单处理】列表 */ List queryList(ServiceWorkOrdersBo bo); /** - * 新增【请填写功能名称】 + * 新增【工单处理】 * - * @param bo 【请填写功能名称】 + * @param bo 【工单处理】 * @return 是否新增成功 */ Boolean insertByBo(ServiceWorkOrdersBo bo); /** - * 修改【请填写功能名称】 + * 修改【工单处理】 * - * @param bo 【请填写功能名称】 + * @param bo 【工单处理】 * @return 是否修改成功 */ Boolean updateByBo(ServiceWorkOrdersBo bo); /** - * 校验并批量删除【请填写功能名称】信息 + * 校验并批量删除【工单处理】信息 * * @param ids 待删除的主键集合 * @param isValid 是否进行有效性校验 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IServiceWorkOrdersTypeService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IServiceWorkOrdersTypeService.java new file mode 100644 index 0000000..a838a21 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IServiceWorkOrdersTypeService.java @@ -0,0 +1,68 @@ +package org.dromara.property.service; + +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.property.domain.bo.ServiceWorkOrdersTypeBo; +import org.dromara.property.domain.vo.ServiceWorkOrdersTypeVo; + +import java.util.Collection; +import java.util.List; + +/** + * 【工单类型】Service接口 + * + * @author mocheng + * @date 2025-07-09 + */ +public interface IServiceWorkOrdersTypeService { + + /** + * 查询【工单类型】 + * + * @param id 主键 + * @return 【工单类型】 + */ + ServiceWorkOrdersTypeVo queryById(Long id); + + /** + * 分页查询【工单类型】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【工单类型】分页列表 + */ + TableDataInfo queryPageList(ServiceWorkOrdersTypeBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的【工单类型】列表 + * + * @param bo 查询条件 + * @return 【工单类型】列表 + */ + List queryList(ServiceWorkOrdersTypeBo bo); + + /** + * 新增【工单类型】 + * + * @param bo 【工单类型】 + * @return 是否新增成功 + */ + Boolean insertByBo(ServiceWorkOrdersTypeBo bo); + + /** + * 修改【工单类型】 + * + * @param bo 【工单类型】 + * @return 是否修改成功 + */ + Boolean updateByBo(ServiceWorkOrdersTypeBo bo); + + /** + * 校验并批量删除【工单类型】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetAttachServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetAttachServiceImpl.java index 63113cf..bbae6f1 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetAttachServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetAttachServiceImpl.java @@ -17,6 +17,7 @@ import org.dromara.property.domain.vo.MeetAttachVo; import org.dromara.property.domain.MeetAttach; import org.dromara.property.mapper.MeetAttachMapper; import org.dromara.property.service.IMeetAttachService; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; @@ -93,6 +94,7 @@ public class MeetAttachServiceImpl implements IMeetAttachService { * @return 是否新增成功 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean insertByBo(MeetAttachBo bo) { MeetAttach add = MapstructUtils.convert(bo, MeetAttach.class); validEntityBeforeSave(add); @@ -110,6 +112,7 @@ public class MeetAttachServiceImpl implements IMeetAttachService { * @return 是否修改成功 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean updateByBo(MeetAttachBo bo) { MeetAttach update = MapstructUtils.convert(bo, MeetAttach.class); validEntityBeforeSave(update); @@ -131,6 +134,7 @@ public class MeetAttachServiceImpl implements IMeetAttachService { * @return 是否删除成功 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java index b73ce1a..f2e9fa5 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java @@ -42,6 +42,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService { private final MeetAttachOrderMapper meetAttachOrderMapper; private final ResidentPersonMapper residentPersonMapper; private final TbRoomMapper roomMapper; + private final MeetMapper meetMapper; private final ResidentUnitMapper residentUnitMapper; /** @@ -54,12 +55,13 @@ public class MeetBookingServiceImpl implements IMeetBookingService { public MeetBookingDetailVo queryById(Long id) { MeetBookingVo meetBookingVo = baseMapper.selectVoById(id); MeetBookingDetailVo meetBookingDetailVo = BeanUtil.copyProperties(meetBookingVo, MeetBookingDetailVo.class); - String locationName = roomMapper.queryRoomName(Long.valueOf(meetBookingDetailVo.getMeetLocation())); + MeetVo meetVo = meetMapper.selectVoById(meetBookingDetailVo.getMeetId()); + String locationName = roomMapper.queryRoomName(Long.valueOf(meetVo.getLocation())); meetBookingDetailVo.setLocationName(locationName); - ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(meetBookingDetailVo.getPerson()); + ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(Long.valueOf(meetBookingVo.getPerson())); meetBookingDetailVo.setPersonName(residentPersonVo.getUserName()); - meetBookingDetailVo.setPerson(residentPersonVo.getPhone()); - ResidentUnitVo residentUnitVo = residentUnitMapper.selectVoById(meetBookingDetailVo.getUnit()); + meetBookingDetailVo.setPhone(residentPersonVo.getPhone()); + ResidentUnitVo residentUnitVo = residentUnitMapper.selectVoById(Long.valueOf(meetBookingVo.getUnit())); meetBookingDetailVo.setUnitName(residentUnitVo.getName()); return meetBookingDetailVo; } @@ -218,17 +220,6 @@ public class MeetBookingServiceImpl implements IMeetBookingService { lqw.orderByAsc(MeetBooking::getId); lqw.like(StringUtils.isNotBlank(bo.getName()), MeetBooking::getName, bo.getName()); lqw.eq(bo.getMeetId() != null, MeetBooking::getMeetId, bo.getMeetId()); - lqw.eq(StringUtils.isNotBlank(bo.getMeetLocation()), MeetBooking::getMeetLocation, bo.getMeetLocation()); - lqw.eq(StringUtils.isNotBlank(bo.getUnit()), MeetBooking::getUnit, bo.getUnit()); - lqw.eq(StringUtils.isNotBlank(bo.getPerson()), MeetBooking::getPerson, bo.getPerson()); - lqw.eq(StringUtils.isNotBlank(bo.getPhone()), MeetBooking::getPhone, bo.getPhone()); - lqw.eq(bo.getScheduledStarttime() != null, MeetBooking::getScheduledStarttime, bo.getScheduledStarttime()); - lqw.eq(bo.getScheduledEndtime() != null, MeetBooking::getScheduledEndtime, bo.getScheduledEndtime()); - // lqw.eq(ObjectUtil.isNotEmpty(bo.getPersonSum()), MeetBooking::getPersonSum, bo.getPersonSum()); - lqw.eq(ObjectUtil.isNotEmpty(bo.getPrice()), MeetBooking::getPrice, bo.getPrice()); - lqw.eq(ObjectUtil.isNotEmpty(bo.getAttach()), MeetBooking::getAttach, bo.getAttach()); - lqw.eq(ObjectUtil.isNotEmpty(bo.getPayState()), MeetBooking::getPayState, bo.getPayState()); - lqw.eq(ObjectUtil.isNotEmpty(bo.getState()), MeetBooking::getState, bo.getState()); return lqw; } @@ -281,6 +272,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService { */ private void validEntityBeforeSave(MeetBooking entity) { //TODO 做一些数据校验,如唯一约束 + } /** @@ -291,6 +283,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService { * @return 是否删除成功 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java index 1c51aa3..e1fc5d6 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java @@ -15,13 +15,14 @@ import org.dromara.property.domain.vo.ServiceWorkOrdersVo; import org.dromara.property.mapper.ServiceWorkOrdersMapper; import org.dromara.property.service.IServiceWorkOrdersService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Collection; import java.util.List; import java.util.Map; /** - * 【请填写功能名称】Service业务层处理 + * 【工单处理】Service业务层处理 * * @author mocheng * @date 2025-07-07 @@ -34,10 +35,10 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService { private final ServiceWorkOrdersMapper baseMapper; /** - * 查询【请填写功能名称】 + * 查询【工单处理】 * * @param id 主键 - * @return 【请填写功能名称】 + * @return 【工单处理】 */ @Override public ServiceWorkOrdersVo queryById(Long id){ @@ -45,11 +46,11 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService { } /** - * 分页查询【请填写功能名称】列表 + * 分页查询【工单处理】列表 * * @param bo 查询条件 * @param pageQuery 分页参数 - * @return 【请填写功能名称】分页列表 + * @return 【工单处理】分页列表 */ @Override public TableDataInfo queryPageList(ServiceWorkOrdersBo bo, PageQuery pageQuery) { @@ -59,10 +60,10 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService { } /** - * 查询符合条件的【请填写功能名称】列表 + * 查询符合条件的【工单处理】列表 * * @param bo 查询条件 - * @return 【请填写功能名称】列表 + * @return 【工单处理】列表 */ @Override public List queryList(ServiceWorkOrdersBo bo) { @@ -76,8 +77,6 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService { lqw.orderByAsc(ServiceWorkOrders::getId); lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), ServiceWorkOrders::getOrderNo, bo.getOrderNo()); lqw.like(StringUtils.isNotBlank(bo.getOrderName()), ServiceWorkOrders::getOrderName, bo.getOrderName()); - lqw.eq(bo.getType() != null, ServiceWorkOrders::getType, bo.getType()); - lqw.eq(bo.getStatus() != null, ServiceWorkOrders::getStatus, bo.getStatus()); lqw.eq(bo.getDispatchTime() != null, ServiceWorkOrders::getDispatchTime, bo.getDispatchTime()); lqw.like(StringUtils.isNotBlank(bo.getInitiatorName()), ServiceWorkOrders::getInitiatorName, bo.getInitiatorName()); lqw.eq(StringUtils.isNotBlank(bo.getInitiatorPhone()), ServiceWorkOrders::getInitiatorPhone, bo.getInitiatorPhone()); @@ -86,20 +85,18 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService { lqw.eq(bo.getPlanCompleTime() != null, ServiceWorkOrders::getPlanCompleTime, bo.getPlanCompleTime()); lqw.eq(bo.getCompleTime() != null, ServiceWorkOrders::getCompleTime, bo.getCompleTime()); lqw.eq(StringUtils.isNotBlank(bo.getServiceEvalua()), ServiceWorkOrders::getServiceEvalua, bo.getServiceEvalua()); - lqw.eq(bo.getIsTimeOut() != null, ServiceWorkOrders::getIsTimeOut, bo.getIsTimeOut()); - lqw.eq(bo.getCreateById() != null, ServiceWorkOrders::getCreateById, bo.getCreateById()); - lqw.eq(bo.getUpdateById() != null, ServiceWorkOrders::getUpdateById, bo.getUpdateById()); lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), ServiceWorkOrders::getSearchValue, bo.getSearchValue()); return lqw; } /** - * 新增【请填写功能名称】 + * 新增【工单处理】 * - * @param bo 【请填写功能名称】 + * @param bo 【工单处理】 * @return 是否新增成功 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean insertByBo(ServiceWorkOrdersBo bo) { ServiceWorkOrders add = MapstructUtils.convert(bo, ServiceWorkOrders.class); validEntityBeforeSave(add); @@ -111,12 +108,13 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService { } /** - * 修改【请填写功能名称】 + * 修改【工单处理】 * - * @param bo 【请填写功能名称】 + * @param bo 【工单处理】 * @return 是否修改成功 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean updateByBo(ServiceWorkOrdersBo bo) { ServiceWorkOrders update = MapstructUtils.convert(bo, ServiceWorkOrders.class); validEntityBeforeSave(update); @@ -131,13 +129,14 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService { } /** - * 校验并批量删除【请填写功能名称】信息 + * 校验并批量删除【工单处理】信息 * * @param ids 待删除的主键集合 * @param isValid 是否进行有效性校验 * @return 是否删除成功 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersTypeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersTypeServiceImpl.java new file mode 100644 index 0000000..e7a9269 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersTypeServiceImpl.java @@ -0,0 +1,139 @@ +package org.dromara.property.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.property.domain.ServiceWorkOrdersType; +import org.dromara.property.domain.bo.ServiceWorkOrdersTypeBo; +import org.dromara.property.domain.vo.ServiceWorkOrdersTypeVo; +import org.dromara.property.mapper.ServiceWorkOrdersTypeMapper; +import org.dromara.property.service.IServiceWorkOrdersTypeService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 【工单类型】Service业务层处理 + * + * @author mocheng + * @date 2025-07-09 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class ServiceWorkOrdersTypeServiceImpl implements IServiceWorkOrdersTypeService { + + private final ServiceWorkOrdersTypeMapper baseMapper; + + /** + * 查询【工单类型】 + * + * @param id 主键 + * @return 【工单类型】 + */ + @Override + public ServiceWorkOrdersTypeVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询【工单类型】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【工单类型】分页列表 + */ + @Override + public TableDataInfo queryPageList(ServiceWorkOrdersTypeBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的【工单类型】列表 + * + * @param bo 查询条件 + * @return 【工单类型】列表 + */ + @Override + public List queryList(ServiceWorkOrdersTypeBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(ServiceWorkOrdersTypeBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(ServiceWorkOrdersType::getId); + lqw.eq(StringUtils.isNotBlank(bo.getOrderTypeNo()), ServiceWorkOrdersType::getOrderTypeNo, bo.getOrderTypeNo()); + lqw.like(StringUtils.isNotBlank(bo.getOrderTypeName()), ServiceWorkOrdersType::getOrderTypeName, bo.getOrderTypeName()); + lqw.eq(StringUtils.isNotBlank(bo.getOperationMode()), ServiceWorkOrdersType::getOperationMode, bo.getOperationMode()); + lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), ServiceWorkOrdersType::getSearchValue, bo.getSearchValue()); + return lqw; + } + + /** + * 新增【工单类型】 + * + * @param bo 【工单类型】 + * @return 是否新增成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(ServiceWorkOrdersTypeBo bo) { + ServiceWorkOrdersType add = MapstructUtils.convert(bo, ServiceWorkOrdersType.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改【工单类型】 + * + * @param bo 【工单类型】 + * @return 是否修改成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(ServiceWorkOrdersTypeBo bo) { + ServiceWorkOrdersType update = MapstructUtils.convert(bo, ServiceWorkOrdersType.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ServiceWorkOrdersType entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除【工单类型】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/ServiceWorkOrdersTypeMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/ServiceWorkOrdersTypeMapper.xml new file mode 100644 index 0000000..3b75daf --- /dev/null +++ b/ruoyi-modules/Property/src/main/resources/mapper/Property/ServiceWorkOrdersTypeMapper.xml @@ -0,0 +1,7 @@ + + + + +