From b20d14a5623dc1b201ce697d17c6112f7d7c91cf Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 24 Oct 2022 17:48:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=EF=BC=9A?= =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E6=97=B6=E6=89=8D=E7=94=9F=E6=88=90=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/workFlow/service/ActSarItemsBussEOService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index a4f2e0f9..6f2b5d73 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -208,7 +208,9 @@ public class ActSarItemsBussEOService { +"创建了《"+ esName +"》,其计划结果为复审"; esRevisePlanLogDao.insert(new EsRevisePlanLog(null,id,msg,date)); }else{ - iEsRevisePlanService.addPlan(esRevisePlanDTO); + if("1".equals(reviewResults)) { // 修订时才生成企标计划 + iEsRevisePlanService.addPlan(esRevisePlanDTO); + } } } From 9e60b22671ae95cac9464abd1d9a49707fd15f8e Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 24 Oct 2022 20:19:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=EF=BC=9A?= =?UTF-8?q?=E9=9D=9E=E4=BF=AE=E8=AE=A2=E6=97=B6=E6=89=8D=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/workFlow/service/ActSarItemsBussEOService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index 6f2b5d73..21373804 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -132,7 +132,9 @@ public class ActSarItemsBussEOService { String sarStandAttrInfo = JSONObject.toJSONString(attrInfoMap); SarBussionessStand bussionessStand = new SarBussionessStand(); bussionessStand.setId(standId); - bussionessStand.setTextStatusBuss(textStatus); + if("2".equals(reviewResults) || "3".equals(reviewResults)) { // 废止，有效时才修改文本状态 + bussionessStand.setTextStatusBuss(textStatus); + } bussionessStand.setSarStandAttrEOStr(sarStandAttrInfo); iSarBussionessStandService.updateSarBussionessStand(bussionessStand);