diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java index e3bc86589..bef2abbfe 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java @@ -132,93 +132,95 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl().lambda().eq(ProjectTaskInventoryDetailEO::getId, projectTaskInventoryFeedbackEO.getProjectTaskInventoryId()) ); - ProjectLawsInventoryEO projectLawsInventoryEO = this.projectLawsInventoryEOService.getOne( - new QueryWrapper().lambda().eq(ProjectLawsInventoryEO::getId, projectTaskInventoryDetailEO.getProjectTaskInventoryId()) - ); + if(!Objects.isNull(projectTaskInventoryDetailEO)){ + ProjectLawsInventoryEO projectLawsInventoryEO = this.projectLawsInventoryEOService.getOne( + new QueryWrapper().lambda().eq(ProjectLawsInventoryEO::getId, projectTaskInventoryDetailEO.getProjectTaskInventoryId()) + ); - ProjectLibraryBase projectLibraryBaseInfo = this.projectLibraryBaseService.getOne( - new QueryWrapper().lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId()) - ); + ProjectLibraryBase projectLibraryBaseInfo = this.projectLibraryBaseService.getOne( + new QueryWrapper().lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId()) + ); - ProjectNameInfoEO projectNameInfoEO = this.projectNameInfoEOService.getOne( - new QueryWrapper().lambda().eq(ProjectNameInfoEO::getId, projectLibraryBaseInfo.getProjectNameId()) - ); + ProjectNameInfoEO projectNameInfoEO = this.projectNameInfoEOService.getOne( + new QueryWrapper().lambda().eq(ProjectNameInfoEO::getId, projectLibraryBaseInfo.getProjectNameId()) + ); - QueryWrapper projectYearInfoEOQueryWrapper = new QueryWrapper<>(); - projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBaseInfo.getYearNameId()); - ProjectYearNameInfoEO projectYearNameInfoEO = this.projectYearNameInfoEOService.getOne(projectYearInfoEOQueryWrapper); + QueryWrapper projectYearInfoEOQueryWrapper = new QueryWrapper<>(); + projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBaseInfo.getYearNameId()); + ProjectYearNameInfoEO projectYearNameInfoEO = this.projectYearNameInfoEOService.getOne(projectYearInfoEOQueryWrapper); - // 飞书消息封装 - FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); + // 飞书消息封装 + FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); - feishuMsgVo.setContent("Hello! " + currentUser.getUsername() + " has replied to your engineering deliverable information. Please check and address it in a timely manner."); - feishuMsgVo.setRegulationNo(projectLawsInventoryEO.getSerialNumber()); - feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket()); - feishuMsgVo.setInitiator(currentUser.getUsername()); + feishuMsgVo.setContent("Hello! " + currentUser.getUsername() + " has replied to your engineering deliverable information. Please check and address it in a timely manner."); + feishuMsgVo.setRegulationNo(projectLawsInventoryEO.getSerialNumber()); + feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket()); + feishuMsgVo.setInitiator(currentUser.getUsername()); - MessageTypeEnum messageTypeEnum = null; + MessageTypeEnum messageTypeEnum = null; - //消息内容 - String msgContentEN = ""; - String msgTitle = ""; + //消息内容 + String msgContentEN = ""; + String msgTitle = ""; - String flowType = projectTaskInventoryFeedbackEO.getFlowType(); - if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){ - msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of " - + projectLawsInventoryEO.getSerialNumber() + " in " - + projectNameInfoEO.getProjectName() + " for design compliance confirmation. Please check and address it in time."; - msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket() - + ": You have a design compliance task to complete"; + String flowType = projectTaskInventoryFeedbackEO.getFlowType(); + if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){ + msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of " + + projectLawsInventoryEO.getSerialNumber() + " in " + + projectNameInfoEO.getProjectName() + " for design compliance confirmation. Please check and address it in time."; + msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket() + + ": You have a design compliance task to complete"; - feishuMsgVo.setTaskType("Design Compliance Confirmation"); - feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getDesignDueDate())); + feishuMsgVo.setTaskType("Design Compliance Confirmation"); + feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getDesignDueDate())); - messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK; - }else if(StringUtils.equals(flowType,FlowTypeEnum.PREHOMOQRLC.getValue())){ - msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of " - + projectLawsInventoryEO.getSerialNumber() + " in " - + projectNameInfoEO.getProjectName() + " for Pre-Homo compliance confirmation. Please check and address it in time."; - msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket() - + ": You have a Pre-Homo task to complete"; + messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK; + }else if(StringUtils.equals(flowType,FlowTypeEnum.PREHOMOQRLC.getValue())){ + msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of " + + projectLawsInventoryEO.getSerialNumber() + " in " + + projectNameInfoEO.getProjectName() + " for Pre-Homo compliance confirmation. Please check and address it in time."; + msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket() + + ": You have a Pre-Homo task to complete"; - feishuMsgVo.setTaskType("Pre-Homo Confirmation"); - feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getPrehomoDueDate())); + feishuMsgVo.setTaskType("Pre-Homo Confirmation"); + feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getPrehomoDueDate())); - messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK; - }else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){ - msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of " - + projectLawsInventoryEO.getSerialNumber() + " in " - + projectNameInfoEO.getProjectName() + " for validation compliance confirmation. Please check and address it in time."; - msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket() - + ": You have a validation compliance task to complete"; + messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK; + }else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){ + msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of " + + projectLawsInventoryEO.getSerialNumber() + " in " + + projectNameInfoEO.getProjectName() + " for validation compliance confirmation. Please check and address it in time."; + msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket() + + ": You have a validation compliance task to complete"; - feishuMsgVo.setTaskType("Validation Compliance Confirmation"); - feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getVerifyDueDate())); + feishuMsgVo.setTaskType("Validation Compliance Confirmation"); + feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getVerifyDueDate())); - messageTypeEnum = MessageTypeEnum.VALIDATION_TASK; + messageTypeEnum = MessageTypeEnum.VALIDATION_TASK; + } + + //飞书跳转链接 + String hrefFeishu = backUrl + + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + + projectLibraryBaseInfo.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName() + "-" + + projectYearNameInfoEO.getYearName() + + "&targetMarket=" + projectLibraryBaseInfo.getTargetMarket(); + //系统内部跳转链接 + String href = "" + " View details" + ""; + String contentInfo = msgContentEN + " " + href; + Map sendMessageMap = new HashMap<>(); + sendMessageMap.put("hrefFeishu",hrefFeishu); + sendMessageMap.put("contentInfo",contentInfo); + + //发送消息 + SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryBaseInfo.getId(),sendMessageMap, feishuMsgVo, messageTypeEnum,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); } - - //飞书跳转链接 - String hrefFeishu = backUrl - + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() - + projectLibraryBaseInfo.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType() - + "&projectName=" + projectNameInfoEO.getProjectName() + "-" - + projectYearNameInfoEO.getYearName() - + "&targetMarket=" + projectLibraryBaseInfo.getTargetMarket(); - //系统内部跳转链接 - String href = "" + " View details" + ""; - String contentInfo = msgContentEN + " " + href; - Map sendMessageMap = new HashMap<>(); - sendMessageMap.put("hrefFeishu",hrefFeishu); - sendMessageMap.put("contentInfo",contentInfo); - - //发送消息 - SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryBaseInfo.getId(),sendMessageMap, feishuMsgVo, messageTypeEnum,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); } }