设计、验证、prehomo流程发起人退回,发消息内容完善。
This commit is contained in:
+25
@@ -662,6 +662,10 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
|
|||||||
|
|
||||||
SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, currentUserId));
|
SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, currentUserId));
|
||||||
|
|
||||||
|
ProjectLawsInventoryEO projectLawsInventoryEO = this.projectLawsInventoryEOService.getOne(
|
||||||
|
new QueryWrapper<ProjectLawsInventoryEO>().lambda().eq(ProjectLawsInventoryEO::getId, id)
|
||||||
|
);
|
||||||
|
|
||||||
String msgContentEN = "";
|
String msgContentEN = "";
|
||||||
List<String> userIdList = new ArrayList<>();
|
List<String> userIdList = new ArrayList<>();
|
||||||
String dreUserIds = jsonObject.getString("dreUserIds"); //dre用户id
|
String dreUserIds = jsonObject.getString("dreUserIds"); //dre用户id
|
||||||
@@ -695,9 +699,16 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
|
|||||||
|
|
||||||
|
|
||||||
FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
|
FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
|
||||||
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
||||||
|
String dutDateStr = "";
|
||||||
|
|
||||||
if (StringUtils.equals(msgType, MsgTypeEnum.DESIGN_ISSUE_DRE_MSG.getValue())) {
|
if (StringUtils.equals(msgType, MsgTypeEnum.DESIGN_ISSUE_DRE_MSG.getValue())) {
|
||||||
taskKey = DesignComplianceNodeEnum.DRE_DISPOSE.getKey();
|
taskKey = DesignComplianceNodeEnum.DRE_DISPOSE.getKey();
|
||||||
|
|
||||||
|
if(projectLawsInventoryEO.getDesignDueDate() != null){
|
||||||
|
dutDateStr = sdf.format(projectLawsInventoryEO.getDesignDueDate());
|
||||||
|
}
|
||||||
|
|
||||||
msgContentEN = sysUser.getUsername() + "has assigned the design compliance confirmation process of " + serialNumber + " in "
|
msgContentEN = sysUser.getUsername() + "has assigned the design compliance confirmation process of " + serialNumber + " in "
|
||||||
+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
|
+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
|
||||||
+ " to you. Please check and handle it in time.";
|
+ " to you. Please check and handle it in time.";
|
||||||
@@ -710,6 +721,10 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
|
|||||||
|
|
||||||
taskKey = DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey();
|
taskKey = DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey();
|
||||||
|
|
||||||
|
if(projectLawsInventoryEO.getDesignDueDate() != null){
|
||||||
|
dutDateStr = sdf.format(projectLawsInventoryEO.getDesignDueDate());
|
||||||
|
}
|
||||||
|
|
||||||
msgContentEN = "The design compliance information of " + serialNumber + " in "
|
msgContentEN = "The design compliance information of " + serialNumber + " in "
|
||||||
+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
|
+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
|
||||||
+ " you sumitted has been rejected after review. Please check and address it in time.";
|
+ " you sumitted has been rejected after review. Please check and address it in time.";
|
||||||
@@ -722,6 +737,10 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
|
|||||||
|
|
||||||
taskKey = DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey();
|
taskKey = DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey();
|
||||||
|
|
||||||
|
if(projectLawsInventoryEO.getPrehomoDueDate() != null){
|
||||||
|
dutDateStr = sdf.format(projectLawsInventoryEO.getPrehomoDueDate());
|
||||||
|
}
|
||||||
|
|
||||||
msgContentEN = "The Pre-Homo confirmation of " + serialNumber + " in "
|
msgContentEN = "The Pre-Homo confirmation of " + serialNumber + " in "
|
||||||
+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
|
+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
|
||||||
+ " you sumitted has been rejected after review. Please check and address it in time.";
|
+ " you sumitted has been rejected after review. Please check and address it in time.";
|
||||||
@@ -734,6 +753,10 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
|
|||||||
|
|
||||||
taskKey = DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey();
|
taskKey = DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey();
|
||||||
|
|
||||||
|
if(projectLawsInventoryEO.getVerifyDueDate() != null){
|
||||||
|
dutDateStr = sdf.format(projectLawsInventoryEO.getVerifyDueDate());
|
||||||
|
}
|
||||||
|
|
||||||
msgContentEN = "The validation compliance information of " + serialNumber + " in "
|
msgContentEN = "The validation compliance information of " + serialNumber + " in "
|
||||||
+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
|
+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
|
||||||
+ " you sumitted has been rejected after review. Please check and address it in time.";
|
+ " you sumitted has been rejected after review. Please check and address it in time.";
|
||||||
@@ -741,6 +764,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
|
|||||||
feishuMsgVo.setContent("Hello! The compliance information you submitted has been rejected after review. Please check and address it in a timely manner.");
|
feishuMsgVo.setContent("Hello! The compliance information you submitted has been rejected after review. Please check and address it in a timely manner.");
|
||||||
feishuMsgVo.setTaskType("Validation Compliance Confirmation");
|
feishuMsgVo.setTaskType("Validation Compliance Confirmation");
|
||||||
}
|
}
|
||||||
|
feishuMsgVo.setDueDate(dutDateStr);
|
||||||
|
feishuMsgVo.setInitiator(sysUser.getUsername());
|
||||||
feishuMsgVo.setRegulationNo(serialNumber);
|
feishuMsgVo.setRegulationNo(serialNumber);
|
||||||
feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
|
feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user