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/dto/JgUseRegistrationDto.java

@@ -151,4 +151,10 @@ public class JgUseRegistrationDto extends BaseDto {
     @ApiModelProperty(value = "作废日期")
     private Date cancelDate;
 
+    @ApiModelProperty(value = "是否增补")
+    private String isAddEquip;
+
+    @ApiModelProperty(value = "工程装置名称")
+    private String projectContraption;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistration.java

@@ -223,10 +223,21 @@ public class JgUseRegistration extends BaseEntity {
     @TableField("cancel_user_id")
     private String cancelUserId;
 
-
     /**
      * 作废原因
      */
     @TableField("cancel_reason")
     private String cancelReason;
+
+    /**
+     * 是否增补
+     */
+    @TableField("is_add_equip")
+    private String isAddEquip;
+
+    /**
+     * 工程装置名称
+     */
+    @TableField("project_contraption")
+    private String projectContraption;
 }

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

@@ -356,7 +356,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     private void updateOrCreateInspectionDetection(JSONObject map) {
         InspectionDetectionInfo inspectionDetectionInfo = new InspectionDetectionInfo();
         BeanUtil.copyProperties(map, inspectionDetectionInfo);
-
         if (map.get("jySeq") != null) {
             // 更新逻辑
             InspectionDetectionInfo inspectionDetectionInfoDb = inspectionDetectionInfoMapper.selectById(map.get("jySeq").toString());
@@ -922,14 +921,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             }
             //如果是气瓶或工业管道判断之前是否已经做过使用登记
             if (CylinderTypeEnum.CYLINDER.getCode().equals(equCategoryCode) || PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(equCategoryCode)) {
-                // 获取最新的使用登记记录
-                String useUnitCreditCode = jgUseRegistration.getUseUnitCreditCode();
-                JgUseRegistrationManage jgUseRegistrationManage = commonServiceImpl.getLatestJgUseRegistrationManage(useUnitCreditCode, equDefineCode);
-                useRegistrationCode = ObjectUtils.isEmpty(jgUseRegistrationManage) ? useRegistrationCode : jgUseRegistrationManage.getUseRegistrationCode();
-                useRegistrationManageSeq = ObjectUtils.isEmpty(jgUseRegistrationManage) ? useRegistrationManageSeq : jgUseRegistrationManage.getSequenceNbr();
-                flag = ObjectUtils.isEmpty(useRegistrationCode) ? flag : Boolean.TRUE;
+                //如果是增补功能
+                if ("1".equals(jgUseRegistration.getIsAddEquip())){
+                    useRegistrationCode = jgUseRegistration.getUseRegistrationCode();
+                    flag = Boolean.TRUE;
+                }
             }
-
             List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) mapData.get("equipmentLists");
             if (!CollectionUtils.isEmpty(equipmentLists)) {
                 for (int i = 0; i < equipmentLists.size(); i++) {
@@ -938,7 +935,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     String equId = (String) equipment.get("record");
                     mapData.put("equipId", equId);
                     mapData.put("isFirstEquip", i == 0);
-
                     // 注册信息
                     LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
                     lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, equId);