feat(statistics): 添加高级搜索资质相关接口和功能

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/PersonAdvanceSearchEnum.java

@@ -16,8 +16,8 @@ public enum PersonAdvanceSearchEnum {
     NAME("人员名称", "name", TechnicalParameter.ParamType.STRING,"",null,null),
     NEWPOST("人员类型", "newPost",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryRYLX",null,null),
     SUBPOST("人员子类型", "subPost",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryRYLX?type={type}",null,"newPost"),
-//    REGULATORY_LABELS("有无资质", "regulatoryLabels",null,""),
-//    REGULATORY_LABELS("资质状态", "regulatoryLabels",null,""),
+    CERT_NO("有无资质", "certNo",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryCertNo",null,null),
+    EXPIRY_DATE("资质状态", "expiryDate",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryExpiryDate",null,null),
     CERT_TYPE("证书类型", "certType",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryCertType",null,null),
     PERMISSION_LEVEL("证书级别", "permissionLevel",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryPermissionLevel",null,null),
     JOB_ITEM("作业项目", "jobItem",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryZYXM?type={type}",null,"certType"),

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/ComprehensiveStatisticalAnalysisController.java

@@ -312,4 +312,26 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
     public ResponseModel<JSONArray> queryPermissionLevel() {
         return ResponseHelper.buildResponse(statisticalAnalysisService.queryPermissionLevel());
     }
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryCertNo")
+    @ApiOperation(httpMethod = "GET", value = "高级搜索有无资质", notes = "高级搜索有无资质")
+    public ResponseModel<JSONArray> queryCertNo() {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryCertNo());
+    }
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryExpiryDate")
+    @ApiOperation(httpMethod = "GET", value = "高级搜索资质状态", notes = "高级搜索资质状态")
+    public ResponseModel<JSONArray> queryExpiryDate() {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryExpiryDate());
+    }
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ComprehensiveStatisticalAnalysisServiceImpl.java

@@ -1349,19 +1349,35 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
 
     public JSONObject queryPersonSearchData() {
         JSONObject result = new JSONObject();
-        //资质状态
-        JSONArray permissionStatus = new JSONArray();
-        for (int i = 0; i < 3; i++) {
+        //有无资质
+        JSONArray certNoData = new JSONArray();
+        for (int i = 0; i < 2; i++) {
             JSONObject object = new JSONObject();
             if (0 == i) {
-                object.put("key", "noLicenses");
-                object.put("value", "noLicenses");
+                object.put("key", "2");
+                object.put("value", "2");
                 object.put("label", "无资质要求");
             } else if (1 == i) {
+                object.put("key", "1");
+                object.put("value", "1");
+                object.put("label", "有资质");
+            } else if (2 == i) {
+                object.put("key", "0");
+                object.put("value", "0");
+                object.put("label", "无资质");
+            }
+            certNoData.add(object);
+        }
+        result.put("certNo", certNoData);
+        //资质状态
+        JSONArray permissionStatus = new JSONArray();
+        for (int i = 0; i < 2; i++) {
+            JSONObject object = new JSONObject();
+            if (0 == i) {
                 object.put("key", "overdue");
                 object.put("value", "overdue");
                 object.put("label", "资质超期");
-            } else if (2 == i) {
+            } else if (1 == i) {
                 object.put("key", "near");
                 object.put("value", "near");
                 object.put("label", "资质临期");
@@ -1683,4 +1699,49 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         }
         return permissionLevelArray;
     }
+
+    public JSONArray queryCertNo() {
+        JSONArray certNoData = new JSONArray();
+        for (int i = 0; i < 2; i++) {
+            JSONObject object = new JSONObject();
+            if (0 == i) {
+                object.put("key", "2");
+                object.put("value", "2");
+                object.put("label", "无资质要求");
+            } else if (1 == i) {
+                object.put("key", "1");
+                object.put("value", "1");
+                object.put("label", "有资质");
+            } else if (2 == i) {
+                object.put("key", "0");
+                object.put("value", "0");
+                object.put("label", "无资质");
+            }
+            certNoData.add(object);
+        }
+        return certNoData;
+    }
+
+    public JSONArray queryExpiryDate() {
+        //资质状态
+        JSONArray permissionStatus = new JSONArray();
+        for (int i = 0; i < 2; i++) {
+            JSONObject object = new JSONObject();
+            if (0 == i) {
+                object.put("key", "overdue");
+                object.put("value", "overdue");
+                object.put("label", "资质超期");
+            } else if (1 == i) {
+                object.put("key", "near");
+                object.put("value", "near");
+                object.put("label", "资质临期");
+            } else {
+                object.put("key", "normal");
+                object.put("value", "normal");
+                object.put("label", "正常");
+            }
+            permissionStatus.add(object);
+        }
+        return permissionStatus;
+    }
 }
\ No newline at end of file