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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/DataHandlerMapper.java

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
+import org.apache.ibatis.annotations.Select;
+import org.checkerframework.checker.index.qual.SameLen;
+
+import java.util.List;
+
+/**
+ * 用于业务变更过程中的历史数据处理的mapper层
+ */
+public interface DataHandlerMapper {
+
+    @Select("SELECT ui.\"RECORD\" \n" +
+            "FROM \"amos_tzs_biz\".\"idx_biz_jg_use_info\" ui \n" +
+            "INNER JOIN \"amos_tzs_biz\".\"idx_biz_jg_register_info\" ri \n" +
+            "    ON ui.\"RECORD\" = ri.\"RECORD\"\n" +
+            "WHERE ui.\"DATA_SOURCE\" = 'jg_his' \n" +
+            "AND ui.\"EQU_STATE\" IS NULL \n" +
+            "AND ri.\"EQU_CATEGORY\" = '2300' \n" +
+            "AND NOT EXISTS (\n" +
+            "    SELECT 1 \n" +
+            "    FROM amos_tzs_biz.tzs_jg_scrap_cancel_eq sceq\n" +
+            "    INNER JOIN amos_tzs_biz.tzs_jg_scrap_cancel sc \n" +
+            "        ON sceq.\"equip_transfer_id\" = sc.\"sequence_nbr\"\n" +
+            "    WHERE sc.\"audit_status\" = '已完成' \n" +
+            "    AND sceq.\"equ_id\" = ui.\"RECORD\"\n" +
+            ")\n" +
+            "AND NOT EXISTS (\n" +
+            "    SELECT 1 \n" +
+            "    FROM amos_tzs_biz.tzs_jg_enable_disable_eq edeq\n" +
+            "    INNER JOIN amos_tzs_biz.tzs_jg_enable_disable ed \n" +
+            "        ON edeq.\"enable_disable_apply_id\" = ed.\"sequence_nbr\"\n" +
+            "    WHERE ed.\"audit_status\" = '已完成' \n" +
+            "    AND edeq.\"equ_id\" = ui.\"RECORD\"\n" +
+            ")")
+    List<String> selectOrdinaryHisGasCylinder();
+
+    @Select("SELECT ui.\"RECORD\" \n" +
+            "FROM \"amos_tzs_biz\".\"idx_biz_jg_use_info\" ui \n" +
+            "INNER JOIN \"amos_tzs_biz\".\"idx_biz_jg_register_info\" ri \n" +
+            "    ON ui.\"RECORD\" = ri.\"RECORD\"\n" +
+            "WHERE ui.\"DATA_SOURCE\" = 'jg' \n" +
+            "AND ui.\"EQU_STATE\" IS NULL \n" +
+            "AND ri.\"EQU_CATEGORY\" = '2300' \n" +
+            "AND NOT EXISTS (\n" +
+            "    SELECT 1 \n" +
+            "    FROM amos_tzs_biz.tzs_jg_use_registration_eq ureq\n" +
+            "    INNER JOIN amos_tzs_biz.tzs_jg_use_registration ur \n" +
+            "        ON ureq.\"equip_transfer_id\" = ur.\"sequence_nbr\"\n" +
+            "    WHERE ur.\"status\" = '已完成' \n" +
+            "    AND ureq.\"equ_id\" = ui.\"RECORD\"\n" +
+            ")")
+    List<String> selectOrdinaryGasCylinder();
+}
+

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

@@ -136,4 +136,15 @@ public class DataHandlerController extends BaseController {
     public ResponseModel<Boolean> writeProjectContraptionIdInJgUseRegistration() {
         return ResponseHelper.buildResponse(dataHandlerService.writeProjectContraptionIdInJgUseRegistration());
     }
+
+    /**
+     * BUG 26910 【现场需求】登记证管理中，历史设备登记的普通气瓶，状态为空，新增气瓶的状态为在用
+     * 将历史导入的普通气瓶和正常导入的普通气瓶刷入设备状态
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "将历史导入的普通气瓶和正常导入的普通气瓶刷入设备状态", notes = "将历史导入的普通气瓶和正常导入的普通气瓶刷入设备状态")
+    @GetMapping(value = "/ordinaryGasCylinder/equState")
+    public ResponseModel<String> ordinaryGasCylinderWriteEquState() {
+        return ResponseHelper.buildResponse(dataHandlerService.ordinaryGasCylinderWriteEquState());
+    }
 }

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) {
@@ -2066,6 +2070,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jsonObject.put("receiveOrgCode", jgUseRegistration.getReceiveCompanyCode() + "_" + jgUseRegistration.getReceiveOrgName());
             jsonObject.put("status", jgUseRegistration.getStatus());
             jsonObject.put("applyNo", jgUseRegistration.getApplyNo());
+            Optional.ofNullable(jsonObject.get("safetyManagerName")).ifPresent(name -> jsonObject.put("maintenanceManagerName", name));
+            Optional.ofNullable(jsonObject.get("phone")).ifPresent(phone -> jsonObject.put("maintenanceManagerPhone", phone));
             jsonObject.remove("submit");
             jsonObject.remove("instanceId");
             if (!ObjectUtils.isEmpty(jsonObject.get("factoryUseSiteStreet"))) {

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">