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
+14 -10
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,7 +12075,8 @@ 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);
if (changeAssigneeBatchResult.isSuccess()) {
this.processInfoDetailEOService.updateBatchById(pidEoList); this.processInfoDetailEOService.updateBatchById(pidEoList);
for (ProcessInfoDetailEO pidEo : pidEoList) { for (ProcessInfoDetailEO pidEo : pidEoList) {
@@ -12102,7 +12103,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(CollectionUtils.isNotEmpty(pliEoListTemp)){ if(CollectionUtils.isNotEmpty(pliEoListTemp)){
ProjectLawsInventoryEO pliEoTemp = pliEoListTemp.get(0); ProjectLawsInventoryEO pliEoTemp = pliEoListTemp.get(0);
Date endTime = null; String endTime = "";
String contentCn = ""; String contentCn = "";
String contentEn = ""; String contentEn = "";
String templateId = ""; String templateId = "";
@@ -12112,13 +12113,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
contentCn = "您好，请及时查看确认以下任务要求，谢谢！"; contentCn = "您好，请及时查看确认以下任务要求，谢谢！";
contentEn = "Hello! Please check and confirm the following task requirement in a timely manner. Thank you!"; 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_CONFIRMATION1.getValue();
endTime = pliEoTemp.getDesignDutyDueDate(); endTime = DateUtils.formatDate(pliEoTemp.getDesignDutyDueDate());
} else if(StringUtils.equals(taskDefinitionKey,DesignComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue()) } else if(StringUtils.equals(taskDefinitionKey,DesignComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue())
|| StringUtils.equals(taskDefinitionKey,DesignComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue())){ || StringUtils.equals(taskDefinitionKey,DesignComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue())){
contentCn = "您好，"+currentUser.getUsername()+"向您分发了该任务，请及时查看处理，谢谢！"; contentCn = "您好，"+currentUser.getUsername()+"向您分发了该任务，请及时查看处理，谢谢！";
contentEn = "Hello! "+currentUser.getUsername()+" has assigned the task to you. Please check and address it in a timely manner. Thank you!"; 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(); templateId = TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue();
endTime = pliEoTemp.getDesignDueDate(); endTime = DateUtils.formatDate(pliEoTemp.getDesignDueDate());
} }
Map<String,Object> params = new HashMap<>(); Map<String,Object> params = new HashMap<>();
@@ -12141,6 +12142,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
} }
} }
}
/** /**
* 验证符合性相关待办任务强制转办 * 验证符合性相关待办任务强制转办
@@ -12178,7 +12180,8 @@ 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);
if (changeAssigneeBatchResult.isSuccess()) {
this.processInfoDetailEOService.updateBatchById(pidEoList); this.processInfoDetailEOService.updateBatchById(pidEoList);
for (ProcessInfoDetailEO pidEo : pidEoList) { for (ProcessInfoDetailEO pidEo : pidEoList) {
@@ -12205,7 +12208,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(CollectionUtils.isNotEmpty(pliEoListTemp)){ if(CollectionUtils.isNotEmpty(pliEoListTemp)){
ProjectLawsInventoryEO pliEoTemp = pliEoListTemp.get(0); ProjectLawsInventoryEO pliEoTemp = pliEoListTemp.get(0);
Date endTime = null; String endTime = "";
String contentCn = ""; String contentCn = "";
String contentEn = ""; String contentEn = "";
String templateId = ""; String templateId = "";
@@ -12215,13 +12218,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
contentCn = "您好，请及时查看确认以下任务要求，谢谢！"; contentCn = "您好，请及时查看确认以下任务要求，谢谢！";
contentEn = "Hello! Please check and confirm the following task requirement in a timely manner. Thank you!"; 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_CONFIRMATION1.getValue();
endTime = pliEoTemp.getVerifyDutyDueDate(); endTime = DateUtils.formatDate(pliEoTemp.getVerifyDutyDueDate());
} else if(StringUtils.equals(taskDefinitionKey,VerifyComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue()) } else if(StringUtils.equals(taskDefinitionKey,VerifyComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue())
|| StringUtils.equals(taskDefinitionKey,VerifyComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue())){ || StringUtils.equals(taskDefinitionKey,VerifyComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue())){
contentCn = "您好，"+currentUser.getUsername()+"向您分发了该任务，请及时查看处理，谢谢！"; contentCn = "您好，"+currentUser.getUsername()+"向您分发了该任务，请及时查看处理，谢谢！";
contentEn = "Hello! "+currentUser.getUsername()+" has assigned the task to you. Please check and address it in a timely manner. Thank you!"; 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(); templateId = TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue();
endTime = pliEoTemp.getVerifyDueDate(); endTime = DateUtils.formatDate(pliEoTemp.getVerifyDueDate());
} }
Map<String,Object> params = new HashMap<>(); Map<String,Object> params = new HashMap<>();
@@ -12244,4 +12247,5 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
} }
} }
}
} }