From 0259400fe4590be7fe84507261e646a4604cac12 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 5 Aug 2022 11:37:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4=E3=80=81?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4=EF=BC=8C=E5=8F=91=E9=80=81?= =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF=E6=97=B6=EF=BC=8C=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E4=BA=BA=E8=AE=BE=E7=BD=AE=E4=B8=BA=20=E8=AF=A5?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=9A=84studio=E3=80=82=20=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=80=A7=E7=A1=AE=E8=AE=A4=EF=BC=8C=E5=8F=91=E9=80=81=E9=A3=9E?= =?UTF-8?q?=E4=B9=A6=E6=B6=88=E6=81=AF=E6=97=B6=EF=BC=8C=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E4=BA=BA=E8=AE=BE=E7=BD=AE=E4=B8=BA=20=E5=90=84=E4=B8=AA?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=9C=A8=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E4=B8=AD=E8=AE=BE=E7=BD=AE=E7=9A=84=E5=8F=91=E8=B5=B7=E4=BA=BA?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 80 ++++++++++++++++--- ...ectTaskInventoryFeedbackEOServiceImpl.java | 32 +++++++- 2 files changed, 101 insertions(+), 11 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index add32a051..6c9a1a3f1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1290,6 +1290,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl() .lambda().eq(ProjectLibraryBase::getId, projectLibraryId)); + // studio信息 + SysUser studioUserInfo = this.sysUserMapper.selectOne( + new QueryWrapper().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer()) + ); + QueryWrapper projectNameInfoEOQueryWrapper = new QueryWrapper<>(); projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId()); ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); @@ -1354,7 +1359,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer()) - ); - //只要有一个人拒绝，就改为拒绝。 if(StringUtils.equals(operatorResult, OperatorResultEnum.REJECTED.getValue())){ inventoryAffirmStatus = InventoryAffirmStatusEnum.REJECTED.getValue(); @@ -1493,7 +1494,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl() .lambda().eq(ProjectLibraryBase::getId, projectLibraryId)); + ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectOne( + new QueryWrapper().lambda().eq(ProjectLawsInventoryEO::getId, id) + ); SysUser studioUserInfo = this.sysUserMapper.selectOne( new QueryWrapper().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer()) @@ -2112,6 +2116,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_START_MSG.getValue())){ String prehomoDutyId = jsonObject.getString("prehomoDutyId"); //pre-Home责任人id userIdList.add(prehomoDutyId); @@ -2212,7 +2233,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_START_MSG.getValue())){ String verifyDutyId = jsonObject.getString("verifyDutyId"); //验证符合性责任人id userIdList.add(verifyDutyId); @@ -2225,7 +2252,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_CHARGE_PERSON_SUBMIT_MSG.getValue())){ String designInitiatorId = jsonObject.getString("designInitiatorId"); //设计符合性发起人id userIdList.add(designInitiatorId); @@ -2238,7 +2270,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_CHARGE_PERSON_SUBMIT_MSG.getValue())){ String prehomoInitiatorId = jsonObject.getString("prehomoInitiatorId"); //pre-Home发起人id userIdList.add(prehomoInitiatorId); @@ -2251,7 +2288,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue())){ String verifyInitiatorId = jsonObject.getString("verifyInitiatorId"); //验证符合性发起人id userIdList.add(verifyInitiatorId); @@ -2264,7 +2306,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); }else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue())){ String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id userIdList.add(designDutyId); @@ -2277,7 +2324,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_INITIATOR_ACCEPTED_MSG.getValue())){ String prehomoDutyId = jsonObject.getString("prehomoDutyId"); //pre-Home责任人id userIdList.add(prehomoDutyId); @@ -2290,7 +2342,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_INITIATOR_ACCEPTED_MSG.getValue())){ String verifyDutyId = jsonObject.getString("verifyDutyId"); //验证符合性责任人id userIdList.add(verifyDutyId); @@ -2303,7 +2360,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){ @@ -2311,7 +2373,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryOneWrapper = new QueryWrapper<>(); + queryOneWrapper.lambda().eq(SysUser::getId,initiatorId); + SysUser sysUser = this.sysUserService.getBaseMapper().selectOne(queryOneWrapper); + initiator = sysUser.getUsername(); + } + feishuMsgVo.setInitiator(initiator); //发送消息 SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryBaseInfo.getId(),sendMessageMap, feishuMsgVo, messageTypeEnum,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); } @@ -351,13 +362,30 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl queryOneWrapper = new QueryWrapper<>(); + queryOneWrapper.lambda().eq(SysUser::getId,initiatorId); + SysUser sysUser = this.sysUserService.getBaseMapper().selectOne(queryOneWrapper); + initiator = sysUser.getUsername(); + } + feishuMsgVo.setInitiator(initiator); MessageTypeEnum messageTypeEnum = null;