1.检验检测大屏接口接口开发

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/dto/InspectionTimelinesDto.java

+package com.yeejoin.amos.boot.module.jyjc.api.dto;
+
+import lombok.Data;
+
+/**
+ * 机构进行检验时效统计对象
+ *
+ * @author Administrator
+ */
+@Data
+public class InspectionTimelinesDto {
+
+    private String city;
+
+    private String name;
+
+    private String unitCode;
+
+    private Long count;
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/dto/PublicityInspectOrgInfoDto.java

+package com.yeejoin.amos.boot.module.jyjc.api.dto;
+
+import lombok.Data;
+
+/**
+ * 检验机构公示
+ *
+ * @author Administrator
+ */
+@Data
+public class PublicityInspectOrgInfoDto {
+
+    /**
+     * 单位名称
+     */
+    private String unitName;
+
+    /**
+     * 单位编码
+     */
+    private String unitCode;
+
+    /**
+     * 核准代码
+     */
+    private String approvalNumber;
+
+    /**
+     * 核准有效期
+     */
+    private String aapprovalDeadline;
+
+    /**
+     * 业务有限期
+     */
+    private String businessDeadline;
+
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcInspectionApplication.java

@@ -219,6 +219,12 @@ public class JyjcInspectionApplication extends BaseEntity {
     private JSONObject planData;
 
     /**
+     * 计划下发日期,统计办理时效使用
+     */
+    @TableField(value = "plan_create_date")
+    private Date planCreateDate;
+
+    /**
      * 是否必须处理： true-必须处理，false-可不予受理
      */
     @TableField(value = "is_must_accept")

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcInspectionResult.java

@@ -215,4 +215,11 @@ public class JyjcInspectionResult extends BaseEntity {
      */
     @TableField(value = "safety_level")
     private String safetyLevel;
+
+
+    /**
+     * 计划下发日期，,统计办理时效使用"
+     */
+    @TableField(value = "plan_create_date")
+    private Date planCreateDate;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/JYJCTypeEnum.java

@@ -19,12 +19,12 @@ public enum JYJCTypeEnum {
     /**
      * 检验检测类型
      */
-    DTJC("DTJC", "电梯检测", "jc", BizTypeEnum.DETECTION.getCode()),
-    DQJY("DQJY", "定期检验", "jy", BizTypeEnum.FIRST_INSPECTION.getCode()),
-    SCJY("SCJY", "首次检验", "jy", BizTypeEnum.FIRST_INSPECTION.getCode()),
-    WXJDJY("WXJDJY", "维修监督检验", "jy", BizTypeEnum.SUPERVISE.getCode()),
+    AZJDJY("AZJDJY", "安装监督检验", "jy", BizTypeEnum.SUPERVISE.getCode()),
     GZJDJY("GZJDJY", "改造监督检验", "jy", BizTypeEnum.SUPERVISE.getCode()),
-    AZJDJY("AZJDJY", "安装监督检验", "jy", BizTypeEnum.SUPERVISE.getCode());
+    WXJDJY("WXJDJY", "维修监督检验", "jy", BizTypeEnum.SUPERVISE.getCode()),
+    SCJY("SCJY", "首次检验", "jy", BizTypeEnum.FIRST_INSPECTION.getCode()),
+    DQJY("DQJY", "定期检验", "jy", BizTypeEnum.FIRST_INSPECTION.getCode()),
+    DTJC("DTJC", "电梯检测", "jc", BizTypeEnum.DETECTION.getCode());
 
     private final String code;
     private final String name;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcBaseMapper.java

@@ -42,4 +42,6 @@ public interface JyjcBaseMapper {
     List<TzsUserInfoDto> selectUserByCompanyCodes(@Param("companyCodes") List<String> companyCodes);
 
     CompanyModel selectOneCompanyByCode(String companyCode);
+
+    String getOrgCodeByCompanyCode(String companyCode);
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionApplicationMapper.java

@@ -2,11 +2,13 @@ package com.yeejoin.amos.boot.module.jyjc.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.dto.CountDto;
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipDto;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
-import org.springframework.data.repository.query.Param;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Set;
@@ -44,5 +46,23 @@ public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspecti
     * @param equips 需要判断的设备
     * @return 在流程中的设备records
     */
-    List<String> queryRecordListInFlowing(@org.apache.ibatis.annotations.Param("equips") List<JyjcInspectionApplicationEquipDto> equips);
+    List<String> queryRecordListInFlowing(@Param("equips") List<JyjcInspectionApplicationEquipDto> equips);
+
+    /**
+     * 按照检验类型、机构、时间统计检验数量(流程中及已完成的)
+     *
+     * @param orgCode 区域对应公司orgCode
+     * @param dpFilterParamDto 过滤条件
+     * @return 统计信息
+     */
+    List<CountDto> queryAllFlowingAndFinishedInspectApp(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
+
+    /**
+     * 查询待出结果的报检单据数量
+     *
+     * @param orgCode 区域对应公司orgCode
+     * @param dpFilterParamDto 过滤条件
+     * @return 统计信息
+     */
+    List<CountDto> queryAllPendingResultInspectApp(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionResultMapper.java

@@ -2,10 +2,14 @@ package com.yeejoin.amos.boot.module.jyjc.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
+import com.yeejoin.amos.boot.module.jyjc.api.dto.InspectionTimelinesDto;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResult;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 业务开通申请表 Mapper 接口
  *
@@ -18,4 +22,5 @@ public interface JyjcInspectionResultMapper extends BaseMapper<JyjcInspectionRes
 
     Page<JyjcInspectionResultModel> selectForPage(@Param("page") Page<JyjcInspectionResultModel> page, @Param("jyjcInspectionResultModel") JyjcInspectionResultModel jyjcInspectionResultModel,@Param("identity") String identity);
 
+    List<InspectionTimelinesDto> queryInspectionTimelinessTopXX(@Param("top") String top,@Param("orgCode") String orgCode);
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcOpeningApplicationMapper.java

 package com.yeejoin.amos.boot.module.jyjc.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jyjc.api.dto.PublicityInspectOrgInfoDto;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -26,4 +27,11 @@ public interface JyjcOpeningApplicationMapper extends BaseMapper<JyjcOpeningAppl
     void updatePromoter(@Param("id") Long id);
 
     List<Long> selectOverdueData();
+
+    /**
+     * 检验机构公示
+     * @param orgCode 区域对应的orgCode
+     * @return List<PublicityInspectOrgInfoDto>
+     */
+    List<PublicityInspectOrgInfoDto> queryInspectionOrgListForPublicity(String orgCode);
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionApplicationModel.java

@@ -166,6 +166,9 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     @ApiModelProperty(value = "是否已经进行计划排期")
     private Boolean isExistPlanData;
 
+    @ApiModelProperty(value = "计划下发日期,统计办理时效使用，来源JyjcInspectionApplication.planCreateDate")
+    private Date planCreateDate;
+
     /**
      * 是否必须处理： true-必须处理，false-可不予受理
      */

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionResultModel.java

@@ -150,6 +150,11 @@ public class JyjcInspectionResultModel extends BaseModel {
     @ApiModelProperty(value = "监管码")
     private String supervisoryCode;
 
+    @ApiModelProperty(value = "计划下发日期,统计办理时效使用")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date planCreateDate;
+
+
     /**
      * 校验检验系统唯一流水号,排查问题，跟踪问题使用
      */

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcBaseMapper.xml

@@ -85,6 +85,9 @@
         WHERE
              c.company_code =#{companyCode}
     </select>
+    <select id="getOrgCodeByCompanyCode" resultType="java.lang.String">
+    select org_code from privilege_company where company_code = #{companyCode} limit 1
+    </select>
 
 
 </mapper>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -216,4 +216,32 @@
         UPDATE tz_jyjc_inspection_application set promoter = null
         where sequence_nbr = #{id}
     </update>
+    <select id="queryAllFlowingAndFinishedInspectApp" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
+        SELECT
+            count(1) as longValue,
+            a.inspection_type as keyStr
+        FROM
+            "tz_jyjc_inspection_application" a,
+            tz_base_enterprise_info b
+         where
+            a.inspection_unit_code= b.use_unit_code
+            and b.supervise_org_code like CONCAT(#{orgCode}, '%')
+            and a.status != '6610'  and a.status != '6615'
+            and date_ge(CAST(a.application_date as date),#{dto.beginDate})
+            and date_le(CAST(a.application_date as date),#{dto.endDate})
+            group by a.inspection_type
+    </select>
+    <select id="queryAllPendingResultInspectApp" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
+        SELECT
+            count(1) as longValue,
+            a.inspection_type as keyStr
+        FROM
+             tz_jyjc_inspection_application a,
+             tz_base_enterprise_info b
+         where
+             a.inspection_unit_code= b.use_unit_code
+             and b.supervise_org_code like CONCAT(#{orgCode}, '%') and a.status = '6616'
+             and EXISTS (select 1 from tz_jyjc_inspection_result r where r.result_status='1' and a.application_no = r.application_no)
+             and date_ge(CAST(a.application_date as date),#{dto.beginDate}) and date_le(CAST(a.application_date as date),#{dto.endDate})
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionResultMapper.xml

@@ -157,4 +157,28 @@
         </where>
         ORDER BY res.sequence_nbr DESC
     </select>
+    <select id="queryInspectionTimelinessTopXX" resultType="com.yeejoin.amos.boot.module.jyjc.api.dto.InspectionTimelinesDto">
+        select
+            a1.avgtime as count,
+            a1.inspection_unit_code as unitCode,
+            b1.use_unit as name,
+            b1.city
+        from
+            (SELECT
+                ROUND(avg(EXTRACT(EPOCH FROM ( r.rec_date - r.plan_create_date)) / 60),0) as avgtime,
+                r.inspection_unit_code
+            FROM
+               tz_jyjc_inspection_result r,
+               tz_base_enterprise_info b
+            where
+                r.result_status ='2'
+                and r.inspection_unit_code= b.use_unit_code
+                AND b.supervise_org_code like CONCAT(#{orgCode}, '%')
+                GROUP BY r.inspection_unit_code ORDER BY avgtime
+                limit #{top}
+            ) a1,
+            tz_base_enterprise_info b1
+        WHERE
+            a1.inspection_unit_code =  b1.use_unit_code
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcOpeningApplicationMapper.xml

@@ -50,4 +50,36 @@
         UPDATE tz_jyjc_opening_application set promoter = null
         where sequence_nbr = #{id}
     </update>
+    <select id="queryInspectionOrgListForPublicity" resultType="com.yeejoin.amos.boot.module.jyjc.api.dto.PublicityInspectOrgInfoDto">
+        select
+            b.use_unit as unitName,
+            l.cert_no as approvalNumber,
+            l.expiry_date as aapprovalDeadline,
+            b.use_code as unitCode,
+            a.expiry_date as businessDeadline,
+            a.licenceType
+        from
+            (SELECT
+             unit_code,
+             expiry_date,
+             unit_code_name,
+             case when
+             open_biz_type = 'jy' then '1233-1'
+                when
+             open_biz_type = 'jc' then '1233-2'
+             end as open_biz_type,
+             open_biz_type as licenceType
+             FROM
+             "tz_jyjc_opening_application"
+            where
+            status = '6616') a,
+            tz_base_enterprise_info b,
+            (select cert_no, min(expiry_date) as expiry_date, unit_code, cert_type_code from tz_base_unit_licence GROUP BY cert_no,unit_code,cert_type_code) l
+        where
+            a.unit_code= b.use_unit_code
+            and a.unit_code=l.unit_code
+            and l.cert_type_code = a.open_biz_type
+            and b.supervise_org_code like CONCAT(#{orgCode}, '%')
+            ORDER BY unitName
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/DPStatisticsController.java

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
+import com.yeejoin.amos.boot.module.jyjc.api.dto.InspectionTimelinesDto;
+import com.yeejoin.amos.boot.module.jyjc.api.dto.PublicityInspectOrgInfoDto;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.DPStatisticsServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
@@ -42,7 +41,7 @@ public class DPStatisticsController {
     @PostMapping(value = "/inspectTime/count/byEquListAndInspectType")
     public ResponseModel<Map<String, Object>> inspectTimeCountByTypeAndEquList(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
-        if(!fieldErrors.isEmpty()){
+        if (!fieldErrors.isEmpty()) {
             throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
         }
         return ResponseHelper.buildResponse(statisticsService.inspectTimeCountByTypeAndEquList(dpFilterParamDto));
@@ -53,10 +52,66 @@ public class DPStatisticsController {
     @PostMapping(value = "/inspectTimeCount")
     public ResponseModel<Map<String, Object>> inspectTimeCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
-        if(!fieldErrors.isEmpty()){
+        if (!fieldErrors.isEmpty()) {
             throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
         }
         return ResponseHelper.buildResponse(statisticsService.inspectTimeCount(dpFilterParamDto));
     }
 
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-左侧检验检测人员统计", notes = "大屏-检验检测-左侧检验检测人员统计")
+    @PostMapping(value = "/jy/person/count")
+    public ResponseModel<Map<String, Object>> inspectPersonCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.inspectPersonCount(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-各检验类型业务数量统计", notes = "大屏-检验检测-各检验类型业务数量统计")
+    @PostMapping(value = "/jy/allApp/countByType")
+    public ResponseModel<Map<String, Object>> inspectBizNumCountByType(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.queryAllFlowingAndFinishedInspectApp(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-各检验类型待检数量统计", notes = "大屏-检验检测-各检验类型待检数量统计")
+    @PostMapping(value = "/jy/pendingApp/countByType")
+    public ResponseModel<Map<String, Object>> queryAllFlowingAndFinishedInspectApp(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.queryAllPendingResultInspectApp(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-按机构进行检验时效统计Top10排名", notes = "大屏-检验检测-按机构进行检验时效统计Top10排名")
+    @PostMapping(value = "/jy/timeliness/top")
+    public ResponseModel<List<InspectionTimelinesDto>> inspectionTimelinessTopXX(@RequestParam(required = false, defaultValue = "10") String top, @Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.queryInspectionTimelinessTopXX(top, dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-检验检测机构公示", notes = "大屏-检验检测-检验检测机构公示")
+    @PostMapping(value = "/jy/inspectionOrgList/publicity")
+    public ResponseModel<List<PublicityInspectOrgInfoDto>> inspectionOrgListForPublicity(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.queryInspectionOrgListForPublicity(dpFilterParamDto));
+    }
+
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/DPStatisticsServiceImpl.java

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import com.yeejoin.amos.boot.biz.common.dto.CountDto;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 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;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.BizTypeEnum;
-import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationEquipMapper;
+import com.yeejoin.amos.boot.module.jyjc.api.enums.JYJCTypeEnum;
+import com.yeejoin.amos.boot.module.jyjc.api.mapper.*;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.RegionModel;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -15,6 +24,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -23,6 +33,7 @@ import java.util.stream.Collectors;
  * @author Administrator
  */
 @Service
+@Slf4j
 public class DPStatisticsServiceImpl {
 
     /**
@@ -39,9 +50,27 @@ public class DPStatisticsServiceImpl {
 
     private JyjcInspectionApplicationEquipMapper inspectionApplicationEquipMapper;
 
-    public DPStatisticsServiceImpl(EquipmentCategoryMapper equipmentCategoryMapper, JyjcInspectionApplicationEquipMapper inspectionApplicationEquipMapper) {
+    private JyjcInspectionApplicationMapper inspectionApplicationMapper;
+
+    private TzsUserInfoMapper tzsUserInfoMapper;
+
+    private JyjcBaseMapper jyjcBaseMapper;
+
+    private JyjcInspectionResultMapper inspectionResultMapper;
+
+    private JyjcOpeningApplicationMapper openingApplicationMapper;
+
+
+    private static Map<String, String> regionCodeOrgCodeMap = new ConcurrentHashMap<>();
+
+    public DPStatisticsServiceImpl(EquipmentCategoryMapper equipmentCategoryMapper, JyjcInspectionApplicationEquipMapper inspectionApplicationEquipMapper, JyjcInspectionApplicationMapper inspectionApplicationMapper, TzsUserInfoMapper tzsUserInfoMapper, JyjcBaseMapper jyjcBaseMapper, JyjcInspectionResultMapper inspectionResultMapper, JyjcOpeningApplicationMapper openingApplicationMapper) {
         this.equipmentCategoryMapper = equipmentCategoryMapper;
         this.inspectionApplicationEquipMapper = inspectionApplicationEquipMapper;
+        this.inspectionApplicationMapper = inspectionApplicationMapper;
+        this.tzsUserInfoMapper = tzsUserInfoMapper;
+        this.jyjcBaseMapper = jyjcBaseMapper;
+        this.inspectionResultMapper = inspectionResultMapper;
+        this.openingApplicationMapper = openingApplicationMapper;
     }
 
 
@@ -101,7 +130,7 @@ public class DPStatisticsServiceImpl {
     }
 
     private List<Map<String, Object>> getLegendData(List<BizTypeEnum> bizTypeEnums) {
-       return bizTypeEnums.stream().map(b->{
+        return bizTypeEnums.stream().map(b -> {
             Map<String, Object> item = new HashMap<>();
             item.put("dataKey", b.getCode());
             item.put("value", b.getName());
@@ -130,11 +159,128 @@ public class DPStatisticsServiceImpl {
             dpFilterParamDto.setBeginDate(LocalDateTime.of(firstDayOfPrevMonth, java.time.LocalTime.MIN).format(sdf));
             dpFilterParamDto.setEndDate(LocalDateTime.of(lastDayOfPrevMonth, java.time.LocalTime.MAX).format(sdf));
             Integer inspectTimeCount = inspectionApplicationEquipMapper.inspectTimeCount(dpFilterParamDto);
-            xDataList.add(firstDayOfPrevMonth.getMonthValue()+"月");
+            xDataList.add(firstDayOfPrevMonth.getMonthValue() + "月");
             yDataList.add(null == inspectTimeCount ? 0 : inspectTimeCount);
         }
-        returnMap.put("xdata",xDataList);
-        returnMap.put("ydata",yDataList);
+        returnMap.put("xdata", xDataList);
+        returnMap.put("ydata", yDataList);
         return returnMap;
     }
+
+    public Map<String, Object> inspectPersonCount(DPFilterParamDto dpFilterParamDto) {
+        // 1.查询条件构造未上送时间时，默认查询数据为近一个月数据
+        this.setDefaultFilter(dpFilterParamDto);
+        // 2.按照前端约定格式返回数据
+        Map<String, Object> result = new HashMap<>();
+        List<RegionModel> childRegion = this.getRegionList(dpFilterParamDto);
+        if (childRegion.isEmpty()) {
+            return new HashMap<>(0);
+        }
+        //2.1 x轴数据构造
+        result.put("xdata", this.getXDataForInspectPersonCount(childRegion));
+        //2.3 y轴数据构造
+        this.buildYDataForInspectPersonCount(result, childRegion);
+        return result;
+    }
+
+    private void buildYDataForInspectPersonCount(Map<String, Object> result, List<RegionModel> childRegion) {
+        List<Long> yData = new ArrayList<>();
+        childRegion.forEach(regionModel -> {
+            String orgCode = this.getAndSetOrgCode(regionModel.getRegionCode() + "");
+            if (StringUtils.isEmpty(orgCode)) {
+                yData.add(0L);
+            } else {
+                Long num = tzsUserInfoMapper.countUserByPostAndAreaCode(orgCode, "6615");
+                yData.add(num);
+            }
+        });
+        result.put("ydata", yData);
+    }
+
+    private String getAndSetOrgCode(String regionCode) {
+        String orgCode = regionCodeOrgCodeMap.get(regionCode);
+        if (orgCode == null) {
+            orgCode = jyjcBaseMapper.getOrgCodeByCompanyCode(regionCode);
+            if (orgCode == null) {
+                return "";
+            }
+            regionCodeOrgCodeMap.put(regionCode, orgCode);
+        }
+        return orgCode;
+    }
+
+    private List<String> getXDataForInspectPersonCount(List<RegionModel> childRegion) {
+        return childRegion.stream().map(RegionModel::getRegionName).collect(Collectors.toList());
+    }
+
+    private List<RegionModel> getRegionList(DPFilterParamDto dpFilterParamDto) {
+        try {
+            FeignClientResult<List<RegionModel>> feignClientResult = Systemctl.regionClient.queryByParentRegionCode(Integer.parseInt(dpFilterParamDto.getCityCode()));
+            return feignClientResult.getResult();
+        } catch (Exception e) {
+            log.error("查询行政区域失败：{}", e.getMessage());
+        }
+        return new ArrayList<>();
+    }
+
+    public Map<String, Object> queryAllFlowingAndFinishedInspectApp(DPFilterParamDto dpFilterParamDto) {
+        // 1.查询条件构造未上送时间时，默认查询数据为近一个月数据
+        this.setDefaultFilter(dpFilterParamDto);
+        // 2.按照前端约定格式返回数据
+        Map<String, Object> result = new HashMap<>();
+        JYJCTypeEnum[] jyjcTypeEnums = JYJCTypeEnum.values();
+        //2.1 x轴数据构造
+        result.put("xdata", this.getXDataForInspectBizNumCount(jyjcTypeEnums));
+        //2.3 y轴数据构造
+        this.buildYDataForFlowingAndFinishedInspectApp(result, jyjcTypeEnums, dpFilterParamDto);
+        return result;
+    }
+
+    public Map<String, Object> queryAllPendingResultInspectApp(DPFilterParamDto dpFilterParamDto) {
+        // 1.查询条件构造未上送时间时，默认查询数据为近一个月数据
+        this.setDefaultFilter(dpFilterParamDto);
+        // 2.按照前端约定格式返回数据
+        Map<String, Object> result = new HashMap<>();
+        JYJCTypeEnum[] jyjcTypeEnums = JYJCTypeEnum.values();
+        //2.1 x轴数据构造
+        result.put("xdata", this.getXDataForInspectBizNumCount(jyjcTypeEnums));
+        //2.3 y轴数据构造
+        this.buildYDataForPendingResultInspectApp(result, jyjcTypeEnums, dpFilterParamDto);
+        return result;
+    }
+
+    private void buildYDataForPendingResultInspectApp(Map<String, Object> result, JYJCTypeEnum[] jyjcTypeEnums, DPFilterParamDto dpFilterParamDto) {
+        String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
+        List<CountDto> countDtoList = inspectionApplicationMapper.queryAllPendingResultInspectApp(orgCode, dpFilterParamDto);
+        fillJYJCYData(result, jyjcTypeEnums, countDtoList);
+    }
+
+    private void fillJYJCYData(Map<String, Object> result, JYJCTypeEnum[] jyjcTypeEnums, List<CountDto> countDtoList) {
+        List<Long> yData = new ArrayList<>();
+        for (JYJCTypeEnum jyjcTypeEnum : jyjcTypeEnums) {
+            Long num = countDtoList.stream().filter(c -> c.getKeyStr().equals(jyjcTypeEnum.getCode())).mapToLong(CountDto::getLongValue).sum();
+            yData.add(num);
+        }
+        result.put("ydata", yData);
+    }
+
+    private void buildYDataForFlowingAndFinishedInspectApp(Map<String, Object> result, JYJCTypeEnum[] jyjcTypeEnums, DPFilterParamDto dpFilterParamDto) {
+        String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
+        List<CountDto> countDtoList = inspectionApplicationMapper.queryAllFlowingAndFinishedInspectApp(orgCode, dpFilterParamDto);
+        fillJYJCYData(result, jyjcTypeEnums, countDtoList);
+    }
+
+    private List<String> getXDataForInspectBizNumCount(JYJCTypeEnum[] jyjcTypeEnums) {
+        return Arrays.stream(jyjcTypeEnums).map(JYJCTypeEnum::getName).collect(Collectors.toList());
+    }
+
+    public List<InspectionTimelinesDto> queryInspectionTimelinessTopXX(String top, DPFilterParamDto dpFilterParamDto) {
+        String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
+        return inspectionResultMapper.queryInspectionTimelinessTopXX(top, orgCode);
+    }
+
+    public List<PublicityInspectOrgInfoDto> queryInspectionOrgListForPublicity(DPFilterParamDto dpFilterParamDto) {
+        String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
+        return openingApplicationMapper.queryInspectionOrgListForPublicity(orgCode);
+    }
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/InspectionPlanServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -25,13 +26,16 @@ public class InspectionPlanServiceImpl {
 
     private JyjcInspectionApplicationEquipServiceImpl applicationEquipService;
 
+    private JyjcInspectionResultServiceImpl inspectionResultService;
+
     private ESEquipmentCategory esEquipmentCategory;
 
     public InspectionPlanServiceImpl(JyjcInspectionApplicationServiceImpl inspectionApplicationService,
                                      JyjcInspectionApplicationEquipServiceImpl applicationEquipService,
-                                     ESEquipmentCategory  esEquipmentCategory) {
+                                     JyjcInspectionResultServiceImpl inspectionResultService, ESEquipmentCategory esEquipmentCategory) {
         this.inspectionApplicationService = inspectionApplicationService;
         this.applicationEquipService = applicationEquipService;
+        this.inspectionResultService = inspectionResultService;
         this.esEquipmentCategory = esEquipmentCategory;
     }
 
@@ -40,15 +44,23 @@ public class InspectionPlanServiceImpl {
         LambdaUpdateWrapper<JyjcInspectionApplication> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(JyjcInspectionApplication::getPlanData, JSONObject.toJSONString(model));
         updateWrapper.eq(BaseEntity::getSequenceNbr, applicationSeq);
+        updateWrapper.set(JyjcInspectionApplication::getPlanCreateDate, new Date());
         inspectionApplicationService.update(updateWrapper);
+        // 异步写入计划排期日期，统计办理时效使用
+        this.updatePlanCreateDate(applicationSeq);
         return model;
     }
 
+    private void updatePlanCreateDate(String applicationSeq) {
+        JyjcInspectionApplication inspectionApplication = inspectionApplicationService.getById(applicationSeq);
+        inspectionResultService.updatePlanCreateDateByAppNo(inspectionApplication.getApplicationNo());
+    }
+
     public JSONObject getDetail(String applicationSeq) {
         JyjcInspectionApplication inspectionApplication = inspectionApplicationService.getById(applicationSeq);
         // 初始时查询设备地址关联设备表
         JSONObject jsonObject = inspectionApplication.getPlanData();
-        if(jsonObject == null){
+        if (jsonObject == null) {
             jsonObject = new JSONObject();
             String address = this.getOneEquipAddress(applicationSeq);
             jsonObject.put("address", address);
@@ -61,10 +73,10 @@ public class InspectionPlanServiceImpl {
         List<JyjcInspectionApplicationEquip> applicationEquips = applicationEquipService.list(new LambdaQueryWrapper<JyjcInspectionApplicationEquip>().eq(JyjcInspectionApplicationEquip::getApplicationSeq, applicationSeq));
         // 拼接地址
         List<String> allAddress = new ArrayList<>();
-        applicationEquips.forEach(e->{
+        applicationEquips.forEach(e -> {
             String record = e.getEquipUnicode();
             Optional<ESEquipmentCategoryDto> optional = esEquipmentCategory.findById(record);
-            if(optional.isPresent()){
+            if (optional.isPresent()) {
                 ESEquipmentCategoryDto esEquipmentCategoryDto = optional.get();
                 allAddress.add(this.concatDetailAddress(esEquipmentCategoryDto));
             }
@@ -77,6 +89,6 @@ public class InspectionPlanServiceImpl {
         String usePlace = esEquipmentCategoryDto.getUSE_PLACE();
         // 详细地址
         String address = esEquipmentCategoryDto.getADDRESS();
-        return String.format("%s%s",usePlace, address);
+        return String.format("%s%s", usePlace, address);
     }
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionResultServiceImpl.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -39,6 +40,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -504,4 +506,12 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
         String group = getPersonIdentityByType(selectedOrgInfo.getCompany().getCompanyType());
         return JyjcInspectionApplicationServiceImpl.getDictionarieModels(group);
     }
+
+    @Async
+    public void updatePlanCreateDateByAppNo(String appNo) {
+        LambdaUpdateWrapper<JyjcInspectionResult> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(JyjcInspectionResult::getApplicationNo, appNo);
+        updateWrapper.set(JyjcInspectionResult::getPlanCreateDate, new Date());
+        this.update(updateWrapper);
+    }
 }
\ No newline at end of file