ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(稽查整改流程): 79732

Browse Source
This commit is contained in:
yjz
2023-12-29 16:43:19 +08:00
parent 05c8d31782
commit 1bbce46b09
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java
+2
View File
@@ -109,6 +109,7 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer
.singleResult(); .singleResult();
// 更新流程审批信息 // 更新流程审批信息
processApprovalRecord.setUserId((String) map.get("responsible"));
processApprovalRecord.setProjectId(processAll.getProjectId()); processApprovalRecord.setProjectId(processAll.getProjectId());
processApprovalRecord.setFinishFlag(FinishFlagEnum.INCOMPLETE.getValue()); processApprovalRecord.setFinishFlag(FinishFlagEnum.INCOMPLETE.getValue());
processApprovalRecord.setEndTime(new Date()); processApprovalRecord.setEndTime(new Date());
@@ -239,6 +240,7 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer
for (UserInfo userInfo : userInfoList) { for (UserInfo userInfo : userInfoList) {
processNodeLinkService.update(new LambdaUpdateWrapper<ProcessNodeLink>() processNodeLinkService.update(new LambdaUpdateWrapper<ProcessNodeLink>()
.eq(ProcessNodeLink::getProcessNodeId, userInfo.getId()) .eq(ProcessNodeLink::getProcessNodeId, userInfo.getId())
.eq(ProcessNodeLink::getProcessInstanceId, processAll.getProcessInstanceId())
.set(ProcessNodeLink::getUserId, userInfo.getLinkUserIds())); .set(ProcessNodeLink::getUserId, userInfo.getLinkUserIds()));
} }
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectRectifyPlanServiceImpl.java
+1 -1
View File
@@ -173,7 +173,7 @@ public class EnterpriseStandardInspectRectifyPlanServiceImpl extends ServiceImpl
EnterpriseStandardInspectReport enterpriseStandardInspectReport = EnterpriseStandardInspectReportService.getById(item.getInspectReportId()); EnterpriseStandardInspectReport enterpriseStandardInspectReport = EnterpriseStandardInspectReportService.getById(item.getInspectReportId());
// 稽查内容查询 // 稽查内容查询
EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId()); EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId());
enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getStandardNo()); enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause());
enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement()); enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
item.setEnterpriseStandardInspectReport(enterpriseStandardInspectReport); item.setEnterpriseStandardInspectReport(enterpriseStandardInspectReport);
// 翻译 // 翻译