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

@@ -469,8 +469,8 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
         projectContraption.setEquCategoryName(equCategoryName);
         projectContraption.setEquDefineName(equDefineName);
         projectContraption.setPipelineLength(0.0);
-        projectContraption.setUscUnitName(companyInfoMap.get("companyName").toString());
-        projectContraption.setUscUnitCreditCode(companyInfoMap.get("creditCode").toString());
+        projectContraption.setUseUnitName(companyInfoMap.get("companyName").toString());
+        projectContraption.setUseUnitCreditCode(companyInfoMap.get("creditCode").toString());
         return this.saveOrUpdateData(projectContraption);
     }
 }
\ No newline at end of file

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

@@ -858,6 +858,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             List<JgUseRegistrationEq> equipList = equipmentLists.stream()
                     .map(x -> new JgUseRegistrationEq()
                             .setEquId(String.valueOf(x.get("record")))
+                            .setOriginProjectContraptionId(String.valueOf(x.get("projectContraptionId")))
                             .setEquipTransferId(String.valueOf(useRegistration.getSequenceNbr())))
                     .collect(Collectors.toList());
             // 保存关联设备信息
@@ -1025,13 +1026,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 }
             }
             //如果是气瓶或工业管道判断之前是否已经做过使用登记
-            if (CylinderTypeEnum.CYLINDER.getCode().equals(equCategoryCode) || PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(equCategoryCode)) {
+            if (CylinderTypeEnum.CYLINDER.getCode().equals(equCategoryCode)) {
                 //如果是增补功能
                 if ("1".equals(jgUseRegistration.getIsAddEquip())) {
                     useRegistrationCode = jgUseRegistration.getUseRegistrationCode();
                     flag = Boolean.TRUE;
                 }
             }
+
             List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) mapData.get("equipmentLists");
             String inspectConclusionName = getInspectConclusionName(mapData);
             if (!CollectionUtils.isEmpty(equipmentLists)) {
@@ -3884,6 +3886,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         LambdaQueryWrapper<IdxBizJgProjectContraption> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IdxBizJgProjectContraption::getUseUnitCreditCode,useUnitCreditCode);
         wrapper.eq(IdxBizJgProjectContraption::getIsIntoManagement, true);
+        wrapper.eq(IdxBizJgProjectContraption::getIsFirstMerge, false);
         wrapper.notIn(!proIds.isEmpty(), BaseEntity::getSequenceNbr, proIds);
         wrapper.isNull(IdxBizJgProjectContraption::getProjectContraptionParentId);
         wrapper.last("and (length(use_registration_code) = 0 or use_registration_code is null)");
@@ -3927,7 +3930,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         double totalPipelineLength = equList.stream()
                 .map(map -> map.get("pipeLength"))
                 .filter(Objects::nonNull)
-                .mapToDouble(value -> (Double) value)
+                .mapToDouble(value -> Double.parseDouble((String) value))
                 .sum();
 
         return MapBuilder.<String, Object>create()