修改bug

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

@@ -21,7 +21,8 @@ public enum EquipStateEnum {
     ZY("在用", "1"),
     TY("停用", "2"),
     ZX("注销", "4"),
-    BF("报废", "3")
+    BF("报废", "3"),
+    WZT("无状态", "99"),
     ;
 
     private String name;

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

@@ -17,27 +17,28 @@ public enum UnitTypeNewEnum {
      * *注册单位类型
      */
 
-    sydw("企业", "1232", "use"),
-    czdw("充装单位", "1231", "license"),
-    jydw("检验单位", "1233", "license"),
-    jcdw("检测单位", "1233", "license"),
-    azgzwxdw("安装改造维修单位", "1234", "license"),
-    zzdw("制造单位", "1236", "license"),
-    sjdw("设计单位", "1235", "license"),
-    grzt("个人主体", "6599", "use");
+    sydw("企业","使用单位", "1232", "use"),
+    czdw("充装单位", "充装单位", "1231", "license"),
+    jydw("检验单位", "检验单位","1233", "license"),
+    jcdw("检测单位", "检测单位", "1233", "license"),
+    azgzwxdw("安装改造维修单位", "安装改造维修单位","1234", "license"),
+    zzdw("制造单位", "制造单位", "1236", "license"),
+    sjdw("设计单位", "设计单位", "1235", "license"),
+    grzt("个人主体", "个人主体", "6599", "use");
 
-    private String name;
+    private String label;
+    private String value;
     private String code;
     private String type;
 
-    public static Map<String, String> getName = new HashMap<>();
+    public static Map<String, String> getValue = new HashMap<>();
     public static Map<String, String> getCode = new HashMap<>();
 
 
     static {
         for (UnitTypeNewEnum e : UnitTypeNewEnum.values()) {
-            getName.put(e.code, e.name);
-            getCode.put(e.name, e.code);
+            getValue.put(e.code, e.value);
+            getCode.put(e.value, e.code);
         }
     }
 
@@ -45,8 +46,8 @@ public enum UnitTypeNewEnum {
         JSONArray jsonArray = new JSONArray();
         for (UnitTypeNewEnum e : UnitTypeNewEnum.values()) {
             JSONObject jsonObject = new JSONObject();
-            jsonObject.put("label", e.name);
-            jsonObject.put("value", e.name);
+            jsonObject.put("label", e.label);
+            jsonObject.put("value", e.value);
             jsonObject.put("key", e.code);
             jsonArray.add(jsonObject);
         }
@@ -61,8 +62,8 @@ public enum UnitTypeNewEnum {
         for (UnitTypeNewEnum e : UnitTypeNewEnum.values()) {
             if (e.type.equals(category)) {
                 JSONObject jsonObject = new JSONObject();
-                jsonObject.put("label", e.name);
-                jsonObject.put("value", e.name);
+                jsonObject.put("label", e.label);
+                jsonObject.put("value", e.value);
                 jsonObject.put("key", e.code);
                 jsonArray.add(jsonObject);
             }

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

@@ -127,6 +127,17 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/select/queryRYLX")
+    @ApiOperation(httpMethod = "GET", value = "高级筛选查询人员类型", notes = "高级筛选查询人员类型")
+    public ResponseModel<JSONArray> queryRYLX(@RequestParam(required = false) String type) {
+        return ResponseHelper.buildResponse(statisticalAnalysisService.queryRYLX(type));
+    }
+
+    /**
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/select/queryZYXM")
     @ApiOperation(httpMethod = "GET", value = "查询作业项目", notes = "查询作业项目")
     public ResponseModel<JSONArray> queryZYXM(@RequestParam String type) {