WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UAT问题清单-263条，任务确认阶段发送飞书消息 发流程类型。

Browse Source
This commit is contained in:
wangzhijiang
2023-06-19 17:03:45 +08:00
parent 89bfb95388
commit fb2074f740
1 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+27 -11
View File
@@ -926,7 +926,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
String regulationOwnerId = projectLawsInventoryOld.getRegulationOwnerId();
// 给法规工程师发消息
// 给设计符合性-责任人发消息
Map<String, Object> params = new HashMap<>();
params.put("contentCn", "您好，您以下任务已被发起人撤回。");
params.put("contentEn", "Hello! Your task has been withdrawn by the initiator.");
@@ -934,6 +934,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
params.put("endTime", endTime);
params.put("userIdList", Arrays.asList(projectLawsInventoryOld.getDesignDutyId().split(",")));
params.put("serialNumbers", projectLawsInventoryOld.getSerialNumber());
params.put("flowTypeCn","设计符合性流程");
params.put("flowTypeEn","Design Compliance Process");
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
@@ -950,7 +952,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator", regulationOwnerUserName);
this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params);
this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(), params);
}
}
}
@@ -968,7 +970,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
String regulationOwnerId = projectLawsInventoryOld.getRegulationOwnerId();
// 给法规工程师发消息
// 给设计符合性-责任人发消息
Map<String, Object> params = new HashMap<>();
params.put("contentCn", "您好，您以下任务已被发起人撤回。");
params.put("contentEn", "Hello! Your task has been withdrawn by the initiator.");
@@ -976,6 +978,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
params.put("endTime", endTime);
params.put("userIdList", Arrays.asList(projectLawsInventoryOld.getDesignDutyId().split(",")));
params.put("serialNumbers", projectLawsInventoryOld.getSerialNumber());
params.put("flowTypeCn","设计符合性流程");
params.put("flowTypeEn","Design Compliance Process");
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLawsInventoryEO.getProjectLibraryId());
if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
@@ -992,7 +996,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator", regulationOwnerUserName);
this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params);
this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(), params);
}
}
}
@@ -10684,7 +10688,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(","));
List<String> userIdList = Arrays.asList(verifyDutyId.split(","));
// 给设计符合性流程责任人发消息
// 给验证符合性流程责任人发消息
Map<String, Object> params = new HashMap<>();
params.put("contentCn", "您好，请及时查看确认以下任务要求，谢谢！");
params.put("contentEn", "Hello! Please check and confirm the following task requirement in a timely manner. Thank you!");
@@ -10692,6 +10696,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
params.put("endTime", endTime);
params.put("userIdList", userIdList);
params.put("serialNumbers", serialNumbers);
params.put("flowTypeCn","验证符合性流程");
params.put("flowTypeEn","Validation Compliance Process");
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
@@ -10710,7 +10716,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator", regulationOwnerUserName);
this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params);
this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(), params);
}
}
}
@@ -10946,6 +10952,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
params.put("endTime", endTime);
params.put("userIdList", userIdList);
params.put("serialNumbers", serialNumbers);
params.put("flowTypeCn","设计符合性流程");
params.put("flowTypeEn","Design Compliance Process");
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
@@ -10964,7 +10972,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator", regulationOwnerUserName);
this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params);
this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(), params);
}
}
}
@@ -12913,6 +12921,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if (CollectionUtils.isNotEmpty(pliEoListTemp)) {
ProjectLawsInventoryEO pliEoTemp = pliEoListTemp.get(0);
Map<String, Object> params = new HashMap<>();
String endTime = "";
String contentCn = "";
String contentEn = "";
@@ -12920,9 +12930,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String taskDefinitionKey = pidEo.getTaskDefinitionKey();
if (StringUtils.equals(taskDefinitionKey, DesignComplianceFlowNodeKeyEnum.ZRRQR.getValue())
|| StringUtils.equals(taskDefinitionKey, DesignComplianceFlowNodeKeyEnum.DEZRRQR.getValue())) {
params.put("flowTypeCn","设计符合性流程");
params.put("flowTypeEn","Design Compliance Process");
contentCn = "您好，请及时查看确认以下任务要求，谢谢！";
contentEn = "Hello! Please check and confirm the following task requirement in a timely manner. Thank you!";
templateId = TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue();
templateId = TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue();
endTime = DateUtils.formatDate(pliEoTemp.getDesignDutyDueDate());
} else if (StringUtils.equals(taskDefinitionKey, DesignComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue())
|| StringUtils.equals(taskDefinitionKey, DesignComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue())) {
@@ -12932,7 +12945,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
endTime = DateUtils.formatDate(pliEoTemp.getDesignDueDate());
}
Map<String, Object> params = new HashMap<>();
params.put("userIdList", Arrays.asList(designTransferUserId.split(",")));
params.put("projectLibraryId", projectLibraryId);
params.put("endTime", endTime);
@@ -13019,6 +13031,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if (CollectionUtils.isNotEmpty(pliEoListTemp)) {
ProjectLawsInventoryEO pliEoTemp = pliEoListTemp.get(0);
Map<String, Object> params = new HashMap<>();
String endTime = "";
String contentCn = "";
String contentEn = "";
@@ -13026,9 +13040,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String taskDefinitionKey = pidEo.getTaskDefinitionKey();
if (StringUtils.equals(taskDefinitionKey, VerifyComplianceFlowNodeKeyEnum.ZRRQR.getValue())
|| StringUtils.equals(taskDefinitionKey, VerifyComplianceFlowNodeKeyEnum.DEZRRQR.getValue())) {
params.put("flowTypeCn","验证符合性流程");
params.put("flowTypeEn","Validation Compliance Process");
contentCn = "您好，请及时查看确认以下任务要求，谢谢！";
contentEn = "Hello! Please check and confirm the following task requirement in a timely manner. Thank you!";
templateId = TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue();
templateId = TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue();
endTime = DateUtils.formatDate(pliEoTemp.getVerifyDutyDueDate());
} else if (StringUtils.equals(taskDefinitionKey, VerifyComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue())
|| StringUtils.equals(taskDefinitionKey, VerifyComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue())) {
@@ -13038,7 +13055,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
endTime = DateUtils.formatDate(pliEoTemp.getVerifyDueDate());
}
Map<String, Object> params = new HashMap<>();
params.put("userIdList", Arrays.asList(verifyTransferUserId.split(",")));
params.put("projectLibraryId", projectLibraryId);
params.put("endTime", endTime);