Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -397,6 +397,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(String.valueOf(map.get("equipId")), flag ? useRegistrationCode : useOrgCode);
         // 生成监管码、96333码(管道合并到有证不生成)
         createCode(map, jgUseRegistration, registerInfo, useInfo, otherInfo);
+        if ("2".equals(jgUseRegistration.getRegType()) && "3000".equals(map.getString("equList"))) {
+            // 电梯处理维保信息
+            this.historyEquUpdateMaintenanceInfo(map);
+        }
     }
 
     private void updateOrCreateInspectionDetection(Map<String, Object> equipment, JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo registerInfo) {

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

@@ -65,13 +65,14 @@
             E.supervise_org_code LIKE concat ( #{orgCode}, '%' )
     </select>
     <select id="countEnterpriseUsed" resultType="java.lang.Long">
-        SELECT COUNT
-                   ( DISTINCT ( E.app_id ) )
-        FROM
-            tz_cylinder_filling_record
-                T INNER JOIN tz_base_enterprise_info E ON T.app_id = E.app_id and E.unit_type like '%充装单位%'
-        WHERE
-            E.supervise_org_code LIKE concat ( #{orgCode}, '%' )
+        SELECT COUNT(1)
+        FROM tz_base_enterprise_info E
+        WHERE E.unit_type LIKE '%充装单位%' AND E.supervise_org_code LIKE concat ( #{orgCode}, '%' )
+          AND EXISTS (
+            SELECT 1
+            FROM tz_cylinder_filling_record T
+            WHERE T.app_id = E.app_id
+        )
     </select>
     <select id="getStationRateSubPage"
             resultType="com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto">