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

fix: 审批信息完善

Browse Source
This commit is contained in:
yjz
2023-12-14 09:09:07 +08:00
parent 9da9663ef9
commit 7e980e07e0
6 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java
+3 -1
View File
@@ -290,7 +290,9 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService {
.set(StringUtils.isNotBlank(processApprovalRecord.getCommitText()), .set(StringUtils.isNotBlank(processApprovalRecord.getCommitText()),
ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText())
.set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag()) .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag())
.set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue())); .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue())
.set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile())
.set(ProcessApprovalRecord::getEndTime, new Date()));
Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult();
if (task!= null) { if (task!= null) {
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java
+3 -1
View File
@@ -245,7 +245,9 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF
.set(StringUtils.isNotBlank(processApprovalRecord.getCommitText()), .set(StringUtils.isNotBlank(processApprovalRecord.getCommitText()),
ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText())
.set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag()) .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag())
.set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue())); .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue())
.set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile())
.set(ProcessApprovalRecord::getEndTime, new Date()));
Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult();
if (task!= null) { if (task!= null) {
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java
+2 -1
View File
@@ -319,8 +319,9 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService {
.eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) .eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId())
.set(StringUtils.isNotBlank(processApprovalRecord.getCommitText()), .set(StringUtils.isNotBlank(processApprovalRecord.getCommitText()),
ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText())
.set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile()) .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag())
.set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue()) .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue())
.set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile())
.set(ProcessApprovalRecord::getEndTime, new Date())); .set(ProcessApprovalRecord::getEndTime, new Date()));
Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult();
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java
+3 -1
View File
@@ -248,7 +248,9 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer
.set(StringUtils.isNotBlank(processApprovalRecord.getCommitText()), .set(StringUtils.isNotBlank(processApprovalRecord.getCommitText()),
ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText())
.set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag()) .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag())
.set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue())); .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue())
.set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile())
.set(ProcessApprovalRecord::getEndTime, new Date()));
Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult();
if (task!= null) { if (task!= null) {
laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java
+3 -1
View File
@@ -256,7 +256,9 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe
.set(StringUtils.isNotBlank(processApprovalRecord.getCommitText()), .set(StringUtils.isNotBlank(processApprovalRecord.getCommitText()),
ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText())
.set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag()) .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag())
.set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue())); .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue())
.set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile())
.set(ProcessApprovalRecord::getEndTime, new Date()));
Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult();
if (task!= null) { if (task!= null) {
laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java
+3 -1
View File
@@ -261,7 +261,9 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService {
.set(StringUtils.isNotBlank(processApprovalRecord.getCommitText()), .set(StringUtils.isNotBlank(processApprovalRecord.getCommitText()),
ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText()) ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText())
.set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag()) .set(ProcessApprovalRecord::getCommitFlag, processApprovalRecord.getCommitFlag())
.set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue())); .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue())
.set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile())
.set(ProcessApprovalRecord::getEndTime, new Date()));
Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult(); Task task = taskService.createTaskQuery().taskId(processAll.getTaskId()).singleResult();
if (task!= null) { if (task!= null) {