处理禅道55676bug，责任人编辑自己填写的反馈意见报错。
This commit is contained in:
wangzhijiang
+74
-72
@@ -132,93 +132,95 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
|
|||||||
new QueryWrapper<ProjectTaskInventoryDetailEO>().lambda().eq(ProjectTaskInventoryDetailEO::getId, projectTaskInventoryFeedbackEO.getProjectTaskInventoryId())
|
new QueryWrapper<ProjectTaskInventoryDetailEO>().lambda().eq(ProjectTaskInventoryDetailEO::getId, projectTaskInventoryFeedbackEO.getProjectTaskInventoryId())
|
||||||
);
|
);
|
||||||
|
|
||||||
ProjectLawsInventoryEO projectLawsInventoryEO = this.projectLawsInventoryEOService.getOne(
|
if(!Objects.isNull(projectTaskInventoryDetailEO)){
|
||||||
new QueryWrapper<ProjectLawsInventoryEO>().lambda().eq(ProjectLawsInventoryEO::getId, projectTaskInventoryDetailEO.getProjectTaskInventoryId())
|
ProjectLawsInventoryEO projectLawsInventoryEO = this.projectLawsInventoryEOService.getOne(
|
||||||
);
|
new QueryWrapper<ProjectLawsInventoryEO>().lambda().eq(ProjectLawsInventoryEO::getId, projectTaskInventoryDetailEO.getProjectTaskInventoryId())
|
||||||
|
);
|
||||||
|
|
||||||
ProjectLibraryBase projectLibraryBaseInfo = this.projectLibraryBaseService.getOne(
|
ProjectLibraryBase projectLibraryBaseInfo = this.projectLibraryBaseService.getOne(
|
||||||
new QueryWrapper<ProjectLibraryBase>().lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId())
|
new QueryWrapper<ProjectLibraryBase>().lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId())
|
||||||
);
|
);
|
||||||
|
|
||||||
ProjectNameInfoEO projectNameInfoEO = this.projectNameInfoEOService.getOne(
|
ProjectNameInfoEO projectNameInfoEO = this.projectNameInfoEOService.getOne(
|
||||||
new QueryWrapper<ProjectNameInfoEO>().lambda().eq(ProjectNameInfoEO::getId, projectLibraryBaseInfo.getProjectNameId())
|
new QueryWrapper<ProjectNameInfoEO>().lambda().eq(ProjectNameInfoEO::getId, projectLibraryBaseInfo.getProjectNameId())
|
||||||
);
|
);
|
||||||
|
|
||||||
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
|
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
|
||||||
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBaseInfo.getYearNameId());
|
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBaseInfo.getYearNameId());
|
||||||
ProjectYearNameInfoEO projectYearNameInfoEO = this.projectYearNameInfoEOService.getOne(projectYearInfoEOQueryWrapper);
|
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.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.setRegulationNo(projectLawsInventoryEO.getSerialNumber());
|
||||||
feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket());
|
feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket());
|
||||||
feishuMsgVo.setInitiator(currentUser.getUsername());
|
feishuMsgVo.setInitiator(currentUser.getUsername());
|
||||||
|
|
||||||
MessageTypeEnum messageTypeEnum = null;
|
MessageTypeEnum messageTypeEnum = null;
|
||||||
|
|
||||||
//消息内容
|
//消息内容
|
||||||
String msgContentEN = "";
|
String msgContentEN = "";
|
||||||
String msgTitle = "";
|
String msgTitle = "";
|
||||||
|
|
||||||
String flowType = projectTaskInventoryFeedbackEO.getFlowType();
|
String flowType = projectTaskInventoryFeedbackEO.getFlowType();
|
||||||
if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){
|
if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){
|
||||||
msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of "
|
msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of "
|
||||||
+ projectLawsInventoryEO.getSerialNumber() + " in "
|
+ projectLawsInventoryEO.getSerialNumber() + " in "
|
||||||
+ projectNameInfoEO.getProjectName() + " for design compliance confirmation. Please check and address it in time.";
|
+ projectNameInfoEO.getProjectName() + " for design compliance confirmation. Please check and address it in time.";
|
||||||
msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket()
|
msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket()
|
||||||
+ ": You have a design compliance task to complete";
|
+ ": You have a design compliance task to complete";
|
||||||
|
|
||||||
feishuMsgVo.setTaskType("Design Compliance Confirmation");
|
feishuMsgVo.setTaskType("Design Compliance Confirmation");
|
||||||
feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getDesignDueDate()));
|
feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getDesignDueDate()));
|
||||||
|
|
||||||
messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
|
messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
|
||||||
}else if(StringUtils.equals(flowType,FlowTypeEnum.PREHOMOQRLC.getValue())){
|
}else if(StringUtils.equals(flowType,FlowTypeEnum.PREHOMOQRLC.getValue())){
|
||||||
msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of "
|
msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of "
|
||||||
+ projectLawsInventoryEO.getSerialNumber() + " in "
|
+ projectLawsInventoryEO.getSerialNumber() + " in "
|
||||||
+ projectNameInfoEO.getProjectName() + " for Pre-Homo compliance confirmation. Please check and address it in time.";
|
+ projectNameInfoEO.getProjectName() + " for Pre-Homo compliance confirmation. Please check and address it in time.";
|
||||||
msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket()
|
msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket()
|
||||||
+ ": You have a Pre-Homo task to complete";
|
+ ": You have a Pre-Homo task to complete";
|
||||||
|
|
||||||
feishuMsgVo.setTaskType("Pre-Homo Confirmation");
|
feishuMsgVo.setTaskType("Pre-Homo Confirmation");
|
||||||
feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getPrehomoDueDate()));
|
feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getPrehomoDueDate()));
|
||||||
|
|
||||||
messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
|
messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
|
||||||
}else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){
|
}else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){
|
||||||
msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of "
|
msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of "
|
||||||
+ projectLawsInventoryEO.getSerialNumber() + " in "
|
+ projectLawsInventoryEO.getSerialNumber() + " in "
|
||||||
+ projectNameInfoEO.getProjectName() + " for validation compliance confirmation. Please check and address it in time.";
|
+ projectNameInfoEO.getProjectName() + " for validation compliance confirmation. Please check and address it in time.";
|
||||||
msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket()
|
msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket()
|
||||||
+ ": You have a validation compliance task to complete";
|
+ ": You have a validation compliance task to complete";
|
||||||
|
|
||||||
feishuMsgVo.setTaskType("Validation Compliance Confirmation");
|
feishuMsgVo.setTaskType("Validation Compliance Confirmation");
|
||||||
feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getVerifyDueDate()));
|
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 = "<a href='"
|
||||||
|
+ JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBaseInfo.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType()
|
||||||
|
+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
|
||||||
|
+ projectYearNameInfoEO.getYearName()
|
||||||
|
+ "&targetMarket=" + projectLibraryBaseInfo.getTargetMarket()
|
||||||
|
+ "'>" + " View details" + "</a>";
|
||||||
|
String contentInfo = msgContentEN + " " + href;
|
||||||
|
Map<String,Object> 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 = "<a href='"
|
|
||||||
+ JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBaseInfo.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType()
|
|
||||||
+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
|
|
||||||
+ projectYearNameInfoEO.getYearName()
|
|
||||||
+ "&targetMarket=" + projectLibraryBaseInfo.getTargetMarket()
|
|
||||||
+ "'>" + " View details" + "</a>";
|
|
||||||
String contentInfo = msgContentEN + " " + href;
|
|
||||||
Map<String,Object> 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());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user