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

feat: 企标制修订流程-征求意见设置截止时间

Browse Source
This commit is contained in:
mzaxd
2023-12-25 13:34:54 +08:00
parent 9dd66e8dcf
commit 200450fbab
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+3 -3
View File
@@ -269,6 +269,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
LambdaUpdateWrapper<ProcessEsRevision> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<ProcessEsRevision> updateWrapper = new LambdaUpdateWrapper<>();
wrapper.eq(ProcessEsRevision::getProcessInstanceId, processInstanceId); wrapper.eq(ProcessEsRevision::getProcessInstanceId, processInstanceId);
wrapper.eq(ProcessEsRevision::getDelFlag, YesOrNoEnum.NO.getValue()); wrapper.eq(ProcessEsRevision::getDelFlag, YesOrNoEnum.NO.getValue());
ProcessEsRevision dataDb = getOne(wrapper);
updateWrapper.eq(ProcessEsRevision::getProcessInstanceId, processInstanceId); updateWrapper.eq(ProcessEsRevision::getProcessInstanceId, processInstanceId);
updateWrapper.eq(ProcessEsRevision::getDelFlag, YesOrNoEnum.NO.getValue()); updateWrapper.eq(ProcessEsRevision::getDelFlag, YesOrNoEnum.NO.getValue());
// 获取当前流程 // 获取当前流程
@@ -307,7 +308,6 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
break; break;
case OTHER_DRAFT_USER_UPLOAD: case OTHER_DRAFT_USER_UPLOAD:
data = revisionData.getData(); data = revisionData.getData();
ProcessEsRevision dataDb = getOne(wrapper);
List<OtherDraftUserVO> otherDraftUserVOListDB = dataDb.parseOtherDraftUserVOS(); List<OtherDraftUserVO> otherDraftUserVOListDB = dataDb.parseOtherDraftUserVOS();
Map<String, OtherDraftUserVO> map = otherDraftUserVOListDB.stream() Map<String, OtherDraftUserVO> map = otherDraftUserVOListDB.stream()
.collect(Collectors.toMap(OtherDraftUserVO::getUser, o -> o)); .collect(Collectors.toMap(OtherDraftUserVO::getUser, o -> o));
@@ -342,7 +342,6 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
break; break;
case RATER_RATE: case RATER_RATE:
// 保存打分记录 // 保存打分记录
dataDb = getOne(wrapper);
data = revisionData.getData(); data = revisionData.getData();
List<ReviewMeetingDetailVO> reviewMeetingDetails = data.getReviewMeetingDetails(); List<ReviewMeetingDetailVO> reviewMeetingDetails = data.getReviewMeetingDetails();
ProcessEsRevision revisionDb = getById(dataDb.getId()); ProcessEsRevision revisionDb = getById(dataDb.getId());
@@ -372,7 +371,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
flowUser = revisionData.getFlowUser(); flowUser = revisionData.getFlowUser();
String adviceUsers = (String) flowUser.get("adviceUserList"); String adviceUsers = (String) flowUser.get("adviceUserList");
List<String> adviceUserList = Arrays.asList(adviceUsers.split(",")); List<String> adviceUserList = Arrays.asList(adviceUsers.split(","));
taskService.setVariable(taskId, "adviceUserList", adviceUserList); taskService.setVariableLocal(taskId, "adviceUserList", adviceUserList);
taskService.setVariableLocal(taskId, "adviceDeadline", data.getAdviceDeadline());
userMap.put("adviceUserList", adviceUserList); userMap.put("adviceUserList", adviceUserList);
// 设置截止时间 // 设置截止时间
saveOrUpdate(data); saveOrUpdate(data);