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

法规清单-强制转办接口调试。

Browse Source
This commit is contained in:
wangzhijiang
2023-04-14 10:36:41 +08:00
parent 2d94e0812e
commit 67d608dd6b
1 changed files with 110 additions and 106 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
+110 -106
View File
@@ -12024,7 +12024,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(CollectionUtils.isNotEmpty(pliEoList)){ if(CollectionUtils.isNotEmpty(pliEoList)){
QueryWrapper<ProcessInfoEO> piQueryWrap = new QueryWrapper<>(); QueryWrapper<ProcessInfoEO> piQueryWrap = new QueryWrapper<>();
piQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId,projectLawsInventoryIdList); piQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId,projectLawsInventoryIdList);
List<ProcessInfoEO> piEoList = this.processInfoEOService.list(); List<ProcessInfoEO> piEoList = this.processInfoEOService.list(piQueryWrap);
if(CollectionUtils.isNotEmpty(piEoList)){ if(CollectionUtils.isNotEmpty(piEoList)){
if (StringUtils.isNotEmpty(designTransferUserId)) { if (StringUtils.isNotEmpty(designTransferUserId)) {
@@ -12067,7 +12067,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
QueryWrapper<ProcessInfoDetailEO> pidQueryWrap = new QueryWrapper<>(); QueryWrapper<ProcessInfoDetailEO> pidQueryWrap = new QueryWrapper<>();
pidQueryWrap.lambda().in(ProcessInfoDetailEO::getActiProcInstId,actiProcInstIdList); pidQueryWrap.lambda().in(ProcessInfoDetailEO::getActiProcInstId,actiProcInstIdList);
pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getStatus,TaskStatusEnum.NOT_DONE.getValue()); pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getStatus,TaskStatusEnum.NOT_DONE.getValue());
pidQueryWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,taskDefinitionKeyList); pidQueryWrap.lambda().in(ProcessInfoDetailEO::getTaskDefinitionKey,taskDefinitionKeyList);
List<ProcessInfoDetailEO> pidEoList = this.processInfoDetailEOService.list(pidQueryWrap); List<ProcessInfoDetailEO> pidEoList = this.processInfoDetailEOService.list(pidQueryWrap);
if(CollectionUtils.isNotEmpty(pidEoList)){ if(CollectionUtils.isNotEmpty(pidEoList)){
@@ -12075,67 +12075,69 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
pidEo.setUserId(designTransferUserId); pidEo.setUserId(designTransferUserId);
}); });
String taskIds = pidEoList.stream().map(ProcessInfoDetailEO::getTaskId).distinct().collect(Collectors.joining(",")); String taskIds = pidEoList.stream().map(ProcessInfoDetailEO::getTaskId).distinct().collect(Collectors.joining(","));
this.workFlowFeignClient.changeAssigneeBatch(taskIds, designTransferUserId); Result<String> changeAssigneeBatchResult = this.workFlowFeignClient.changeAssigneeBatch(taskIds, designTransferUserId);
this.processInfoDetailEOService.updateBatchById(pidEoList); if (changeAssigneeBatchResult.isSuccess()) {
this.processInfoDetailEOService.updateBatchById(pidEoList);
for (ProcessInfoDetailEO pidEo : pidEoList) { for (ProcessInfoDetailEO pidEo : pidEoList) {
List<ProcessInfoEO> piEoListTemp = piEoList.stream().filter(piEo -> { List<ProcessInfoEO> piEoListTemp = piEoList.stream().filter(piEo -> {
boolean flag = false;
if (StringUtils.equals(piEo.getActiProcInstId(), pidEo.getActiProcInstId())) {
flag = true;
}
return flag;
}).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(piEoListTemp)){
ProcessInfoEO piEoTemp = piEoListTemp.get(0);
String projectLawsInventoryId = piEoTemp.getProjectLawsInventoryId();
List<ProjectLawsInventoryEO> pliEoListTemp = pliEoList.stream().filter(pliEo -> {
boolean flag = false; boolean flag = false;
if (StringUtils.equals(pliEo.getId(), projectLawsInventoryId)) { if (StringUtils.equals(piEo.getActiProcInstId(), pidEo.getActiProcInstId())) {
flag = true; flag = true;
} }
return flag; return flag;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(pliEoListTemp)){ if(CollectionUtils.isNotEmpty(piEoListTemp)){
ProjectLawsInventoryEO pliEoTemp = pliEoListTemp.get(0); ProcessInfoEO piEoTemp = piEoListTemp.get(0);
String projectLawsInventoryId = piEoTemp.getProjectLawsInventoryId();
Date endTime = null; List<ProjectLawsInventoryEO> pliEoListTemp = pliEoList.stream().filter(pliEo -> {
String contentCn = ""; boolean flag = false;
String contentEn = ""; if (StringUtils.equals(pliEo.getId(), projectLawsInventoryId)) {
String templateId = ""; flag = true;
String taskDefinitionKey = pidEo.getTaskDefinitionKey(); }
if(StringUtils.equals(taskDefinitionKey,DesignComplianceFlowNodeKeyEnum.ZRRQR.getValue()) return flag;
|| StringUtils.equals(taskDefinitionKey,DesignComplianceFlowNodeKeyEnum.DEZRRQR.getValue())){ }).collect(Collectors.toList());
contentCn = "您好，请及时查看确认以下任务要求，谢谢！";
contentEn = "Hello! Please check and confirm the following task requirement in a timely manner. Thank you!"; if(CollectionUtils.isNotEmpty(pliEoListTemp)){
templateId = TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(); ProjectLawsInventoryEO pliEoTemp = pliEoListTemp.get(0);
endTime = pliEoTemp.getDesignDutyDueDate();
} else if(StringUtils.equals(taskDefinitionKey,DesignComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue()) String endTime = "";
|| StringUtils.equals(taskDefinitionKey,DesignComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue())){ String contentCn = "";
contentCn = "您好，"+currentUser.getUsername()+"向您分发了该任务，请及时查看处理，谢谢！"; String contentEn = "";
contentEn = "Hello! "+currentUser.getUsername()+" has assigned the task to you. Please check and address it in a timely manner. Thank you!"; String templateId = "";
templateId = TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(); String taskDefinitionKey = pidEo.getTaskDefinitionKey();
endTime = pliEoTemp.getDesignDueDate(); if(StringUtils.equals(taskDefinitionKey,DesignComplianceFlowNodeKeyEnum.ZRRQR.getValue())
|| StringUtils.equals(taskDefinitionKey,DesignComplianceFlowNodeKeyEnum.DEZRRQR.getValue())){
contentCn = "您好，请及时查看确认以下任务要求，谢谢！";
contentEn = "Hello! Please check and confirm the following task requirement in a timely manner. Thank you!";
templateId = TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue();
endTime = DateUtils.formatDate(pliEoTemp.getDesignDutyDueDate());
} else if(StringUtils.equals(taskDefinitionKey,DesignComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue())
|| StringUtils.equals(taskDefinitionKey,DesignComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue())){
contentCn = "您好，"+currentUser.getUsername()+"向您分发了该任务，请及时查看处理，谢谢！";
contentEn = "Hello! "+currentUser.getUsername()+" has assigned the task to you. Please check and address it in a timely manner. Thank you!";
templateId = TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue();
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);
params.put("serialNumbers", pliEoTemp.getSerialNumber());
params.put("contentCn", contentCn);
params.put("contentEn", contentEn);
params.put("id",projectLawsInventoryId);
JSONObject sendMsgJson = new JSONObject();
sendMsgJson.put("requestSource",RequestSourceEnum.WORK_FLOW.getValue());
sendMsgJson.put("operatorType",OperatorTypeEnum.SEND_MSG.getValue());
sendMsgJson.put("templateId", templateId);
sendMsgJson.put("params", params);
this.processCall(sendMsgJson);
} }
Map<String,Object> params = new HashMap<>();
params.put("userIdList",Arrays.asList(designTransferUserId.split(",")));
params.put("projectLibraryId", projectLibraryId);
params.put("endTime", endTime);
params.put("serialNumbers", pliEoTemp.getSerialNumber());
params.put("contentCn", contentCn);
params.put("contentEn", contentEn);
params.put("id",projectLawsInventoryId);
JSONObject sendMsgJson = new JSONObject();
sendMsgJson.put("requestSource",RequestSourceEnum.WORK_FLOW.getValue());
sendMsgJson.put("operatorType",OperatorTypeEnum.SEND_MSG.getValue());
sendMsgJson.put("templateId", templateId);
sendMsgJson.put("params", params);
this.processCall(sendMsgJson);
} }
} }
} }
@@ -12178,67 +12180,69 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
pidEo.setUserId(verifyTransferUserId); pidEo.setUserId(verifyTransferUserId);
}); });
String taskIds = pidEoList.stream().map(ProcessInfoDetailEO::getTaskId).distinct().collect(Collectors.joining(",")); String taskIds = pidEoList.stream().map(ProcessInfoDetailEO::getTaskId).distinct().collect(Collectors.joining(","));
this.workFlowFeignClient.changeAssigneeBatch(taskIds,verifyTransferUserId); Result<String> changeAssigneeBatchResult = this.workFlowFeignClient.changeAssigneeBatch(taskIds,verifyTransferUserId);
this.processInfoDetailEOService.updateBatchById(pidEoList); if (changeAssigneeBatchResult.isSuccess()) {
this.processInfoDetailEOService.updateBatchById(pidEoList);
for (ProcessInfoDetailEO pidEo : pidEoList) { for (ProcessInfoDetailEO pidEo : pidEoList) {
List<ProcessInfoEO> piEoListTemp = piEoList.stream().filter(piEo -> { List<ProcessInfoEO> piEoListTemp = piEoList.stream().filter(piEo -> {
boolean flag = false;
if (StringUtils.equals(piEo.getActiProcInstId(), pidEo.getActiProcInstId())) {
flag = true;
}
return flag;
}).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(piEoListTemp)){
ProcessInfoEO piEoTemp = piEoListTemp.get(0);
String projectLawsInventoryId = piEoTemp.getProjectLawsInventoryId();
List<ProjectLawsInventoryEO> pliEoListTemp = pliEoList.stream().filter(pliEo -> {
boolean flag = false; boolean flag = false;
if (StringUtils.equals(pliEo.getId(), projectLawsInventoryId)) { if (StringUtils.equals(piEo.getActiProcInstId(), pidEo.getActiProcInstId())) {
flag = true; flag = true;
} }
return flag; return flag;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(pliEoListTemp)){ if(CollectionUtils.isNotEmpty(piEoListTemp)){
ProjectLawsInventoryEO pliEoTemp = pliEoListTemp.get(0); ProcessInfoEO piEoTemp = piEoListTemp.get(0);
String projectLawsInventoryId = piEoTemp.getProjectLawsInventoryId();
Date endTime = null; List<ProjectLawsInventoryEO> pliEoListTemp = pliEoList.stream().filter(pliEo -> {
String contentCn = ""; boolean flag = false;
String contentEn = ""; if (StringUtils.equals(pliEo.getId(), projectLawsInventoryId)) {
String templateId = ""; flag = true;
String taskDefinitionKey = pidEo.getTaskDefinitionKey(); }
if(StringUtils.equals(taskDefinitionKey,VerifyComplianceFlowNodeKeyEnum.ZRRQR.getValue()) return flag;
|| StringUtils.equals(taskDefinitionKey,VerifyComplianceFlowNodeKeyEnum.DEZRRQR.getValue())){ }).collect(Collectors.toList());
contentCn = "您好，请及时查看确认以下任务要求，谢谢！";
contentEn = "Hello! Please check and confirm the following task requirement in a timely manner. Thank you!"; if(CollectionUtils.isNotEmpty(pliEoListTemp)){
templateId = TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(); ProjectLawsInventoryEO pliEoTemp = pliEoListTemp.get(0);
endTime = pliEoTemp.getVerifyDutyDueDate();
} else if(StringUtils.equals(taskDefinitionKey,VerifyComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue()) String endTime = "";
|| StringUtils.equals(taskDefinitionKey,VerifyComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue())){ String contentCn = "";
contentCn = "您好，"+currentUser.getUsername()+"向您分发了该任务，请及时查看处理，谢谢！"; String contentEn = "";
contentEn = "Hello! "+currentUser.getUsername()+" has assigned the task to you. Please check and address it in a timely manner. Thank you!"; String templateId = "";
templateId = TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(); String taskDefinitionKey = pidEo.getTaskDefinitionKey();
endTime = pliEoTemp.getVerifyDueDate(); if(StringUtils.equals(taskDefinitionKey,VerifyComplianceFlowNodeKeyEnum.ZRRQR.getValue())
|| StringUtils.equals(taskDefinitionKey,VerifyComplianceFlowNodeKeyEnum.DEZRRQR.getValue())){
contentCn = "您好，请及时查看确认以下任务要求，谢谢！";
contentEn = "Hello! Please check and confirm the following task requirement in a timely manner. Thank you!";
templateId = TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue();
endTime = DateUtils.formatDate(pliEoTemp.getVerifyDutyDueDate());
} else if(StringUtils.equals(taskDefinitionKey,VerifyComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue())
|| StringUtils.equals(taskDefinitionKey,VerifyComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue())){
contentCn = "您好，"+currentUser.getUsername()+"向您分发了该任务，请及时查看处理，谢谢！";
contentEn = "Hello! "+currentUser.getUsername()+" has assigned the task to you. Please check and address it in a timely manner. Thank you!";
templateId = TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue();
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);
params.put("serialNumbers", pliEoTemp.getSerialNumber());
params.put("contentCn", contentCn);
params.put("contentEn", contentEn);
params.put("id",projectLawsInventoryId);
JSONObject sendMsgJson = new JSONObject();
sendMsgJson.put("requestSource",RequestSourceEnum.WORK_FLOW.getValue());
sendMsgJson.put("operatorType",OperatorTypeEnum.SEND_MSG.getValue());
sendMsgJson.put("templateId", templateId);
sendMsgJson.put("params", params);
this.processCall(sendMsgJson);
} }
Map<String,Object> params = new HashMap<>();
params.put("userIdList",Arrays.asList(verifyTransferUserId.split(",")));
params.put("projectLibraryId", projectLibraryId);
params.put("endTime", endTime);
params.put("serialNumbers", pliEoTemp.getSerialNumber());
params.put("contentCn", contentCn);
params.put("contentEn", contentEn);
params.put("id",projectLawsInventoryId);
JSONObject sendMsgJson = new JSONObject();
sendMsgJson.put("requestSource",RequestSourceEnum.WORK_FLOW.getValue());
sendMsgJson.put("operatorType",OperatorTypeEnum.SEND_MSG.getValue());
sendMsgJson.put("templateId", templateId);
sendMsgJson.put("params", params);
this.processCall(sendMsgJson);
} }
} }
} }