diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java index e9d4feed..b8a6a112 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java @@ -97,9 +97,8 @@ public class ProcessESRevisionEndListener implements ExecutionListener { lawsCommonService.commonAdd(variables); String espId = data.getEspId(); EnterpriseStandardPlan esp = espService.getById(espId); - String newStandardNo = esp.getNewEnStandardNo(); LambdaQueryWrapper esWrapper = new LambdaQueryWrapper<>(); - esWrapper.eq(LawsEnterpriseStandard::getStandardNumber, newStandardNo); + esWrapper.eq(LawsEnterpriseStandard::getStandardNumber, standardNumber); LawsEnterpriseStandard es = esService.getOne(esWrapper); // 保存评审会记录 EnterpriseStandardReviewMeetingRecord esRmr = new EnterpriseStandardReviewMeetingRecord(); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java index 94e67b88..06cbec0d 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java @@ -361,6 +361,8 @@ public class EsRevisionServiceImpl extends ServiceImpl reviewMeetingDetails = data.getReviewMeetingDetails(); + // 设置当前评分人 + reviewMeetingDetails.forEach(reviewMeetingDetail -> reviewMeetingDetail.setAdjudicatorId(curUserId)); ProcessEsRevision revisionDb = getById(dataDb.getId()); List reviewMeetingDetailsDb = revisionDb.parseReviewMeetingDetails(); if (reviewMeetingDetailsDb == null) {