Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/DPMapStatisticsItemEnum.java

@@ -30,6 +30,9 @@ public enum DPMapStatisticsItemEnum {
     GAS_UNITS("充装单位 (家)", "gasUnits", ""),
     OPERATORS("作业人员 (人)", "operators", ""),
     DEVICE_COUNT("已纳管设备数", "deviceCount", ""),
+    PERSON_ISSUES_COUNT("个人问题数", "个人", ""),
+    COMPANY_ISSUES_COUNT("企业问题数", "企业", ""),
+    EQU_ISSUES_COUNT("设备数", "设备", ""),
     CERTIFICATE_COUNT("登记证总量", "certificateCount", "");
     private String label;
     private String code;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationReformController.java

@@ -181,7 +181,7 @@ public class JgChangeRegistrationReformController extends BaseController {
 		if (!ValidationUtil.isEmpty(receiveCompanyCode)){
 			String[] codes = receiveCompanyCode.split("_");
 			if (!ValidationUtil.isEmpty(codes)){
-				dto.setReceiveCompanyCode("1".equals(transferType) ? null : codes[0]);
+				dto.setReceiveCompanyCode(codes[0]);
 			}
 		}
 		dto.setCertificateStatus("1".equals(transferType) ? "已注销" : "已登记");

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

@@ -944,7 +944,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                                 useInfo.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
                                 useInfoMapper.updateById(useInfo);
                             }
-                            //es中的编号信息
+                            //修改ES中使用单位信息和使用单位代码
                             Map<String, Map<String, Object>> resultMap = new HashMap<>();
                             Map<String, Object> map1 = new HashMap<>();
                             map1.put("USE_UNIT_CREDIT_CODE", registration.getNewUseUnitCreditCode());
@@ -964,6 +964,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                     List<String> ids = historyJson.stream().map(v -> JSON.parseObject(v.toString()).getString("sequenceNbr")).collect(Collectors.toList());
                     List<JgUseRegistrationManage> list = useRegistrationManageService.lambdaQuery().in(BaseEntity::getSequenceNbr, ids).list();
                     for (JgUseRegistrationManage registrationManage : list) {
+                        //修改使用登记证管理使用单位地址、使用单位代码、接收机构、接收机构公司代码、办理日期、使用单位地址
                         registrationManage.setUseUnitName(registration.getNewUseUnitName());
                         registrationManage.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
                         registrationManage.setReceiveOrgName(registration.getReceiveOrgName());

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

@@ -67,7 +67,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**
- * 移装造告知服务实现类
+ * 移装告知服务实现类
  *
  * @author system_generator
  * @date 2023-12-19
@@ -114,6 +114,12 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     private RedissonClient redissonClient;
     @Autowired
     ESEquipmentCategory esEquipmentCategory;
+    @Autowired
+    JgRegistrationHistoryServiceImpl jgRegistrationHistoryService;
+    @Autowired
+    JgTransferNoticeEqServiceImpl jgTransferNoticeEqService;
+    @Autowired
+    ESElavtorRepository esElavtorRepository;
 
     /**
      * 根据sequenceNbr查询
@@ -450,8 +456,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         }
     }
 
-    @Autowired
-    ESElavtorRepository esElavtorRepository;
+
 
     /**
      * 分页查询
@@ -828,7 +833,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             // 检查实际状态是否不等于期望状态
             commonService.checkExpectedStatus(jgTransferNotice.getNoticeStatus());
 
-
             // 执行工作流并返回组装好的工作流信息
             WorkflowResultDto workflowResultDto = getWorkflowResultDto(op, opinion, jgTransferNotice);
 
@@ -848,8 +852,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                     jgTransferNotice.setPromoter("");
                     jgTransferNotice.setHandleDate(new Date());
                     jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
-
-
+                    //修改设备ES设备使用场所和设备详细使用地址
                     Map<String, Map<String, Object>> objMap = new HashMap<>();
                     for (JgTransferNoticeEq eq : jgTransferNoticeEqs) {
                         Map<String, Object> map1 = new HashMap<>();
@@ -966,9 +969,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         }
     }
 
-    @Autowired
-    JgTransferNoticeEqServiceImpl jgTransferNoticeEqService;
-
     private void updateEq(JgTransferNotice jgTransferNotice) {
         // 组装设备注册代码
         String ym = null;
@@ -990,9 +990,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         jgTransferNoticeEqService.updateBatchById(eqList);
     }
 
-    @Autowired
-    JgRegistrationHistoryServiceImpl jgRegistrationHistoryService;
-
     private void saveHisDataBeforeUpdate(JgTransferNotice jgTransferNotice, List<JgTransferNoticeEq> jgTransferNoticeEqs) {
         String seq = jgTransferNotice.getSequenceNbr().toString();
         JSONObject json = (JSONObject) JSONObject.toJSON(jgTransferNotice);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/installation-notification-report.ftl

@@ -2332,7 +2332,7 @@
                                         </w:rPr>
                                     </w:pPr>
 
-                                    <#list installLicenseExpirationDateList as item1>
+                                    <#list equipList.installLicenseExpirationDateList as item1>
                                         <w:r>
                                             <w:rPr>
                                                 <w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/>

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/dto/SecurityIndexCountItemDto.java

+package com.yeejoin.amos.boot.module.statistics.api.dto;
+
+import lombok.Data;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class SecurityIndexCountItemDto {
+
+    private String regionCode;
+
+    private String regionName;
+
+    /**
+     * 充装检查率
+     */
+    private String czjc;
+
+    /**
+     * 许可有效率
+     */
+    String xuke;
+
+    /**
+     * 使用登记办理率
+     */
+    String shiyongdengji;
+
+
+    /**
+     * 检验超期率
+     */
+    String jianyanchaoqi;
+
+    /**
+     * 检验合格率
+     */
+    String jianyanhege;
+
+    /**
+     * 充装检查率
+     */
+    String czjchege;
+}

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

@@ -46,10 +46,10 @@ public interface AQZSDPStatisticsMapper {
     /**
      * 单位按照资质状态分组下的统计数量
      *
-     * @param regionCode 区域
+     * @param orgCode 区域
      * @return List<KeyValueDto>
      */
-    List<KeyValueDto> queryLicenseEfficiencyOfRegion(@Param(value = "regionCode") String regionCode);
+    List<KeyValueDto> queryLicenseEfficiencyOfRegion(@Param(value = "orgCode") String orgCode);
     /**
      * 查询单个单位的有效期信息
      *
@@ -58,8 +58,9 @@ public interface AQZSDPStatisticsMapper {
      */
     KeyValueDto queryLicenseEfficiencyOneCompany(@Param(value = "appId") String appId);
 
-    Map<String, Object> getInspectionExpiredRate(@Param(value = "regionCode") String regionCode, @Param(value = "appId") String appId);
+    Map<String, Object> getInspectionExpiredRate(@Param(value = "orgCode") String orgCode, @Param(value = "appId") String appId);
 
-    Map<String, Object> getInspectionResultRate(@Param(value = "regionCode") String regionCode, @Param(value = "appId") String appId);
+    Map<String, Object> getInspectionResultRate(@Param(value = "orgCode") String orgCode, @Param(value = "appId") String appId);
 
+    List<Map<String, Object>> selectByOrg(String orgCode);
 }

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

@@ -13,4 +13,11 @@ import org.apache.ibatis.annotations.Param;
 public interface CylinderStatisticsMapper {
 
     Long countEnterpriseNumForCylinder(@Param("orgCode") String orgCode);
+
+    /**
+     * 按照管辖维度，统计充装单位使用登记证的办理率
+     * @param orgCode 区域对应的单位orgCode
+     * @return 办理率*100
+     */
+    String queryUserRegisterCertAppPercent(@Param("orgCode") String orgCode);
 }

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

@@ -246,8 +246,8 @@
 		<where>
 			cu.data_sources = '陕西省内企业'
 			AND cu.unit_type LIKE '%充装单位%'
-			<if test="regionCode != null and regionCode != ''">
-				and cu.org_code like concat(#{regionCode}, '%')
+			<if test="orgCode != null and orgCode != ''">
+				and cu.supervise_org_code like concat(#{orgCode}, '%')
 			</if>
 			<if test="appId != null and appId != ''">
 				and cu.app_id = #{appId}
@@ -264,8 +264,8 @@
 		<where>
 			cu.data_sources = '陕西省内企业'
 			AND cu.unit_type LIKE '%充装单位%'
-			<if test="regionCode != null and regionCode != ''">
-				and cu.org_code like concat( #{regionCode}, '%')
+			<if test="orgCode != null and orgCode != ''">
+				and cu.supervise_org_code like concat( #{orgCode}, '%')
 			</if>
 			<if test="appId != null and appId != ''">
 				and cu.app_id = #{appId}
@@ -303,9 +303,21 @@
         where
              cu.data_sources = '陕西省内企业'
           AND cu.unit_type LIKE '%充装单位%'
-          and cu.org_code like concat('%', #{regionCode}, '%')
+          and cu.supervise_org_code like concat(#{orgCode}, '%')
         GROUP BY strKey
     </select>
+
+	<select id="selectByOrg" resultType="java.util.Map">
+		SELECT COUNT
+			( 1 ),
+			source_type AS sourceType
+		FROM
+			tzs_safety_problem_tracing
+		WHERE
+			governing_body_org_code LIKE concat ( #{orgCode}, '%' )
+		GROUP BY
+			source_type
+	</select>
 </mapper>
 
 

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

@@ -10,4 +10,25 @@
             unit_type LIKE'%充装单位%'
             and supervise_org_code like concat(#{orgCode},'%')
     </select>
+    <select id="queryUserRegisterCertAppPercent" resultType="java.lang.String">
+            select
+	            case when s2.total= 0 then 0 else round(s1.num/s2.total * 100, 2) end as percent
+            from
+                (SELECT
+                 count(DISTINCT(a.use_unit_credit_code)) as num
+                FROM
+                 "tzs_jg_use_registration_manage" a,
+                  privilege_company c
+                where
+                a.receive_company_code = c.company_code
+                and  a.certificate_status='已登记'
+                and c.org_code  like concat(#{orgCode},'%')) s1,
+                (SELECT
+                   count(1) as total
+                FROM "tz_base_enterprise_info"
+                where
+                    unit_type LIKE'%充装单位%'
+                    and supervise_org_code like concat(#{orgCode},'%')
+                ) s2
+    </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/init/DataInitAfterRuning.java

 package com.yeejoin.amos.boot.module.statistcs.biz.init;
 
+import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.AQZSDPStatisticsServiceImpl;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.JGDPStatisticsServiceImpl;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.StCommonServiceImpl;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
@@ -16,14 +17,17 @@ public class DataInitAfterRuning implements ApplicationRunner {
 
     private JGDPStatisticsServiceImpl jgdpStatisticsService;
 
+    private AQZSDPStatisticsServiceImpl aqzsdpStatisticsService;
+
     private StCommonServiceImpl stCommonService;
 
     private AmosRequestContext amosRequestContext;
 
-    public DataInitAfterRuning(JGDPStatisticsServiceImpl jgdpStatisticsService, StCommonServiceImpl stCommonService, AmosRequestContext amosRequestContext) {
+    public DataInitAfterRuning(JGDPStatisticsServiceImpl jgdpStatisticsService, StCommonServiceImpl stCommonService, AmosRequestContext amosRequestContext, AQZSDPStatisticsServiceImpl aqzsdpStatisticsService) {
         this.jgdpStatisticsService = jgdpStatisticsService;
         this.stCommonService = stCommonService;
         this.amosRequestContext = amosRequestContext;
+        this.aqzsdpStatisticsService = aqzsdpStatisticsService;
     }
 
     @Override
@@ -34,5 +38,6 @@ public class DataInitAfterRuning implements ApplicationRunner {
         RequestContext.setToken(amosRequestContext.getToken());
         jgdpStatisticsService.init();
         stCommonService.init();
+        aqzsdpStatisticsService.init();
     }
 }

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

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 
 /**
  * @author Administrator
@@ -78,4 +79,9 @@ public class StCommonServiceImpl {
         }
         return regionList;
     }
+
+    public List<String> buildXData(List<RegionModel> regionList) {
+        return regionList.stream().map(RegionModel::getRegionName).collect(Collectors.toList());
+    }
+
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/EquipTechParamPipelineMapper.java

@@ -2,8 +2,9 @@ package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamPipeline;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-
+@Mapper
 public interface EquipTechParamPipelineMapper extends BaseMapper<EquipTechParamPipeline> {
     /**
      * 在用的最新需求整理的技术参数--需求未出

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/EquipmentCategoryMapper.java

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.UseUnitCreditCodeCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.vo.EquipExportVo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -19,6 +20,7 @@ import java.util.Map;
  * @author system_generator
  * @date 2021-10-20
  */
+@Mapper
 public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
 
     @Select("select * from tz_equipment_category where code in('1000','2000','3000','4000','5000','6000','8000','9000')")

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/TzBaseEnterpriseInfoMapper.java

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.biz.common.dto.CountDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquEnterDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -17,6 +18,7 @@ import java.util.List;
  * @author duanwei
  * @date 2022-08-10
  */
+@Mapper
 public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseInfo> {
 
     /**

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/TzsUserInfoMapper.java

@@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-
+@Mapper
 public interface TzsUserInfoMapper extends BaseMapper<TzsUserInfo> {
     Page<TzsUserInfoDto> selectPageMessage(@Param("page") Page<TzsUserInfoDto> page, @Param("dto") TzsUserInfoDto dto);
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/CylinderAreaDataMapper.xml

@@ -155,7 +155,7 @@
         <if test="orgCodes != null and orgCodes.size > 0">
             AND
             <foreach collection="orgCodes" open="(" item="orgCode" close=")" separator=" or ">
-                (u.org_code like concat(#{orgCode}, '%') )
+                (u.supervise_org_code like concat(#{orgCode}, '%') )
             </foreach>
         </if>
     </select>