检验检测 / 检验检测人员统计

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/UnitTypeEnum.java

@@ -2,38 +2,38 @@ package com.yeejoin.amos.boot.module.common.api.enums;
 
 import lombok.Getter;
 
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.List;
+import java.util.*;
 
 @Getter
 public enum UnitTypeEnum {
     //type 1生产单位 2使用单位 3充装单位 4检验检测机构
     //制造单位
-    ZZDW("制造单位","1236","1"),
+    ZZDW("制造单位","1236","1","生产单位"),
     //设计单位
-    SJDW("设计单位","1235","1"),
+    SJDW("设计单位","1235","1","生产单位"),
     //安改维单位
-    AGWDW("安装改造维修单位","1234","1"),
+    AGWDW("安装改造维修单位","1234","1","生产单位"),
     //使用单位
-    SYDW("使用单位","1232","2"),
+    SYDW("使用单位","1232","2","使用单位"),
     //使用单位
-    GRZT("个人主体","6601","2"),
+    GRZT("个人主体","6601","2","使用单位"),
     //充装单位
-    CZDW("充装单位","1231","3"),
+    CZDW("充装单位","1231","3","充装单位"),
     //检验检测机构
-    JYJCJG("检验检测机构","1233","4"),
+    JYJCJG("检验检测机构","1233","4","检验检测机构"),
 
     ;
 
     String name;
     String code;
     String type;
+    String typeName;
 
-    private UnitTypeEnum(String name, String code, String type) {
+    private UnitTypeEnum(String name, String code, String type,String typeName) {
         this.name = name;
         this.code = code;
         this.type = type;
+        this.typeName = typeName;
     }
 
     public static List<String> getNameListByType(String type) {
@@ -46,5 +46,18 @@ public enum UnitTypeEnum {
         return list;
     }
 
-
+    public static List<Map<String, String>> getTypeNameList(){
+        List<Map<String,String>> list = new ArrayList<>();
+        Map<String,String> map = new HashMap<>();
+        for (UnitTypeEnum testEnum : EnumSet.allOf(UnitTypeEnum.class)) {
+            if(!map.containsKey(testEnum.type)){
+                Map<String,String> enumMap = new HashMap<>();
+                enumMap.put("title",testEnum.typeName);
+                enumMap.put("value",testEnum.type);
+                map.put(testEnum.type, testEnum.getTypeName());
+                list.add(enumMap);
+            }
+        }
+        return list;
+    }
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/JYJCStatisticsMapper.java

@@ -67,4 +67,6 @@ public interface JYJCStatisticsMapper extends BaseMapper {
     Long inspectionCount(@Param("dpFilterParamForDetailDto") DPFilterParamForDetailDto dpFilterParamForDetailDto);
 
     Long inspectionFinishCount(@Param("dpFilterParamForDetailDto") DPFilterParamForDetailDto dpFilterParamForDetailDto);
+
+    Page<Map<String, Object>> selectUserList(@Param("page") Page page, @Param("dpFilterParamDto") DPFilterParamForDetailDto dpFilterParamDto, @Param("unitTypeList") List<String> unitTypeList);
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/JYJCStatisticsMapper.xml

@@ -201,6 +201,29 @@
 			and tbei.use_unit like concat('%',#{dpFilterParamForDetailDto.companyName},'%')
 		</if>
 	</select>
+    <select id="selectUserList" resultType="java.util.Map">
+		SELECT
+			tui.name as name,
+			tui.certificate_num as certificateNum,
+			bi.use_unit as unitName,
+			tui.phone as phone,
+			tui.post_name as postName
+		FROM
+			tzs_user_info tui,
+			tz_base_enterprise_info bi
+		WHERE
+			tui.unit_code =  bi.use_code
+		  and tui.new_post LIKE '%6615%'
+		  and ((bi.supervise_org_code != '50' and bi.supervise_org_code LIKE CONCAT (#{dpFilterParamDto.orgCode}, '%')) or (bi.supervise_org_code = '50' and bi.office_region LIKE CONCAT ('%', #{dpFilterParamDto.cityCode}, '%')))
+		  and tui.is_delete=false
+		  <if test="unitTypeList != null and unitTypeList.size > 0">
+			and
+			<foreach collection="unitTypeList" item="item" index="index" open="(" close=")" separator=" or ">
+				bi.unit_type LIKE concat ( '%', #{item}, '%' )
+			</foreach>
+		  </if>
+		  group by tui.sequence_nbr
+	</select>
 </mapper>
 
 

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

@@ -77,6 +77,31 @@ public class JYJCDPStatisticsController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-左侧检验检测人员统计列表", notes = "大屏-检验检测-左侧检验检测人员统计列表")
+    @PostMapping(value = "/person/countPage")
+    public ResponseModel<Page<Map<String, Object>>> personCountPage(@Validated @RequestBody DPFilterParamForDetailDto dpFilterParamDto, BindingResult result,
+                                                        @RequestParam(value = "current", defaultValue = "1") Integer current,
+                                                        @RequestParam(value = "size", defaultValue = "20") Integer size) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        Page page = new Page(current, size);
+        return ResponseHelper.buildResponse(statisticsService.countPage(page,dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-左侧检验检测人员统计类型", notes = "大屏-检验检测-左侧检验检测人员统计类型")
+    @PostMapping(value = "/person/countType")
+    public ResponseModel<List<Map<String, Object>>> personCountType(@Validated @RequestBody DPFilterParamForDetailDto dpFilterParamForDetailDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.personCountType(dpFilterParamForDetailDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-各检验类型业务数量统计", notes = "大屏-检验检测-各检验类型业务数量统计")
     @PostMapping(value = "/allApp/countByType")
     public ResponseModel<Map<String, Object>> inspectBizNumCountByType(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {

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/JYJCDPStatisticsServiceImpl.java

@@ -13,6 +13,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
 import com.yeejoin.amos.boot.module.common.api.enums.AlertCallEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.JYJCBusinessTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.JYJCResultEnum;
+import com.yeejoin.amos.boot.module.common.api.enums.UnitTypeEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.InspectTimeCountDto;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.InspectionTimelinesDto;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.PublicityInspectOrgInfoDto;
@@ -233,6 +234,27 @@ public class JYJCDPStatisticsServiceImpl {
         return result;
     }
 
+    public Page<Map<String, Object>> countPage(Page page, DPFilterParamForDetailDto dpFilterParamDto) {
+        String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
+        dpFilterParamDto.setOrgCode(orgCode);
+        List<String> unitTypeList = new ArrayList<>();
+        if(StringUtils.isNotEmpty(dpFilterParamDto.getTreeValue())){
+            unitTypeList = UnitTypeEnum.getNameListByType(dpFilterParamDto.getTreeValue());
+        }
+        Page<Map<String,Object>> pageList = jyjcStatisticsMapper.selectUserList(page,dpFilterParamDto,unitTypeList);
+        return pageList;
+    }
+
+    public List<Map<String, Object>> personCountType(DPFilterParamForDetailDto dpFilterParamForDetailDto) {
+        List<Map<String, String>> typeNameList = UnitTypeEnum.getTypeNameList();
+        List<Map<String,Object>> result = new ArrayList<>();
+        Map<String,Object> map = new HashMap<>();
+        map.put("title","人员类型");
+        map.put("value","0");
+        map.put("children",typeNameList);
+        result.add(map);
+        return result;
+    }
 
     private void buildYDataForInspectPersonCount(Map<String, Object> result, List<RegionModel> childRegion) {
         List<Long> yData = new ArrayList<>();