From d9d21a51c413cf557fa9c6c558e5dc6904cf9fc3 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Tue, 1 Nov 2022 10:04:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=A1=E9=AA=8Cbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandardsInfo/controller/SarStandardsInfoController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 10f8c222..7bf2ac8b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -883,7 +883,7 @@ public class SarStandardsInfoController extends BaseController wrapper .eq("STAND_TYPE",page.getStandType()) .eq(null!=page.getStandSort(),"STAND_SORT",page.getStandSort()) .eq(null!=page.getStandNumber(),"STAND_NUMBER",page.getStandNumber()) - .eq(null!=page.getStandYear(),"STAND_YEAR",page.getStandYear()); + .eq(null!=page.getStandYear(),"STAND_YEAR",page.getStandYear()).eq("VALID_FLAG", 0); Integer s=sarStandardsInfoEOService.count(wrapper); if (s>0){ return Result.error(); From 53b2adbf50f0f04e2ee6455700e4949d4a777020 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Wed, 2 Nov 2022 13:34:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?log=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/workFlow/service/ActSarItemsBussEOService.java | 2 +- .../slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 dca0a541..aba17554 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 @@ -207,7 +207,7 @@ public class ActSarItemsBussEOService { String id = list.get(0).getId(); Date date = new Date(); String msg = UserUtils.getUser().getUname() + " " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date) + " " - +"创建了《"+ esName +"》,其计划结果为复审"; + +"通过复审流程创建了《"+ esName +"》,其复审结果为修订。"; esRevisePlanLogDao.insert(new EsRevisePlanLog(null,id,msg,date)); }else{ if("1".equals(reviewResults)) { // 修订时才生成企标计划 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index b5d1aa96..519067be 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -164,7 +164,7 @@ public class EsRevisePlanServiceImpl extends ServiceImpl Date: Thu, 3 Nov 2022 18:49:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandardsInfoServiceImpl.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 455a0079..fb76f09c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -3041,9 +3041,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl wrapper=new QueryWrapper<>(); wrapper.in("MENU_NAME",sarStandardsInfoEO.getStandSystem()); + wrapper.eq("DIC_ID","wnt12e6n258qkqgcl742"); wrapper.orderByDesc("length(PARENT_IDS)"); List standards=iSarMenuStandardService.list(wrapper); - if (null!=standards && standards.size()>0) { + if (null!=standards && standards.size() == 1) { List ids=new ArrayList<>(); if (StringUtils.isNotBlank(standards.get(0).getParentIds())){ if (standards.get(0).getParentIds().contains(",")){ @@ -3051,18 +3052,18 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl wrapper1 = new QueryWrapper<>(); - wrapper1.in("id", ids); - List res = iSarMenuStandardService.list(wrapper1); - if (null!=res && res.size()>0){ - Map map=new HashMap<>(); - res.forEach(sarMenuStandard -> {map.put(sarMenuStandard.getId(),sarMenuStandard.getMenuName());}); - String result=""; - for (String s:ids) { - result +="/"+map.get(s); + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.in("id", ids); + List res = iSarMenuStandardService.list(wrapper1); + if (null!=res && res.size()>0){ + Map map=new HashMap<>(); + res.forEach(sarMenuStandard -> {map.put(sarMenuStandard.getId(),sarMenuStandard.getMenuName());}); + String result=""; + for (String s:ids) { + result +="/"+map.get(s); + } + sarStandardsInfoEO.setStandSystem(result.substring(1,result.length())); } - sarStandardsInfoEO.setStandSystem(result.substring(1,result.length())); } }