From 3317793834503b7544f2f9ee936dd7da9ab4584a Mon Sep 17 00:00:00 2001 From: yuyongle <1150359267@qq.com> Date: Wed, 10 Sep 2025 10:25:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95=E7=B1=BB?= =?UTF-8?q?=E5=9E=8Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/ServiceWorkOrdersTypeVo.java | 6 ++++ .../domain/vo/cleanOrderVo/CleanOrderVo.java | 6 ---- .../ServiceWorkOrdersTypeServiceImpl.java | 27 ++++++++++---- .../cleanOrderImpl/CleanOrderServiceImpl.java | 35 +------------------ 4 files changed, 27 insertions(+), 47 deletions(-) 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 index ec128904..c3c026d0 100644 --- 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 @@ -39,6 +39,12 @@ public class ServiceWorkOrdersTypeVo implements Serializable { @ExcelProperty(value = "工单类型编号") private String orderTypeNo; + /** + * 工单数量 + */ + @ExcelProperty(value = "工单数量") + private Integer orderQuantity; + /** * 工单类型名称 */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/cleanOrderVo/CleanOrderVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/cleanOrderVo/CleanOrderVo.java index d03d059b..c473ad7e 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/cleanOrderVo/CleanOrderVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/cleanOrderVo/CleanOrderVo.java @@ -155,10 +155,4 @@ public class CleanOrderVo implements Serializable { private List cleanList; private List relationList; - private List recordVoList; - - - - - } 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 index f425144e..d0183ac3 100644 --- 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 @@ -14,9 +14,11 @@ 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.ServiceWorkOrders; 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.ServiceWorkOrdersMapper; import org.dromara.property.mapper.ServiceWorkOrdersTypeMapper; import org.dromara.property.service.IServiceWorkOrdersTypeService; import org.dromara.system.api.RemoteDeptService; @@ -41,9 +43,11 @@ import java.util.Collection; public class ServiceWorkOrdersTypeServiceImpl implements IServiceWorkOrdersTypeService { private final ServiceWorkOrdersTypeMapper baseMapper; + private final ServiceWorkOrdersMapper serviceWorkOrdersMapper; @DubboReference private RemoteDeptService remoteDeptService; + /** * 查询【工单类型】 * @@ -52,10 +56,18 @@ public class ServiceWorkOrdersTypeServiceImpl implements IServiceWorkOrdersTypeS */ @Override public ServiceWorkOrdersTypeVo queryById(Long id) { - ServiceWorkOrdersTypeVo serviceWorkOrdersTypeVo= baseMapper.selectVoById(id); - Long deptId = serviceWorkOrdersTypeVo.getDeptId(); - RemoteDeptVo remoteDeptVo = remoteDeptService.selectDeptVoById(deptId); - serviceWorkOrdersTypeVo.setDeptName(remoteDeptVo.getDeptName()); + ServiceWorkOrdersTypeVo serviceWorkOrdersTypeVo = baseMapper.selectVoById(id); + if (ObjectUtil.isNotEmpty(serviceWorkOrdersTypeVo)) { + Long deptId = serviceWorkOrdersTypeVo.getDeptId(); + RemoteDeptVo remoteDeptVo = remoteDeptService.selectDeptVoById(deptId); + serviceWorkOrdersTypeVo.setDeptName(remoteDeptVo.getDeptName()); + //查询工单数量 + List serviceWorkOrdersList = serviceWorkOrdersMapper.selectList( + new LambdaQueryWrapper() + .eq(ServiceWorkOrders::getType, id) + ); + serviceWorkOrdersTypeVo.setOrderQuantity(serviceWorkOrdersList.size()); + } return serviceWorkOrdersTypeVo; } @@ -87,7 +99,7 @@ public class ServiceWorkOrdersTypeServiceImpl implements IServiceWorkOrdersTypeS @Override public List queryList(ServiceWorkOrdersTypeBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - List serviceWorkOrdersTypeVoList= baseMapper.selectVoList(lqw); + List serviceWorkOrdersTypeVoList = baseMapper.selectVoList(lqw); serviceWorkOrdersTypeVoList.stream().forEach(vo -> { Long deptId = vo.getDeptId(); RemoteDeptVo remoteDeptVo = remoteDeptService.selectDeptVoById(deptId); @@ -107,7 +119,7 @@ public class ServiceWorkOrdersTypeServiceImpl implements IServiceWorkOrdersTypeS lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), ServiceWorkOrdersType::getSearchValue, bo.getSearchValue()); lqw.eq(ObjectUtil.isNotEmpty(bo.getParentId()), ServiceWorkOrdersType::getParentId, bo.getParentId()); lqw.isNull(bo.getFilterSubNodes() != null && bo.getFilterSubNodes(), ServiceWorkOrdersType::getParentId); - lqw.ne(bo.getExcludeId()!=null,ServiceWorkOrdersType::getId,bo.getExcludeId()); + lqw.ne(bo.getExcludeId() != null, ServiceWorkOrdersType::getId, bo.getExcludeId()); return lqw; } @@ -204,7 +216,8 @@ public class ServiceWorkOrdersTypeServiceImpl implements IServiceWorkOrdersTypeS return tree; } - //APP端 + //APP端 + /** * 查询【工单类型】树结构 * diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/cleanOrderImpl/CleanOrderServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/cleanOrderImpl/CleanOrderServiceImpl.java index 884f6dba..3482735d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/cleanOrderImpl/CleanOrderServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/cleanOrderImpl/CleanOrderServiceImpl.java @@ -95,27 +95,7 @@ public class CleanOrderServiceImpl implements ICleanOrderService { CleanOrderVo cleanOrderVo = MapstructUtils.convert(cleanOrder, CleanOrderVo.class); cleanOrderVo.setCleanList(cleanList); cleanOrderVo.setRelationList(cleanRelationList); -// //查询订单记录 -// List cleanOrderRecordVos = cleanOrderRecordMapper.selectVoList(Wrappers.lambdaQuery().eq(CleanOrderRecord::getCleanOrderId, id)); -// if(CollUtil.isNotEmpty(cleanOrderRecordVos)){ -// cleanOrderRecordVos.stream().forEach(item -> { -// //查询指派人名称 -// if(ObjectUtil.isNotEmpty(item.getHandler())){ -// RemoteUserVo userInfo = remoteUserService.getUserInfoById(item.getHandler()); -// item.setHandlerText(userInfo.getNickName()); -// } -// //查询发起人名称 -// if(ObjectUtil.isNotEmpty(item.getInitiatorPeople())){ -// RemoteUserVo userInfo = remoteUserService.getUserInfoById(item.getInitiatorPeople()); -// item.setInitiatorPeopleText(userInfo.getNickName()); -// } -// -// }); -// cleanOrderVo.setRecordVoList(cleanOrderRecordVos); -// } - return cleanOrderVo; - } /** @@ -256,20 +236,7 @@ public class CleanOrderServiceImpl implements ICleanOrderService { /** * 保存后的数据校验 */ - private void validEntityBeforeSave(CleanOrderBo bo) { - //当前登录用户 - Long userId = LoginHelper.getUserId(); - //TODO 做一些数据校验,如唯一约束 - cleanOrderRecordMapper.insert( - new CleanOrderRecord() - .setCleanOrderId(bo.getId()) - .setStatus("1") - .setIsSign("1") - .setInitiatorPeople(userId) - .setServiceEvaluaText(bo.getServiceEvaluaText()) - .setIsAbnormal("1") - ); - } + private void validEntityBeforeSave(CleanOrderBo bo) {} /** * 校验并批量删除保洁订单信息