Merge branch 'develop_tzs_register_to_0715' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/DPStatisticsMapper.xml

@@ -117,7 +117,7 @@
             privilege_company pc
                 INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
                 INNER JOIN tzs_jg_use_registration ur ON ur.use_unit_credit_code = bi.use_unit_code
-                AND ur.audit_status = '已完成'
+                AND ur.status = '已完成'
                 INNER JOIN tzs_jg_use_registration_eq te ON te.equip_transfer_id = ur.sequence_nbr
                 INNER JOIN idx_biz_jg_register_info jri ON te.equ_id = jri.record
         WHERE
@@ -187,7 +187,7 @@
             privilege_company pc
                 INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
                 INNER JOIN tzs_jg_vehicle_information ur ON ur.use_unit_credit_code = bi.use_unit_code
-                AND ur.audit_status = '已完成'
+                AND ur.status = '已完成'
                 INNER JOIN tzs_jg_vehicle_information_eq te ON te.vehicle_id = ur.sequence_nbr
                 INNER JOIN idx_biz_jg_register_info jri ON te.equ_id = jri.record
         WHERE
@@ -204,7 +204,7 @@
             privilege_company pc
                 INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
                 INNER JOIN tzs_jg_use_registration ur ON ur.use_unit_credit_code = bi.use_unit_code
-                AND ur.audit_status = '已完成'
+                AND ur.status = '已完成'
                 INNER JOIN tzs_jg_use_registration_eq te ON te.equip_transfer_id = ur.sequence_nbr
         WHERE
             pc.company_code = #{cityCode}
@@ -242,7 +242,7 @@
             privilege_company pc
                 INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
                 INNER JOIN tzs_jg_use_registration ur ON ur.use_unit_credit_code = bi.use_unit_code
-                AND ur.audit_status = '已完成'
+                AND ur.status = '已完成'
                 INNER JOIN tzs_jg_use_registration_eq te ON te.equip_transfer_id = ur.sequence_nbr
         WHERE
             pc.company_code = #{cityCode}

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

@@ -1294,10 +1294,10 @@ public class JGDPStatisticsServiceImpl {
         List<Map<String, Object>> uselist = dpStatisticsMapper.useEquCount(dpFilterParamDto.getCityCode(), startTime);
         Map<String, Integer> useCountMap = new HashMap<>();
         countNoticEquList(useCountMap, uselist);
-        //气瓶使用登记
-        List<Map<String, Object>> vehicleList = dpStatisticsMapper.vehicleEquCount(dpFilterParamDto.getCityCode(), startTime);
-        Map<String, Integer> vehicleCountMap = new HashMap<>();
-        countNoticEquList(vehicleCountMap, vehicleList);
+        //车用气瓶使用登记-
+//        List<Map<String, Object>> vehicleList = dpStatisticsMapper.vehicleEquCount(dpFilterParamDto.getCityCode(), startTime);
+//        Map<String, Integer> vehicleCountMap = new HashMap<>();
+//        countNoticEquList(vehicleCountMap, vehicleList);
         //改造变更登记
         List<Map<String, Object>> changeReformList = dpStatisticsMapper.changeReformEquCount(dpFilterParamDto.getCityCode(), startTime);
         Map<String, Integer> changeReformCountMap = new HashMap<>();
@@ -1338,7 +1338,7 @@ public class JGDPStatisticsServiceImpl {
         List unitModifyRegistration = new ArrayList<>();
         for (int i = 0; i < xDataList.size(); i++) {
             if (i == 0) {
-                useRegistration.add(vehicleCountMap.getOrDefault("2300", 0));
+                useRegistration.add(useCountMap.getOrDefault("2300", 0));
                 modificateModifyRegistration.add(changeReformCountMap.getOrDefault("2300", 0));
                 transloadingModifyRegistration.add(changeTransferCountMap.getOrDefault("2300", 0));
                 unitModifyRegistration.add(changeUnitCountMap.getOrDefault("2300", 0));