diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index 76383ad6..a54807ac 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -1610,11 +1610,12 @@ public class SearchCenterServiceImpl implements SearchCenterService { // } // } boolQueryShould - .should(QueryBuilders.wildcardQuery("sortTitle.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) - .should(QueryBuilders.termQuery("numberTitle", searchInfoEO.getSelectValue().toUpperCase()).boost(1004f)) - .should(QueryBuilders.wildcardQuery("yearOrder.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1003f)) - .should(QueryBuilders.wildcardQuery("nameTitle.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1002f)) - .should(QueryBuilders.wildcardQuery("title.keyword", "*" + searchInfoEO.getSelectValue().toUpperCase() + "*").boost(1000f)); + .should(QueryBuilders.wildcardQuery("sortTitle.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(1005f)) + //非 .keyword 无法查询出结果 + .should(QueryBuilders.wildcardQuery("numberTitle.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1004f)) + .should(QueryBuilders.wildcardQuery("yearOrder.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1003f)) + .should(QueryBuilders.wildcardQuery("nameTitle.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1002f)) + .should(QueryBuilders.wildcardQuery("title.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(1000f)); // queryBuilder1 = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), // "sortTitle","numberTitle","yearOrder","nameTitle","title" // ).field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f); diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java index be8a481e..535df843 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java @@ -188,7 +188,7 @@ public class UpdateStateStandSyncFz implements Runnable { QueryWrapper wrapperNotGB = new QueryWrapper(); wrapperNotGB.eq("VALID_FLAG","0"); wrapperNotGB.ne("STAND_SORT","GB"); - wrapperNotGB.in("TEXT_STATUS",wrapperNotGB); + wrapperNotGB.in("TEXT_STATUS",bdtStateList); wrapperNotGB.in("trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-'," + "SAR_STANDARDS_INFO.STAND_YEAR),' ',''))",bdtList); List queryNotGBList = sarStandardsInfoDao.selectList(wrapperNotGB); @@ -232,11 +232,11 @@ public class UpdateStateStandSyncFz implements Runnable { public void execStandDate(List infoList, String textStatusStand) throws Exception { List list = new ArrayList<>(); for (SarStandardsInfo info : infoList) { + saveUpdateLog(info,textStatusStand); info.setTextStatus(textStatusStand); standFunc(info); createStandMQService.sendStandMQ(info,"update"); - saveUpdateLog(info,textStatusStand); // 只批量更新文本字段 SarStandardsInfo newInfo = new SarStandardsInfo(); newInfo.setTextStatus(textStatusStand);