FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!101
This commit is contained in:
高嵩
2023-06-09 10:10:36 +08:00
parent 2a6f73c7ef 6325b8ef92
commit b1df47a9b7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
+3 -3
View File
@@ -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<SarBussionessStand> lawsList = iSarBussionessStandService.selectStandardsByStandNumber(standCode);
// if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) {
// sarStandardsInfoEO.setMenuId("64df1d5522bb49c09af2");
adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterServiceTemp.java
+2 -2
View File
@@ -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()+"条数据");