fix(jg):暂存功能问题处理

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/common/DataDockTemplateVersionUtils.java

@@ -71,7 +71,7 @@ public class DataDockTemplateVersionUtils {
         VERSION_MAP.put("新设备_压力容器设备_固定式", "V1.0.1");
         VERSION_MAP.put("新设备_压力容器设备_氧舱", "V1.0.1");
         VERSION_MAP.put("新设备_游乐设施设备", "V1.0.0");
-        VERSION_MAP.put("压力容器设备", "V1.0.0");
+        VERSION_MAP.put("压力容器设备", "V1.0.1");
         VERSION_MAP.put("长输管道设备", "V1.0.0");
     }
 

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

@@ -394,11 +394,10 @@
             isn.apply_no AS applyNo,
             ec1.name AS equListName,
             isn.receive_org_name AS receiveOrgName,
-            CASE isn.notice_status WHEN '6610' THEN '待提交' ELSE isn.notice_status END AS status,
             DATE_FORMAT(isn.notice_date, '%Y-%m-%d') AS createDate
         FROM tzs_jg_installation_notice isn
              LEFT JOIN tz_equipment_category ec1 ON ec1.code = isn.equ_list_code
-        WHERE isn.is_delete = false AND isn.notice_status = '6610'
+        WHERE isn.is_delete = false AND isn.notice_status in ('6610','6614','6615')
           AND isn.install_unit_credit_code = #{companyCode}
         UNION ALL
         SELECT
@@ -408,10 +407,9 @@
             isn.apply_no AS applyNo,
             isn.equ_list_name AS equListName,
             isn.receive_org_name AS receiveOrgName,
-            CASE isn.notice_status WHEN '6610' THEN '待提交' ELSE isn.notice_status END AS status,
             DATE_FORMAT(isn.create_date, '%Y-%m-%d') AS createDate
         FROM tzs_jg_reform_notice isn
-        WHERE isn.is_delete = false AND isn.notice_status = '6610'
+        WHERE isn.is_delete = false AND isn.notice_status in ('6610','6614','6615')
           AND isn.install_unit_credit_code = #{companyCode}
         UNION ALL
         SELECT
@@ -421,11 +419,10 @@
             isn.apply_no AS applyNo,
             ec1.name AS equListName,
             isn.receive_org_name AS receiveOrgName,
-            CASE isn.notice_status WHEN '6610' THEN '待提交' ELSE isn.notice_status END AS status,
             DATE_FORMAT(isn.create_date, '%Y-%m-%d') AS createDate
         FROM tzs_jg_maintain_notice isn
          LEFT JOIN tz_equipment_category ec1 ON ec1.code = isn.equ_list_code
-        WHERE isn.is_delete = false AND isn.notice_status = '6610'
+        WHERE isn.is_delete = false AND isn.notice_status in ('6610','6614','6615')
           AND isn.install_unit_credit_code = #{companyCode}
         UNION ALL
         SELECT
@@ -435,12 +432,11 @@
             isn.apply_no AS applyNo,
             ec1.name AS equListName,
             isn.receive_org_name AS receiveOrgName,
-            CASE isn.notice_status WHEN '6610' THEN '待提交' ELSE isn.notice_status END AS status,
             DATE_FORMAT(isn.create_date, '%Y-%m-%d') AS createDate
         FROM tzs_jg_transfer_notice isn
              LEFT JOIN tz_equipment_category ec1 ON ec1.code = isn.equ_list_code
         WHERE isn.is_delete = false
-          AND isn.notice_status = '6610'
+          AND isn.notice_status in ('6610','6614','6615')
           AND isn.install_unit_credit_code = #{companyCode}
         ORDER BY createDate DESC, applyNo DESC
     </select>

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

