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

Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

Browse Source
This commit is contained in:
gaojiabao
2023-06-12 14:05:02 +08:00
parent dd3692dd92 6325b8ef92
commit 1bd71cc2c4
2 changed files with 7 additions and 2 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
+5
View File
@@ -348,6 +348,7 @@ public class ActSarItemsBussEOService {
String prcCreateUser = String.valueOf(standMap.get("prcCreateUser")); String prcCreateUser = String.valueOf(standMap.get("prcCreateUser"));
String standType = String.valueOf(standMap.get("standType")); String standType = String.valueOf(standMap.get("standType"));
String DTQBBHBUSS = String.valueOf(standMap.get("DTQBBHBUSS")); String DTQBBHBUSS = String.valueOf(standMap.get("DTQBBHBUSS"));
String standNum = String.valueOf(standMap.get("standNum"));//制修订时顺序号
// String isJudge = String.valueOf(standMap.get("ifIn")); //是否经过技术评估 // String isJudge = String.valueOf(standMap.get("ifIn")); //是否经过技术评估
SarBussionessStand sarBussionessStand = new SarBussionessStand(); SarBussionessStand sarBussionessStand = new SarBussionessStand();
// if(standMap.containsKey("standId")) { // if(standMap.containsKey("standId")) {
@@ -416,6 +417,10 @@ public class ActSarItemsBussEOService {
} }
} }
if (StringUtils.isNotBlank(standNum)){
sarBussionessStand.setStandNumber(standNum);
sarBussionessStand.setStandSn(standNum);
}
List<SarBussionessStand> lawsList = iSarBussionessStandService.selectStandardsByStandNumber(standCode); List<SarBussionessStand> lawsList = iSarBussionessStandService.selectStandardsByStandNumber(standCode);
// if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) { // if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) {
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()))){ if(!delList.isEmpty() && !"sync".equals(page.getSyncParam()) && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){
// elasticsearchService.deleteBatchId(delList,"stand"); elasticsearchService.deleteBatchId(delList,"stand");
// elasticsearchService.deleteBatchId(delList,"fulltextserch"); elasticsearchService.deleteBatchId(delList,"fulltextserch");
logger.info("重置国内外标准：删除-共"+delList.size()+"条数据"); logger.info("重置国内外标准：删除-共"+delList.size()+"条数据");
}else{ }else{
logger.info("重置国内外标准：没有删除数据，但应该删除"+delList.size()+"条数据"); logger.info("重置国内外标准：没有删除数据，但应该删除"+delList.size()+"条数据");