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..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,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")) { @@ -416,6 +417,10 @@ public class ActSarItemsBussEOService { } } + if (StringUtils.isNotBlank(standNum)){ + sarBussionessStand.setStandNumber(standNum); + sarBussionessStand.setStandSn(standNum); + } List lawsList = iSarBussionessStandService.selectStandardsByStandNumber(standCode); // if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) { 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()+"条数据");