@@ -1553,7 +1553,6 @@
                          ORDER BY create_date DESC, apply_no DESC
                          ) AS rn
                  FROM (
-                          -- 使用登记
                           SELECT
                               ur.sequence_nbr,
                               '使用登记' AS business_type,
@@ -1567,12 +1566,9 @@
                                    LEFT JOIN idx_biz_jg_register_info ri ON ri."RECORD" = ure.equ_id
                                    LEFT JOIN tz_equipment_category ec1 ON ec1.code = ri."EQU_LIST"
                           WHERE ur.is_delete = FALSE
-                            AND ur.status = '使用单位待提交'
+                            AND ur.status in ('使用单位待提交', '一级受理已驳回', '使用单位已撤回')
                             AND ur.use_unit_credit_code = #{companyCode}
-
                           UNION ALL
-
-                          -- 改造变更登记
                           SELECT
                               crr.sequence_nbr,
                               '改造变更登记' AS business_type,
@@ -1583,12 +1579,9 @@
                               crr.create_date
                           FROM tzs_jg_change_registration_reform crr
                           WHERE crr.is_delete = FALSE
-                            AND crr.status = '使用单位待提交'
+                            AND crr.status in ('使用单位待提交', '一级受理已驳回', '使用单位已撤回')
                             AND crr.use_unit_credit_code = #{companyCode}
-
                           UNION ALL
-
-                          -- 移装变更登记
                           SELECT
                               crt.sequence_nbr,
                               '移装变更登记' AS business_type,
@@ -1599,12 +1592,9 @@
                               crt.create_date
                           FROM tzs_jg_change_registration_transfer crt
                           WHERE crt.is_delete = FALSE
-                            AND crt.status = '使用单位待提交'
+                            AND crt.status in ('使用单位待提交', '一级受理已驳回', '使用单位已撤回')
                             AND crt.use_unit_credit_code = #{companyCode}
-
                           UNION ALL
-
-                          -- 车用气瓶登记
                           SELECT
                               vi.sequence_nbr,
                               '车用气瓶登记' AS business_type,
@@ -1615,7 +1605,7 @@
                               vi.create_date
                           FROM tzs_jg_vehicle_information vi
                           WHERE vi.is_delete = FALSE
-                            AND vi.status = '使用单位待提交'
+                            AND vi.status in ('使用单位待提交', '一级受理已驳回', '使用单位已撤回')
                             AND vi.use_unit_credit_code = #{companyCode}
                       ) all_data
              ) dedup

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/handler/toBeSubmit/RegistrationReformStrategyHandler.java

@@ -24,7 +24,7 @@ public class RegistrationReformStrategyHandler implements ToBeSubmitDetailStrate
         basic.put("type", ApplicationFormTypeEnum.GZBG.getBusinessCode());
         basic.put("receiveOrgCreditCode1", notice.get("receiveCompanyCode"));
         basic.put("businessScenarios", "0");
-        basic.put("code", notice.get("equList"));
+        basic.put("code", notice.get("EQU_LIST_CODE"));
         Map<String, Map<String, Object>> result = new HashMap<>();
         result.put("notice", notice);
         result.put("basic", basic);

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

