From 1cc77bdedcf715e3d0cae41651d0467c0484d219 Mon Sep 17 00:00:00 2001 From: yuyongle <1150359267@qq.com> Date: Tue, 9 Sep 2025 18:15:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=9D=E6=B4=81=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cleanOrderImpl/CleanOrderServiceImpl.java | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) 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 c9443b09..884f6dba 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,24 +95,24 @@ 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); - } +// //查询订单记录 +// 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; @@ -198,7 +198,7 @@ public class CleanOrderServiceImpl implements ICleanOrderService { boolean flag = baseMapper.insert(add) > 0; if (flag){ bo.setId(add.getId()); - validEntityBeforeSave(bo); + // validEntityBeforeSave(bo); } //取出clean_order表中的所有clean数据