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

@@ -62,6 +62,8 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.nio.file.Files;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
@@ -70,6 +72,7 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 使用登记表补证服务实现类
@@ -861,8 +864,7 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
         }
         //管道查询工程装置信息
         if (PipelineEnum.PRESSURE_PIPELINE.getCode().equals(registrationManage.getEquListCode())) {
-            List<IdxBizJgProjectContraption> projectContraptionDtoList = jgProjectContraptionServiceImplService.queryProConByCertSeq(sequenceNbr);
-            result.put(EQU_LISTS, projectContraptionDtoList);
+            result.put(EQU_LISTS, getProConByUseRegistrationCode(registrationManage.getUseRegistrationCode()));
         }
         //非管道信息
         else{
@@ -901,6 +903,30 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
         return equipmentLists;
     }
 
+    public List<IdxBizJgProjectContraption> getProConByUseRegistrationCode(String useRegistrationCode) {
+        List<IdxBizJgProjectContraption> result = jgProjectContraptionServiceImplService.lambdaQuery()
+                .eq(IdxBizJgProjectContraption::getIsDelete, Boolean.FALSE)
+                .isNull(IdxBizJgProjectContraption::getProjectContraptionParentId)
+                .eq(IdxBizJgProjectContraption::getUseRegistrationCode, useRegistrationCode)
+                .list();
+
+        if (!ValidationUtil.isEmpty(result)) {
+            result.forEach(record -> {
+                BigDecimal pipelineLength = BigDecimal.valueOf(record.getPipelineLength());
+                BigDecimal roundedValue = pipelineLength.setScale(3, RoundingMode.HALF_UP);
+                BigDecimal strippedValue = roundedValue.stripTrailingZeros();
+                record.setPipelineLength(Double.valueOf(strippedValue.toPlainString()));
+                record.setRecord(record.getSequenceNbr());
+                record.setFullAddress(
+                        Stream.of(record.getProvinceName(), record.getCityName(), record.getCountyName(), record.getStreetName(), record.getAddress())
+                                .map(value -> value == null ? "" : value)
+                                .collect(Collectors.joining())
+                );
+            });
+        }
+        return result;
+    }
+
     /**
      * 撤回
      *

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgProjectContraption.java

@@ -325,7 +325,6 @@ public class IdxBizJgProjectContraption extends BaseEntity {
     @TableField(exist = false)
     private Boolean happenAfterBiz;
 
-
     /**
      * 登记类型：0-新增；1-历史有证；2-历史无证
      */
@@ -333,8 +332,14 @@ public class IdxBizJgProjectContraption extends BaseEntity {
     private String regType;
 
     /**
-     *  是否是否纳管中文返回
+     *  是否纳管中文返回
      */
     @TableField(exist = false)
     private String isIntoManagementName;
+
+    /**
+     *  工程装置ID（补证使用）
+     */
+    @TableField(exist = false)
+    private Long record;
 }