@@ -292,7 +292,7 @@ public class DataDockServiceImpl {
                         .list().stream().findFirst().orElse(null);
 
                 projectContraption.setRecDate(new Date());
-
+                projectContraption.setDataQualityScore("1");
                 if (ObjectUtils.isEmpty(oldContraption)) { // save
                     Long sequenceNbr = sequence.nextId();
                     projectContraption.setSequenceNbr(sequenceNbr);

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

@@ -4661,10 +4661,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             //checkNotBlank(data.getDesignUnitName(), "设计单位名称不能为空；", result);
             Optional.ofNullable(data.getDesignDate()).ifPresent(v -> checkDateFormatCorrect(v, "设计日期格式不正确；", result));
             Optional.ofNullable(data.getAppraisalDate()).ifPresent(v -> checkDateFormatCorrect(v, "设计文件鉴定日期格式不正确；", result));
-            checkNotBlank(data.getProduceUnitCreditCode(), "制造单位统一社会信用代码不能为空；", result);
-            checkNotBlank(data.getProduceUnitName(), "制造单位名称不能为空；", result);
+            //checkNotBlank(data.getProduceUnitCreditCode(), "制造单位统一社会信用代码不能为空；", result);
+            //checkNotBlank(data.getProduceUnitName(), "制造单位名称不能为空；", result);
 //            checkNotBlank(data.getProduceLicenseNum(), "制造许可编号不能为空；", result);
-            checkNotBlank(data.getFactoryNum(), "出厂编号/产品编码不能为空；", result);
+            //checkNotBlank(data.getFactoryNum(), "出厂编号/产品编码不能为空；", result);
             if ("0".equals(data.getWhetherVehicleCylinder())) {
                 checkNotBlank(data.getCylinderCategory(), "气瓶分类不能为空；", result);
                 if (!StringUtils.isEmpty(data.getFactoryNum())){

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

@@ -221,7 +221,12 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                             .findFirst()
                             .orElseThrow(() -> new BadRequest("没有查询到地市信息"));
 
-                    if (!city.split("_")[0].equals(deviceCity)) {
+                    if (city == null || deviceCity == null) {
+                        throw new BadRequest("请选择地市后暂存！");
+                    }
+
+                    String[] parts = city.split("_");
+                    if (parts.length == 0 || !parts[0].equals(deviceCity)) {
                         throw new BadRequest("区内移装只能选择与设备地址中相同地市进行移装！");
                     }
                 });

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

@@ -101,8 +101,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     public static final String RECORD = "record";
     public static final String SEQUENCE_NBR = "SEQUENCE_NBR";
     public static final String PROJECT_CONTRAPTION = "projectContraption";
-    public static final String EQU_LIST_CODE = "equListCode";
-    public static final String EQU_CATEGORY_CODE = "equCategoryCode";
+    public static final String EQU_LIST_CODE = "EQU_LIST_CODE";
+    public static final String EQU_CATEGORY_CODE = "EQU_CATEGORY_CODE";
     public static final String EQUIP_INFO = "equipInfo";
     public static final String PROJECT_CONTRAPTION_ID = "projectContraptionId";
     public static final String PRODUCT_PHOTO = "PRODUCT_PHOTO";
@@ -605,7 +605,9 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                     lambda.eq(JgReformNoticeEq::getEquipTransferId, model.getSequenceNbr());
                     jgReformNoticeEqMapper.delete(lambda);
                 }
-                jgReformNoticeEqMapper.insertBatchSomeColumn(noticeEqs);
+                if (!ValidationUtil.isEmpty(noticeEqs)){
+                    jgReformNoticeEqMapper.insertBatchSomeColumn(noticeEqs);
+                }
             }
             this.updateRedisBatch(Collections.singletonList(notice));
             return Collections.singletonList(notice);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/use-registration-form-unit.ftl

@@ -1896,7 +1896,7 @@
                                 <w:rPr>
                                     <w:spacing w:val="-2"/>
                                 </w:rPr>
-                                <w:t>日期：</w:t>
+                                <w:t>                            日期：</w:t>
                             </w:r>
                             <w:r>
                                 <w:rPr>
@@ -2009,9 +2009,9 @@
                             </w:r>
                             <w:r>
                                 <w:rPr>
-                                    <w:spacing w:val="-3"/>
+                                    <w:spacing w:val="-10"/>
                                 </w:rPr>
-                                <w:t>日期：</w:t>
+                                <w:t>                                  日期：</w:t>
                             </w:r>
                             <w:r>
                                 <w:rPr>
@@ -2029,9 +2029,9 @@
                             </w:r>
                             <w:r>
                                 <w:rPr>
-                                    <w:spacing w:val="-2"/>
+                                    <w:spacing w:val="-12"/>
                                 </w:rPr>
-                                <w:t>年</w:t>
+                                <w:t>      年</w:t>
                             </w:r>
                             <w:r>
                                 <w:rPr>
@@ -2045,7 +2045,7 @@
                                 <w:rPr>
                                     <w:spacing w:val="-2"/>
                                 </w:rPr>
-                                <w:t>月</w:t>
+                                <w:t>   月</w:t>
                             </w:r>
                             <w:r>
                                 <w:rPr>
@@ -2059,7 +2059,7 @@
                                 <w:rPr>
                                     <w:spacing w:val="-2"/>
                                 </w:rPr>
-                                <w:t>日</w:t>
+                                <w:t>   日</w:t>
                             </w:r>
                         </w:p>
                         <w:p>