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
2024-01-15 09:46:43 +08:00
parent 17f721cfd2
commit d75d1af0e6
7 changed files with 112 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlowServiceImpl.java
+15 -1
View File
@@ -170,6 +170,21 @@ public class EsDeclareFlowServiceImpl implements IEsDeclareFlowService {
public void flowSave(EsDeclareFlowVO esDeclareFlowVO) {
// 企标宣贯业务表
processEsDeclareService.saveOrUpdate(esDeclareFlowVO.getProcessEsDeclare());
// 流程信息
ProcessAll processAll = esDeclareFlowVO.getProcessAll();
// 流程审批信息
ProcessApprovalRecord processApprovalRecord = esDeclareFlowVO.getProcessApprovalRecord();
// 更新流程信息
processAllService.update(new LambdaUpdateWrapper<ProcessAll>()
.eq(ProcessAll::getId, processAll.getId())
.set(ProcessAll::getPrcName, processAll.getPrcName())
.set(ProcessAll::getPrcMes, processAll.getMes()));
// 更新流程审批信息
processApprovalRecordService.update(new LambdaUpdateWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId())
.set(ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText())
.set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile()));
}
@Override
@@ -217,7 +232,6 @@ public class EsDeclareFlowServiceImpl implements IEsDeclareFlowService {
}else {
// 不存在草稿
processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getProjectId, projectId)
.eq(ProcessApprovalRecord::getUserId, loginUser.getId())
.eq(StringUtils.isNotBlank(taskId), ProcessApprovalRecord::getTaskId, taskId)
, false);
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java
+16 -2
View File
@@ -237,6 +237,21 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService {
public void flowSave(EsInspectFlowVO esInspectFlowVO) {
// 处理业务表数据
handleBusinessData(esInspectFlowVO);
// 流程信息
ProcessAll processAll = esInspectFlowVO.getProcessAll();
// 流程审批信息
ProcessApprovalRecord processApprovalRecord = esInspectFlowVO.getProcessApprovalRecord();
// 更新流程信息
processAllService.update(new LambdaUpdateWrapper<ProcessAll>()
.eq(ProcessAll::getId, processAll.getId())
.set(ProcessAll::getPrcName, processAll.getPrcName())
.set(ProcessAll::getPrcMes, processAll.getMes()));
// 更新流程审批信息
processApprovalRecordService.update(new LambdaUpdateWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId())
.set(ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText())
.set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile()));
}
@Override
@@ -284,9 +299,8 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService {
}else {
// 不存在草稿
processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getProjectId, projectId)
.eq(ProcessApprovalRecord::getUserId, loginUser.getId())
.eq(StringUtils.isNotBlank(taskId), ProcessApprovalRecord::getTaskId, taskId)
.eq(ProcessApprovalRecord::getTaskId, taskId)
, false);
}
// 业务表数据
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlowServiceImpl.java
+17 -2
View File
@@ -163,6 +163,22 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF
public void flowSave(EsInspectDelayApplyFlowVO esInspectDelayApplyFlowVO) {
// 处理业务表数据
handleBusinessData(esInspectDelayApplyFlowVO);
// 流程信息
ProcessAll processAll = esInspectDelayApplyFlowVO.getProcessAll();
// 流程审批信息
ProcessApprovalRecord processApprovalRecord = esInspectDelayApplyFlowVO.getProcessApprovalRecord();
// 更新流程信息
processAllService.update(new LambdaUpdateWrapper<ProcessAll>()
.eq(ProcessAll::getId, processAll.getId())
.set(ProcessAll::getPrcName, processAll.getPrcName())
.set(ProcessAll::getPrcMes, processAll.getMes()));
// 更新流程审批信息
processApprovalRecordService.update(new LambdaUpdateWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId())
.set(ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText())
.set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile()));
}
@Override
@@ -210,9 +226,8 @@ public class EsInspectDelayApplyFlowServiceImpl implements IEsInspectDelayApplyF
}else {
// 不存在草稿
processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getProjectId, projectId)
.eq(ProcessApprovalRecord::getUserId, loginUser.getId())
.eq(StringUtils.isNotBlank(taskId), ProcessApprovalRecord::getTaskId, taskId)
.eq(ProcessApprovalRecord::getTaskId, taskId)
, false);
}
// 业务表数据
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java
+15 -2
View File
@@ -192,6 +192,9 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService {
public void flowSave(EsInspectPlanFlowVO esInspectPlanFlowVO) {
// 流程信息
ProcessAll processAll = esInspectPlanFlowVO.getProcessAll();
// 流程审批信息
ProcessApprovalRecord processApprovalRecord = esInspectPlanFlowVO.getProcessApprovalRecord();
// 处理业务表数据
handleBusinessData(esInspectPlanFlowVO);
@@ -203,6 +206,17 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService {
taskService.setVariable(processAll.getTaskId(), COUNTERSIGN_TAG, esInspectPlanFlowVO.getCountersignTag());
}
}
// 更新流程信息
processAllService.update(new LambdaUpdateWrapper<ProcessAll>()
.eq(ProcessAll::getId, processAll.getId())
.set(ProcessAll::getPrcName, processAll.getPrcName())
.set(ProcessAll::getPrcMes, processAll.getMes()));
// 更新流程审批信息
processApprovalRecordService.update(new LambdaUpdateWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId())
.set(ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText())
.set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile()));
}
private Map<String, Object> listToString(Map<String, Object> map) {
@@ -262,9 +276,8 @@ public class EsInspectPlanFlowServiceImpl implements IEsInspectPlanFlowService {
}else {
// 不存在草稿
processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getProjectId, projectId)
.eq(ProcessApprovalRecord::getUserId, loginUser.getId())
.eq(StringUtils.isNotBlank(taskId), ProcessApprovalRecord::getTaskId, taskId)
.eq(ProcessApprovalRecord::getTaskId, taskId)
, false);
}
// 会签信息
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlowServiceImpl.java
+16 -2
View File
@@ -130,6 +130,21 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer
public void flowSave(EsInspectRectifyFlowVO esInspectReportFlowVO) {
// 处理业务表数据
handleBusinessData(esInspectReportFlowVO);
// 流程信息
ProcessAll processAll = esInspectReportFlowVO.getProcessAll();
// 流程审批信息
ProcessApprovalRecord processApprovalRecord = esInspectReportFlowVO.getProcessApprovalRecord();
// 更新流程信息
processAllService.update(new LambdaUpdateWrapper<ProcessAll>()
.eq(ProcessAll::getId, processAll.getId())
.set(ProcessAll::getPrcName, processAll.getPrcName())
.set(ProcessAll::getPrcMes, processAll.getMes()));
// 更新流程审批信息
processApprovalRecordService.update(new LambdaUpdateWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId())
.set(ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText())
.set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile()));
}
@Override
@@ -177,9 +192,8 @@ public class EsInspectRectifyFlowServiceImpl implements IEsInspectRectifyFlowSer
}else {
// 不存在草稿
processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getProjectId, projectId)
.eq(ProcessApprovalRecord::getUserId, loginUser.getId())
.eq(StringUtils.isNotBlank(taskId), ProcessApprovalRecord::getTaskId, taskId)
.eq(ProcessApprovalRecord::getTaskId, taskId)
, false);
}
esInspectReportFlowVO.setProcessAll(processAll);
laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlowServiceImpl.java
+16 -2
View File
@@ -139,6 +139,21 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe
public void flowSave(EsPermissionApplyFlowVO esPermissionApplyFlowVO) {
// 处理业务表数据
handleBusinessData(esPermissionApplyFlowVO);
// 流程信息
ProcessAll processAll = esPermissionApplyFlowVO.getProcessAll();
// 流程审批信息
ProcessApprovalRecord processApprovalRecord = esPermissionApplyFlowVO.getProcessApprovalRecord();
// 更新流程信息
processAllService.update(new LambdaUpdateWrapper<ProcessAll>()
.eq(ProcessAll::getId, processAll.getId())
.set(ProcessAll::getPrcName, processAll.getPrcName())
.set(ProcessAll::getPrcMes, processAll.getMes()));
// 更新流程审批信息
processApprovalRecordService.update(new LambdaUpdateWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId())
.set(ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText())
.set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile()));
}
@Override
@@ -186,9 +201,8 @@ public class EsPermissionApplyFlowServiceImpl implements EsPermissionApplyFlowSe
}else {
// 不存在草稿
processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getProjectId, projectId)
.eq(ProcessApprovalRecord::getUserId, loginUser.getId())
.eq(StringUtils.isNotBlank(taskId), ProcessApprovalRecord::getTaskId, taskId)
.eq(ProcessApprovalRecord::getTaskId, taskId)
, false);
}
esPermissionApplyFlowVO.setProcessAll(processAll);
laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlowServiceImpl.java
+17 -2
View File
@@ -158,6 +158,22 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService {
processMeetingManagePersonnelService.save(processMeetingManagePersonnel);
}
}
// 流程信息
ProcessAll processAll = meetingManageFlowVO.getProcessAll();
// 流程审批信息
ProcessApprovalRecord processApprovalRecord = meetingManageFlowVO.getProcessApprovalRecord();
// 更新流程信息
processAllService.update(new LambdaUpdateWrapper<ProcessAll>()
.eq(ProcessAll::getId, processAll.getId())
.set(ProcessAll::getPrcName, processAll.getPrcName())
.set(ProcessAll::getPrcMes, processAll.getMes()));
// 更新流程审批信息
processApprovalRecordService.update(new LambdaUpdateWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getTaskId, processAll.getTaskId())
.set(ProcessApprovalRecord::getCommitText, processApprovalRecord.getCommitText())
.set(ProcessApprovalRecord::getCommitFile, processApprovalRecord.getCommitFile()));
}
@Override
@@ -205,9 +221,8 @@ public class MeetingManageFlowServiceImpl implements IMeetingManageFlowService {
}else {
// 不存在草稿
processApprovalRecord = processApprovalRecordService.getOne(new LambdaQueryWrapper<ProcessApprovalRecord>()
.eq(ProcessApprovalRecord::getProjectId, projectId)
.eq(ProcessApprovalRecord::getUserId, loginUser.getId())
.eq(StringUtils.isNotBlank(taskId), ProcessApprovalRecord::getTaskId, taskId)
.eq(ProcessApprovalRecord::getTaskId, taskId)
, false);
}
meetingManageFlowVO.setProcessAll(processAll);