Merge branch 'develop_master' into FOTON

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

@@ -115,5 +115,8 @@ public class EsRevisePlan extends BasePage {
     @TableField("buss_sort")
     private String bussSort;
 
+    @TableField(exist = false)
+    private List<String> planStatusList;
+
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java

@@ -10,10 +10,14 @@ import com.adc.da.slrs.esStandRelation.service.IEsStandRelationService;
 import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -47,6 +51,10 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
     public List<EsRevisePlan> queryAllPlans(EsRevisePlan esRevisePlan) {
         Integer count = esRevisePlanDao.getQueryTotal(esRevisePlan);
         esRevisePlan.getPager().setRowCount(count);
+        if(StringUtils.isNotBlank(esRevisePlan.getPlanStatus())){
+            List<String> list= Arrays.stream(esRevisePlan.getPlanStatus().split(",")).map(String::trim).collect(Collectors.toList());
+            esRevisePlan.setPlanStatusList(list);
+        }
         List<EsRevisePlan> esRevisePlans = esRevisePlanDao.queryAll(esRevisePlan);
         return esRevisePlans;
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java

@@ -6,6 +6,7 @@ import com.adc.da.slrs.sarStandProjectLibrary.entity.*;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.ResponseDto;
 import com.adc.da.slrs.sarStandProjectLibrary.service.impl.SarStandProjectLibraryServiceImpl;
+import com.adc.da.util.utils.StringUtils;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -305,4 +306,41 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
 
         return responseDto;
     }
+
+    @PostMapping("/querySelect")
+    @ApiOperation("查询筛选条件项")
+    public ResponseMessage querySelect(SarStandProjectLibrary sarStandProjectLibrary){
+        QueryWrapper qw = new QueryWrapper();
+        if(StringUtils.isNotBlank(sarStandProjectLibrary.getManagementHostName())){
+            qw.eq("management_host_name",sarStandProjectLibrary.getManagementHostName());
+        }
+        if(StringUtils.isNotBlank(sarStandProjectLibrary.getDevelopmentHostName())){
+            qw.eq("development_host_name",sarStandProjectLibrary.getDevelopmentHostName());
+        }
+        if(StringUtils.isNotBlank(sarStandProjectLibrary.getCategoryName())){
+            qw.eq("category_name",sarStandProjectLibrary.getCategoryName());
+        }
+
+        List<SarStandProjectLibrary> list = sarStandProjectLibraryService.list(qw);
+        List<String> managementHostList = new ArrayList<>();
+        List<String> developmentHostList = new ArrayList<>();
+        List<String> categoryList = new ArrayList<>();
+        for(SarStandProjectLibrary sarStandProjectLibrary1 : list){
+            if(!managementHostList.contains(sarStandProjectLibrary1.getManagementHostName())){
+                managementHostList.add(sarStandProjectLibrary1.getManagementHostName());
+            }
+            if(!developmentHostList.contains(sarStandProjectLibrary1.getDevelopmentHostName())){
+                developmentHostList.add(sarStandProjectLibrary1.getDevelopmentHostName());
+            }
+            if(!categoryList.contains(sarStandProjectLibrary1.getCategoryName())){
+                categoryList.add(sarStandProjectLibrary1.getCategoryName());
+            }
+        }
+        QuerySelectRspDTO querySelectRspDTO = QuerySelectRspDTO.builder()
+                .managementHostList(managementHostList)
+                .developmentHostList(developmentHostList)
+                .categoryList(categoryList)
+                .build();
+        return Result.success(querySelectRspDTO);
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/QuerySelectRspDTO.java

@@ -0,0 +1,17 @@
+package com.adc.da.slrs.sarStandProjectLibrary.entity;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Builder
+public class QuerySelectRspDTO {
+
+    private List<String> managementHostList;
+
+    private List<String> developmentHostList;
+
+    private List<String> categoryList;
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java

@@ -80,6 +80,15 @@ public class SarStandProjectLibrary extends BaseEntity {
     @TableField("detailed_list_version")
     private String detailedListVersion;
 
+    @ApiModelProperty(value = "管理主体名称")
+    private String managementHostName;
+
+    @ApiModelProperty(value = "开发主体名称")
+    private String developmentHostName;
+
+    @ApiModelProperty(value = "项目细分类名称")
+    private String categoryName;
+
 
     //标准编号
     @TableField(exist = false)

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java

@@ -82,11 +82,14 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
                     .setProjectNumber(projectObject.get("code").getAsString())
                     .setProjectName(projectObject.get("name").getAsString())
                     .setProjectClassification(projectObject.get("catalog_name").getAsString())
-                    .setProjectStatus(projectObject.get("project_status").getAsString())
+                    .setProjectStatus(projectObject.get("project_status_name").getAsString())
                     .setProjectGroup(projectObject.get("project_group_name").getAsString())
                     .setCurrentNode(projectObject.get("project_current_milestone").getAsString())
                     .setProjectLevel(projectObject.get("project_level").getAsString())
-                    .setProductLine(projectObject.get("eng_product_line").getAsString());
+                    .setProductLine(projectObject.get("eng_product_line").getAsString())
+                    .setManagementHostName(projectObject.get("management_host_name").getAsString())
+                    .setDevelopmentHostName(projectObject.get("development_host_name").getAsString())
+                    .setCategoryName(projectObject.get("category_name").getAsString());
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
 
 

adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml

@@ -226,8 +226,11 @@
             <if test="area != null and area != ''">
                 and area = #{area}
             </if>
-            <if test="planStatus != null and planStatus != ''">
+            <if test="planStatusList != null">
-                and plan_status = #{planStatus}
+                and plan_status in
+                <foreach collection="planStatusList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             <if test="reviseStatus != null and reviseStatus != ''">
                 and revise_status = #{reviseStatus}