大屏综合统计-企业、人员调整

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

@@ -15,9 +15,9 @@ public enum StatisticalAnalysisEnum {
      */
 
     company("企业", "company", "idx_biz_enterprise_info"),
-
+    inspectionCompany("检验检测机构", "inspectionCompany", "idx_biz_enterprise_info"),
     person("人员", "person", "idx_biz_user_info"),
-
+    inspectionPerson("检验检测人员", "inspectionPerson", "idx_biz_user_info"),
     equip("设备", "equip", "idx_biz_equipment_info");
 
     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/UnitCategoryEnum.java

@@ -6,8 +6,13 @@ import lombok.Getter;
 @AllArgsConstructor
 @Getter
 public enum UnitCategoryEnum {
-    use("使用单位", "use"),
-    license("许可单位", "license");
+
+    use("使用单位", "use","use"),   // 企业和个人主体
+    produce("生产单位", "produce","license"),   // 设计单位、制造单位、安装改造维修单位
+    filling("充装单位", "filling","license"),   // 充装单位
+    inspection("检验机构", "inspection","license"),   // 检验机构
+    detection("检测机构", "detection","license");   // 检测机构
     private final String name;
     private final String code;
+    private final String type;
 }