From ae04a23e469b4069594c3bbf5ee516d84280c2ba Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 4 Jan 2024 15:00:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=9C=80=E7=BB=88=E4=B8=BB=E8=B5=B7=E8=8D=89=E4=BA=BA?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E8=8A=82=E7=82=B9=E7=A9=BA=E6=8C=87=E9=92=88?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/ProcessESRevisionEndListener.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) 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 650e091f..54cd096a 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 @@ -53,9 +53,6 @@ public class ProcessESRevisionEndListener implements ExecutionListener { @Resource private ILawsCommonService lawsCommonService; - @Resource - private ILawsEnterpriseStandardService esService; - @Override public void notify(DelegateExecution delegateExecution) { // 获取流程实例Id @@ -87,19 +84,17 @@ public class ProcessESRevisionEndListener implements ExecutionListener { } // 标准状态 String tryFlag = (String) variables.get(FieldCommon.TRY_FLAG); - if (tryFlag.equals(YesOrNoEnum.YES.getValue())) { - variables.put(FieldCommon.STANDARD_STATE, StandardStateEnum.TRIAL_OPERATION.getStateValue()); - } else { - variables.put(FieldCommon.STANDARD_STATE, StandardStateEnum.RELEASE.getStateValue()); + if (tryFlag != null) { + if (tryFlag.equals(YesOrNoEnum.YES.getValue())) { + variables.put(FieldCommon.STANDARD_STATE, StandardStateEnum.TRIAL_OPERATION.getStateValue()); + } } + variables.put(FieldCommon.STANDARD_STATE, StandardStateEnum.RELEASE.getStateValue()); variables.put(FieldCommon.MODULE, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); // 发布企标 lawsCommonService.commonAdd(variables); String espId = data.getEspId(); EnterpriseStandardPlan esp = espService.getById(espId); - LambdaQueryWrapper esWrapper = new LambdaQueryWrapper<>(); - esWrapper.eq(LawsEnterpriseStandard::getStandardNumber, standardNumber); - LawsEnterpriseStandard es = esService.getOne(esWrapper); // 保存评审会记录 EnterpriseStandardReviewMeetingRecord esRmr = new EnterpriseStandardReviewMeetingRecord(); esRmr.setStandardId(esp.getId());