Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the,  改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多…… 待改完

See merge request LiuChao/foton-slrs-system-rest!543

adc-da-slrs/src/main/java/com/adc/da/search/bean/SearchCenter.java

@@ -25,7 +25,7 @@ public class SearchCenter {
     @ApiModelProperty(value = "执行参数 ALL 存在更新 不存在新增 ,UPD 只 更新存在 es 里的标准 ,ADD 只新增不存在 es 的标准," +
             " DEL 只删除不存在标准库的数据（删除只能用DEL 减少自动错删）," +
             "UPDNONEXISTENT (只支持文本查询接口)更新不存在字段业务数据（其他任务导致ES不同步）, UPDNONEXISTENT_TEXTSTATUS (只支持文本查询接口,文本状态高亮字段不同步重置)," +
-            "UPDNONEXISTENT_nameEn (只支持文本查询接口,维护ES 英文字段不存在的数据)")
+            "UPDNONEXISTENT_NAMEEN (只支持文本查询接口,维护ES 英文字段不存在的数据)")
     private String execType;
 
     @NotNull

adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java

@@ -1165,7 +1165,7 @@ public class ResetSearchCenterService {
                 }
             }).collect(Collectors.toList());
             esIdList = filterList.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList());
-        }else if("UPDNONEXISTENT_nameEn".equals(searchCenter.getExecType().toUpperCase())){
+        }else if("UPDNONEXISTENT_NAMEEN".equals(searchCenter.getExecType().toUpperCase())){
             List<Map<String, Object>> filterList = searchListData.stream().filter(stringObjectMap -> {
                 if(stringObjectMap.get("nameEnTitle") == null){
                     return true;
@@ -1221,7 +1221,8 @@ public class ResetSearchCenterService {
 
             if(!updList.isEmpty() && ("ALL".equals(searchCenter.getExecType().toUpperCase()) || "UPD".equals(searchCenter.getExecType().toUpperCase())
                     || "UPDNONEXISTENT".equals(searchCenter.getExecType().toUpperCase())
-                    || "UPDNONEXISTENT_TEXTSTATUS".equals(searchCenter.getExecType().toUpperCase()))){
+                    || "UPDNONEXISTENT_TEXTSTATUS".equals(searchCenter.getExecType().toUpperCase())
+                    || "UPDNONEXISTENT_NAMEEN".equals(searchCenter.getExecType().toUpperCase()))){
                 for(SarBussionessStand sarBussionessStandEO : updList){
                     countUpdateSuccess++;
                     bussAttrInfoShowSearchDetails(sarBussionessStandEO);

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java

@@ -5,6 +5,7 @@ import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.ApiOperation;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +55,14 @@ public class EsRevisePlanController extends BaseController<EsRevisePlan> {
     }
 
 //----------------回来改----------------------上面的------
+    @ApiOperation(value = "获取是否存在重复名企标名称接口")
+    @GetMapping("/getDataByNameAndSort")
+    public ResponseMessage<Integer> getDataByNameAndSort(EsRevisePlan esRevisePlan){
+        QueryWrapper qw = new QueryWrapper();
+        qw.eq("buss_sort",esRevisePlan.getBussSort());
+        qw.eq("es_name",esRevisePlan.getEsName());
+        return Result.success(iEsRevisePlanService.count(qw));
+    }
     @ApiOperation(value = "获取是否存在重复名企标名称接口")
     @GetMapping("/getDataByName")
     public ResponseMessage<Object> getDataByName(EsRevisePlan esRevisePlan){

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java

@@ -71,10 +71,10 @@ public class EsRevisePlan extends BasePage {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date releaseTime;
 
-    @ApiModelProperty(value = "起草责任单位")
+    @ApiModelProperty(value = "起草责任单位ID")
     private String unit;
 
-    @ApiModelProperty(value = "起草责任单位ID")
+    @ApiModelProperty(value = "起草责任单位名称")
     private String unitName;
 
     @ApiModelProperty(value = "引入企业标准json(标准id)")