From 3595afda47f6ee84876b92d35a0d5b5fafa369d4 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Wed, 7 Jun 2023 14:33:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=AE=E8=AE=A2?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=B6=E9=A1=BA=E5=BA=8F=E5=8F=B7=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=85=A5=E5=BA=93=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/workFlow/service/ActSarItemsBussEOService.java | 5 +++++ 1 file changed, 5 insertions(+) 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 626aff2c..e8df69c5 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 @@ -348,6 +348,7 @@ public class ActSarItemsBussEOService { String prcCreateUser = String.valueOf(standMap.get("prcCreateUser")); String standType = String.valueOf(standMap.get("standType")); String DTQBBHBUSS = String.valueOf(standMap.get("DTQBBHBUSS")); + String standNum = String.valueOf(standMap.get("standNum"));//修订时顺序号 // String isJudge = String.valueOf(standMap.get("ifIn")); //是否经过技术评估 SarBussionessStand sarBussionessStand = new SarBussionessStand(); // if(standMap.containsKey("standId")) { @@ -415,6 +416,10 @@ public class ActSarItemsBussEOService { } } } + if (StringUtils.isBlank(sarBussionessStand.getStandNumber())){ + sarBussionessStand.setStandNumber(standNum); + sarBussionessStand.setStandSn(standNum); + } List lawsList = iSarBussionessStandService.selectStandardsByStandNumber(standCode); From 76b14753029c31bcdc7dabc862e9893c94ec6258 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 8 Jun 2023 10:23:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=B6=E9=A1=BA=E5=BA=8F=E5=8F=B7=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/workFlow/service/ActSarItemsBussEOService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 e8df69c5..de331d2d 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 @@ -348,7 +348,7 @@ public class ActSarItemsBussEOService { String prcCreateUser = String.valueOf(standMap.get("prcCreateUser")); String standType = String.valueOf(standMap.get("standType")); String DTQBBHBUSS = String.valueOf(standMap.get("DTQBBHBUSS")); - String standNum = String.valueOf(standMap.get("standNum"));//修订时顺序号 + String standNum = String.valueOf(standMap.get("standNum"));//制修订时顺序号 // String isJudge = String.valueOf(standMap.get("ifIn")); //是否经过技术评估 SarBussionessStand sarBussionessStand = new SarBussionessStand(); // if(standMap.containsKey("standId")) { @@ -416,12 +416,12 @@ public class ActSarItemsBussEOService { } } } - if (StringUtils.isBlank(sarBussionessStand.getStandNumber())){ + + if (StringUtils.isNotBlank(standNum)){ sarBussionessStand.setStandNumber(standNum); sarBussionessStand.setStandSn(standNum); } - List lawsList = iSarBussionessStandService.selectStandardsByStandNumber(standCode); // if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) { // sarStandardsInfoEO.setMenuId("64df1d5522bb49c09af2"); From 6325b8ef92bbaed72699c8b33e965869c0d0ff98 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 9 Jun 2023 09:16:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B0=86es=E5=9B=BD=E5=86=85=E5=A4=96?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=88=A0=E9=99=A4=E7=9A=84=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=A7=A3=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/search/server/ResetSearchCenterServiceTemp.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterServiceTemp.java b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterServiceTemp.java index b1e147ee..b441ad48 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterServiceTemp.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterServiceTemp.java @@ -262,8 +262,8 @@ public class ResetSearchCenterServiceTemp { } } if(!delList.isEmpty() && !"sync".equals(page.getSyncParam()) && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){ -// elasticsearchService.deleteBatchId(delList,"stand"); -// elasticsearchService.deleteBatchId(delList,"fulltextserch"); + elasticsearchService.deleteBatchId(delList,"stand"); + elasticsearchService.deleteBatchId(delList,"fulltextserch"); logger.info("重置国内外标准：删除-共"+delList.size()+"条数据"); }else{ logger.info("重置国内外标准：没有删除数据，但应该删除"+delList.size()+"条数据");