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 4a910635..839acb7f 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 @@ -1212,7 +1212,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { QueryBuilder multiQueryBuilder = QueryBuilders.multiMatchQuery(""); multiQueryBuilder = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), "sortTitle","numberTitle","yearOrder","nameTitle","title","textContent","issue_time" - ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f); + ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f).field("textContent",100f).field("issue_time",10f); boolQueryBuilder.must(multiQueryBuilder); } //在结果中检索 @@ -1478,7 +1478,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { QueryBuilder queryBuilder1 = QueryBuilders.multiMatchQuery(""); queryBuilder1 = QueryBuilders.multiMatchQuery(value, "sortTitle","numberTitle","yearOrder","nameTitle","title","textContent","issue_time" - ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f); + ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f).field("textContent",100f).field("issue_time",10f); boolQueryShould.must(queryBuilder1); } // searchInfoEO.setSelectValue(searchInfoEO.getSelectValue().replace("-","\\-")); @@ -1486,7 +1486,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { QueryBuilder queryBuilder2 = QueryBuilders.multiMatchQuery(""); queryBuilder2 = QueryBuilders.multiMatchQuery(real, "sortTitle","numberTitle","yearOrder","nameTitle","title","textContent","issue_time" - ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f); + ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f).field("textContent",100f).field("issue_time",10f); boolQueryShould.must(queryBuilder2); // for (String se : selects) { // if (StringUtils.isNotBlank(se)) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index 5b6ecc54..0bfc5a1f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -66,6 +66,12 @@ public class EsRevisePlanController extends BaseController { return Result.success(iEsRevisePlanService.modPlan(esRevisePlan)); } + @ApiOperation(value = "编辑企标计划-企标技术更新计划状态") + @PostMapping("modPlanByState") + public ResponseMessage modPlanByState(EsRevisePlan esRevisePlan){ + return Result.success(iEsRevisePlanService.modPlanByState(esRevisePlan)); + } + @ApiOperation(value = "编辑企标计划") @PostMapping("/modPlanByWk") public ResponseMessage modPlanByWk(@RequestBody EsRevisePlan esRevisePlan){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java index 62c17fcf..18c37c40 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java @@ -19,6 +19,7 @@ public interface IEsRevisePlanService extends IService { EsRevisePlan getOnePlan(String id);//查询详情 String modPlan(EsRevisePlan esRevisePlan);//编辑 + String modPlanByState(EsRevisePlan esRevisePlan);//编辑 String addPlan(EsRevisePlan esRevisePlan);//插入 int delPlan(String id);//删除 int delPlans(String ids);//批量删除 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index 1b6e05c4..de098d04 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -75,6 +75,12 @@ public class EsRevisePlanServiceImpl extends ServiceImpl