fix(jg):历史有证暂存功能修改

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

@@ -3480,6 +3480,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         List<IdxBizJgMainParts> mainPartsList = new ArrayList<>();
         List<IdxBizJgProtectionDevices> protectionDevicesList = new ArrayList<>();
 
+        if (!equipmentParamsForm.isEmpty()){
             // 电梯
             if (EquipmentClassifityEnum.DT.getCode().equals(equList)) {
                 IdxBizJgTechParamsElevator elevator = JSON.parseObject(JSON.toJSONString(equipmentParamsForm), IdxBizJgTechParamsElevator.class);
@@ -3609,6 +3610,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 protectionDevicesList = this.getAccessoryEntity(equipmentParamsForm, subFormProtectionDevicesList, EQUIP_PROTECTIONDEVICES_FORM_ID, record, date, operateType);
 
             }
+        }
 
         // 八大类技术参数和主要零部件和安全附件表
         if (!ValidationUtil.isEmpty(mainPartsList)) {

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

@@ -46,7 +46,8 @@
             DATA_SOURCE,
             USE_UNIT_NAME,
             USE_DATE,
-            DATA_QUALITY_SCORE
+            DATA_QUALITY_SCORE,
+            IS_FIRST_MERGE as isFirstMerge
         FROM
             IDX_BIZ_JG_PROJECT_CONTRAPTION ibjpc
         WHERE