设计、prehomo、验证符合性流程,发起流程给责任人发消息
This commit is contained in:
+1
-1
@@ -17,7 +17,7 @@ public enum MessageTypeEnum {
|
|||||||
REGULATION_TASK_CONFIRMATION_NOTIFICATION("Regulation Task Confirmation Notification", "15"), // 任务确认通知
|
REGULATION_TASK_CONFIRMATION_NOTIFICATION("Regulation Task Confirmation Notification", "15"), // 任务确认通知
|
||||||
DESIGN_COMPLIANCE_TASK("Design Compliance Task", "9"), // 设计符合性任务
|
DESIGN_COMPLIANCE_TASK("Design Compliance Task", "9"), // 设计符合性任务
|
||||||
PRE_HOMO_TASK("Pre-Homo Task", "10"), // Pre-Homo任务
|
PRE_HOMO_TASK("Pre-Homo Task", "10"), // Pre-Homo任务
|
||||||
VALIDATION_TASK("Validation Task", "11"), // 验证符合性任务
|
VALIDATION_TASK("Validation ComplianceTask", "11"), // 验证符合性任务
|
||||||
DESIGN_COMPLIANCE_NOTIFICATION("Design Compliance Notification", "12"), // 设计符合性通知
|
DESIGN_COMPLIANCE_NOTIFICATION("Design Compliance Notification", "12"), // 设计符合性通知
|
||||||
PRE_HOMO_NOTIFICATION("Pre-Homo Notification", "13"), // Pre-Homo通知
|
PRE_HOMO_NOTIFICATION("Pre-Homo Notification", "13"), // Pre-Homo通知
|
||||||
VALIDATION_COMPLIANCE_NOTIFICATION("Validation Compliance Notification", "14"), // 验证符合性通知
|
VALIDATION_COMPLIANCE_NOTIFICATION("Validation Compliance Notification", "14"), // 验证符合性通知
|
||||||
|
|||||||
+3
@@ -21,6 +21,9 @@ public enum MsgTypeEnum {
|
|||||||
DESIGN_RETURN_MSG("设计符合性发起人退回","designReturnMsg"),
|
DESIGN_RETURN_MSG("设计符合性发起人退回","designReturnMsg"),
|
||||||
PREHOMO_RETURN_MSG("prehomo发起人退回","prehomoReturnMsg"),
|
PREHOMO_RETURN_MSG("prehomo发起人退回","prehomoReturnMsg"),
|
||||||
VERIFY_RETURN_MSG("验证符合性发起人退回","verifyReturnMsg"),
|
VERIFY_RETURN_MSG("验证符合性发起人退回","verifyReturnMsg"),
|
||||||
|
DESIGN_START_MSG("设计符合性发起给责任人发送消息","designStartMsg"),
|
||||||
|
PREHOMO_START_MSG("prehomo发起给责任人发送消息","prehomoStartMsg"),
|
||||||
|
VERIFY_START_MSG("验证符合性发起给责任人发送消息","verifyStartMsg"),
|
||||||
;
|
;
|
||||||
|
|
||||||
String name;
|
String name;
|
||||||
|
|||||||
+44
-1
@@ -2091,6 +2091,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
|
FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
|
||||||
|
|
||||||
MessageTypeEnum messageTypeEnum = null;
|
MessageTypeEnum messageTypeEnum = null;
|
||||||
|
String taskType = "";
|
||||||
|
|
||||||
if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_START_MSG.getValue())) {
|
if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_START_MSG.getValue())) {
|
||||||
userIdList.add(engineeringInterfacePerson);
|
userIdList.add(engineeringInterfacePerson);
|
||||||
@@ -2102,6 +2103,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
feishuMsgVo.setContent("Hello! Please check and address this task in a timely manner.");
|
feishuMsgVo.setContent("Hello! Please check and address this task in a timely manner.");
|
||||||
|
|
||||||
messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
|
messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
|
||||||
|
taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK.getName();
|
||||||
} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ISSUE_DRE_MSG.getValue())) {
|
} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ISSUE_DRE_MSG.getValue())) {
|
||||||
String dreUserId = jsonObject.getString("dreUserId"); //dre用户id
|
String dreUserId = jsonObject.getString("dreUserId"); //dre用户id
|
||||||
userIdList.add(dreUserId);
|
userIdList.add(dreUserId);
|
||||||
@@ -2113,6 +2115,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task. Please check and and handle it in time.");
|
feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task. Please check and and handle it in time.");
|
||||||
|
|
||||||
messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
|
messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
|
||||||
|
taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK.getName();
|
||||||
} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_REJECTED.getValue())) {
|
} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_REJECTED.getValue())) {
|
||||||
userIdList.add(engineeringInterfacePerson);
|
userIdList.add(engineeringInterfacePerson);
|
||||||
msgContentEN = sysUser.getUsername() + " has rejected the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
|
msgContentEN = sysUser.getUsername() + " has rejected the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
|
||||||
@@ -2123,6 +2126,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has rejected the task. Please check and and handle it in time.");
|
feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has rejected the task. Please check and and handle it in time.");
|
||||||
|
|
||||||
messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
|
messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
|
||||||
|
taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK.getName();
|
||||||
} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_ACCEPTED.getValue())) {
|
} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_ACCEPTED.getValue())) {
|
||||||
userIdList.add(engineeringInterfacePerson);
|
userIdList.add(engineeringInterfacePerson);
|
||||||
msgContentEN = sysUser.getUsername() + " has submitted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
|
msgContentEN = sysUser.getUsername() + " has submitted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
|
||||||
@@ -2133,6 +2137,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has submitted the task. Please check and and handle it in time.");
|
feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has submitted the task. Please check and and handle it in time.");
|
||||||
|
|
||||||
messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
|
messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
|
||||||
|
taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK.getName();
|
||||||
} else if(StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_REJECTED_MSG.getValue())){
|
} else if(StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_REJECTED_MSG.getValue())){
|
||||||
userIdList.add(projectLibraryBase.getStudioEngineer());
|
userIdList.add(projectLibraryBase.getStudioEngineer());
|
||||||
msgContentEN = sysUser.getUsername() + " has rejected the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
|
msgContentEN = sysUser.getUsername() + " has rejected the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
|
||||||
@@ -2143,6 +2148,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has rejected the task. Please check and and handle it in time.");
|
feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has rejected the task. Please check and and handle it in time.");
|
||||||
|
|
||||||
messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
|
messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
|
||||||
|
taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK.getName();
|
||||||
} else if(StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ACCEPTED_MSG.getValue())){
|
} else if(StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ACCEPTED_MSG.getValue())){
|
||||||
userIdList.add(projectLibraryBase.getStudioEngineer());
|
userIdList.add(projectLibraryBase.getStudioEngineer());
|
||||||
msgContentEN = sysUser.getUsername() + " has accepted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
|
msgContentEN = sysUser.getUsername() + " has accepted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
|
||||||
@@ -2153,11 +2159,48 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
|||||||
feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has accepted the task. Please check and and handle it in time.");
|
feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has accepted the task. Please check and and handle it in time.");
|
||||||
|
|
||||||
messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_NOTIFICATION;
|
messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_NOTIFICATION;
|
||||||
|
taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_NOTIFICATION.getName();
|
||||||
|
} else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_START_MSG.getValue())){
|
||||||
|
String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id
|
||||||
|
userIdList.add(designDutyId);
|
||||||
|
msgContentEN = "You recieved the design compliance task of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
|
||||||
|
+ ". The due date is XXXX. Please check and address it in a timely manner.";
|
||||||
|
msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
|
||||||
|
+ ": You have a design compliance task to complete";
|
||||||
|
|
||||||
|
feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
|
||||||
|
|
||||||
|
messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
|
||||||
|
taskType = MessageTypeEnum.DESIGN_COMPLIANCE_TASK.getName();
|
||||||
|
} else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_START_MSG.getValue())){
|
||||||
|
String prehomoDutyId = jsonObject.getString("prehomoDutyId"); //pre-Home责任人id
|
||||||
|
userIdList.add(prehomoDutyId);
|
||||||
|
msgContentEN = "You recieved the Pre-Homo task of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
|
||||||
|
+ ". The due date is XXXX. Please check and address it in a timely manner.";
|
||||||
|
msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
|
||||||
|
+ ": You have a Pre-Homo task to complete";
|
||||||
|
|
||||||
|
feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
|
||||||
|
|
||||||
|
messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
|
||||||
|
taskType = MessageTypeEnum.PRE_HOMO_TASK.getName();
|
||||||
|
} else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_START_MSG.getValue())){
|
||||||
|
String verifyDutyId = jsonObject.getString("verifyDutyId"); //验证符合性责任人id
|
||||||
|
userIdList.add(verifyDutyId);
|
||||||
|
msgContentEN = "You recieved the validation compliance task of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
|
||||||
|
+ ". The due date is XXXX. Please check and address it in a timely manner.";
|
||||||
|
msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
|
||||||
|
+ ": You have a validation compliance task to complete";
|
||||||
|
|
||||||
|
feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
|
||||||
|
|
||||||
|
messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
|
||||||
|
taskType = MessageTypeEnum.VALIDATION_TASK.getName();
|
||||||
}
|
}
|
||||||
|
|
||||||
if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){
|
if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){
|
||||||
|
|
||||||
feishuMsgVo.setTaskType("Regulation Task Confirmation");
|
feishuMsgVo.setTaskType(taskType);
|
||||||
feishuMsgVo.setRegulationNo(serialNumber);
|
feishuMsgVo.setRegulationNo(serialNumber);
|
||||||
feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
|
feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
|
||||||
feishuMsgVo.setInitiator(sysUser.getUsername());
|
feishuMsgVo.setInitiator(sysUser.getUsername());
|
||||||
|
|||||||
Reference in New Issue
Block a user