feat(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/JgChangeRegistrationReformServiceImpl.java

@@ -194,8 +194,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 
     @Autowired
     private ChangeRegisterReformBackupManager  backupManager;
-    @Autowired
-    private IdxBizJgTechParamsPipelineServiceImpl idxBizJgTechParamsPipelineServiceImpl;
 
     @Autowired
     private EventPublisher eventPublisher;
@@ -207,6 +205,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     @Autowired
     private PieLineDataChangeServiceImpl pieLineDataChangeService;
 
+
     /***
      * @deprecated 根据查询调教获取分页对象
      * @param dto 查询的dto对象
@@ -657,7 +656,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             map.put("model", conveterTaskMessageDTO(jgChangeRegistrationReform));
             TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(map);
             if(!jgChangeRegistrationReform.getEquipListName().equals(EquipmentClassifityEnum.YLGD.getName())){ // 非压力管道逻辑
-                JgChangeRegistrationReformEq jgChangeRegistrationReformEq = jgChangeRegistrationReformEqMapper.selectOne(new QueryWrapper<JgChangeRegistrationReformEq>().eq("equip_transfer_id", jgChangeRegistrationReform.getSequenceNbr()));
+                JgChangeRegistrationReformEq jgChangeRegistrationReformEq = jgChangeRegistrationReformEqServiceImpl.lambdaQuery().eq(JgChangeRegistrationReformEq::getEquipTransferId, jgChangeRegistrationReform.getSequenceNbr()).select(BaseEntity::getSequenceNbr, JgChangeRegistrationReformEq::getEquId).one();
                 updateTechparamsByEquIdAndCurrentDoucumentId(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform.getSequenceNbr().toString(), null, jgChangeRegistrationReform.getApplyNo());
                 // 生成流水信息
                 saveRecord(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform, taskV2Model);
@@ -1611,7 +1610,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     private void processElseDataByStatus(String oldStatus, JgChangeRegistrationReform jgChangeRegistrationReform) {
         switch (oldStatus) {
             case "使用单位待提交":
-                // do no thing
+                // do nothing
                 break;
             case "已完成":
                 // 1.技术参数恢复原数据
@@ -1630,26 +1629,12 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                     Boolean isRollBack = backupManager.restore(jgChangeRegistrationReform.getSequenceNbr() + "");
                     if(isRollBack){ // 进行过编辑逻辑
                         // 1.装置重新计算管道长度
-                        this.updateTotalPieLineLength(jgChangeRegistrationReform.getProjectContraptionId());
+                        pieLineDataChangeService.updatePipelineLength(jgChangeRegistrationReform.getProjectContraptionId());
                     }
                 }
         }
     }
 
-    private void updateTotalPieLineLength(String pid) {
-        List<String> records = idxBizJgUseInfoService.list(new LambdaQueryWrapper<IdxBizJgUseInfo>().in(IdxBizJgUseInfo::getProjectContraptionId, pid)).stream().map(IdxBizJgUseInfo::getRecord).collect(toList());
-        List<IdxBizJgTechParamsPipeline> paramsPipelines = idxBizJgTechParamsPipelineServiceImpl.list(new LambdaQueryWrapper<IdxBizJgTechParamsPipeline>().in(IdxBizJgTechParamsPipeline::getRecord, records).select(IdxBizJgTechParamsPipeline::getRecord,IdxBizJgTechParamsPipeline::getPipeLength));
-        double totalLength = paramsPipelines.stream()
-                .map(IdxBizJgTechParamsPipeline::getPipeLength)       // 先提取长度字符串
-                .filter(Objects::nonNull)          // 过滤掉null值
-                .mapToDouble(Double::parseDouble)  // 解析字符串为double并转为DoubleStream
-                .sum();
-        LambdaUpdateWrapper<IdxBizJgProjectContraption> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.set(IdxBizJgProjectContraption::getPipelineLength, totalLength);
-        updateWrapper.eq(BaseEntity::getSequenceNbr, pid);
-        jgProjectContraptionService.update(updateWrapper);
-    }
-
     private void finishedTask(JgChangeRegistrationReform jgChangeRegistrationReform) {
         HashMap<String, Object> taskMap = new HashMap<>();
         taskMap.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
@@ -1744,8 +1729,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 // 编辑过则按照编辑的数据进行恢复管道信息
                 Boolean isRollBack = backupManager.restore(jgChangeRegistrationReform.getSequenceNbr() + "");
                 if(isRollBack){ // 进行过编辑逻辑
-                    // 1.原装置、新装置重新计算管道长度
-                    this.updateTotalPieLineLength(jgChangeRegistrationReform.getProjectContraptionId());
+                    // 1.原装置、新装置重新计算管道长度-非报废状态的
+                    pieLineDataChangeService.updatePipelineLength(jgChangeRegistrationReform.getProjectContraptionId());
                 } else {      //未编辑过，走原有逻辑
                     JSONObject jsonObject = JSONObject.parseObject(oldTechInfo);
                     JSONArray piePines = jsonObject.getJSONArray("equipmentLists");

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

@@ -749,7 +749,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             //获取告知单信息
             byte[] templateToPdfData = WordTemplateUtils.getTemplateToPdfData(tempFileName, "installation-notification-report.ftl", map);
             //获取管道和气瓶的基本信息汇总表
-            List<CompletableFuture<byte[]>> exportSummaryBasicInfoData = jgUseRegistrationService.getExportSummaryBasicInfoData(Collections.singletonList(Long.valueOf(sequenceNbr)), jgInstallationNotice.getEquCategoryCode(), "安装告知", Boolean.TRUE, null);
+            List<CompletableFuture<byte[]>> exportSummaryBasicInfoData = jgUseRegistrationService.getExportSummaryBasicInfoData(Collections.singletonList(Long.valueOf(sequenceNbr)), jgInstallationNotice.getEquCategoryCode(), "安装告知", null);
             toZipFileByData(response, exportSummaryBasicInfoData, templateToPdfData, jgInstallationNotice.getApplyNo());
         } else {
             WordTemplateUtils.templateToPdfDownload(tempFileName, "installation-notification-report.ftl", map, response);

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

@@ -2864,7 +2864,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     /**
-     * 获取装置下的管道信息（根据整个记录去重）
+     * 获取装置下的管道信息-补保护报废的
      *
      * @param projectContraptionList 装置 ID 列表
      * @return 去重后的管道信息 JSON 数组
@@ -2873,14 +2873,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         if (CollectionUtils.isEmpty(projectContraptionList)) {
             return Collections.emptyList();
         }
-        Set<String> result = new HashSet<>();
         return projectContraptionList.stream()
                 .filter(Objects::nonNull)
-                .map(jgProjectContraptionService.getBaseMapper()::selectEquipList)
+                .map(jgProjectContraptionService.getBaseMapper()::selectEquipListByExport)
                 .filter(Objects::nonNull)
                 .flatMap(List::stream)
-                .peek(map -> map.put("productName", map.get("pipeName")))
-                .filter(map -> result.add(JSONObject.toJSONString(map)))
                 .collect(toList());
     }
 
@@ -2909,8 +2906,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      * @param whetherToFilterStatus 是否过滤设备状态 是：true（过滤设备状态为在用），否：false（所有的）
      * @return
      */
-    public List<CompletableFuture<byte[]>> getExportSummaryBasicInfoData(List<Long> useRegistrationSeqs, String category, String type,
-                                                                         Boolean whetherToFilterStatus, Set<String> projectContraptionIdList) {
+    public List<CompletableFuture<byte[]>> getExportSummaryBasicInfoData(List<Long> useRegistrationSeqs, String category, String type, Set<String> projectContraptionIdList) {
         List<CompletableFuture<byte[]>> futureList = new ArrayList<>();
         // 总数
         double total;
@@ -2923,18 +2919,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             throw new BadRequest("没有查询到汇总信息！");
         }
         JSONArray allEquipment = new JSONArray();
-        Set<String> addedEquCodes = new HashSet<>();
 
         if (!"安装告知".equals(type)) {
             List<Map<String, Object>> equipmentList = getEquipInfoList(useRegistrationSeqs, category, projectContraptionIdList);
             if (CollectionUtils.isNotEmpty(equipmentList)) {
                 equipmentList.forEach(map -> {
-                    String record = (String) map.get("record");
-                    JYJCResultEnum resultEnum = JYJCResultEnum.getNameByCode(String.valueOf(map.get("inspectConclusion")));
-                    map.put("inspectConclusion", resultEnum != null ? resultEnum.getName() :  "");
-                    if ((whetherToFilterStatus || this.checkEquStatusInUse(record))) {
-                        allEquipment.add(new JSONObject(map));
-                    }
+                    allEquipment.add(new JSONObject(map));
                 });
             }
         } else {
@@ -2942,17 +2932,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 JSONObject jsonObject = JSONObject.parseObject(history.getChangeData());
                 String useDate = jsonObject.getString("useDate");
                 List<Map<String, Object>> deviceList = (List<Map<String, Object>>) jsonObject.get("deviceList");
-
                 if (CollectionUtils.isNotEmpty(deviceList)) {
-                    Set<String> validCategories = new HashSet<>(Arrays.asList("8300", "8200", "8100"));
                     deviceList.stream()
                             .map(JSONObject::new)
-                            .filter(item -> !validCategories.contains(category) ||
-                                    (whetherToFilterStatus || this.checkEquStatusInUse(item.getString("record"))))
                             .peek(item -> {
-                                if (!validCategories.contains(category)) {
-                                    addedEquCodes.add(item.getString("equCode"));
-                                }
                                 item.put("useDate", timeToMonths(useDate));
                             })
                             .forEach(allEquipment::add);
@@ -3030,7 +3013,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     public void exportSummaryBasicInfo(List<Long> useRegistrationSeqs, HttpServletResponse response, String category, Set<String> projectContraptionIdList) {
         JgUseRegistration jgUseRegistration = jgUseRegistrationMapper.selectOne(new QueryWrapper<JgUseRegistration>().lambda()
                 .eq(JgUseRegistration::getSequenceNbr, useRegistrationSeqs.get(0)).eq(JgUseRegistration::getIsDelete, false));
-        List<CompletableFuture<byte[]>> futures = getExportSummaryBasicInfoData(useRegistrationSeqs, category, "", Boolean.FALSE, projectContraptionIdList);
+        List<CompletableFuture<byte[]>> futures = getExportSummaryBasicInfoData(useRegistrationSeqs, category, "", projectContraptionIdList);
         if ("8300".equals(category) || "8200".equals(category) || "8100".equals(category)) {
             // 文件名前缀
             String filePrefix = "压力管道基本信息汇总表_";

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgProjectContraptionMapper.java

@@ -86,10 +86,10 @@ public interface IdxBizJgProjectContraptionMapper extends BaseMapper<IdxBizJgPro
     List<Map<String, Object>> selectEquipListPage(@Param("sequenceNbr") String sequenceNbr, @Param("current") int current, @Param("size") int size);
 
     /**
-     * 获取导出传输/公共管道的信息
+     * 获取指定装置下的管道信息-不包已报废的管道
      *
-     * @param sequenceNbr
-     * @return
+     * @param sequenceNbr  装置id
+     * @return 装置下非报废状态的管道
      */
     List<Map<String, Object>> selectEquipListByExport(@Param("sequenceNbr") String sequenceNbr);
 

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

@@ -82,7 +82,7 @@
                  LEFT JOIN idx_biz_jg_tech_params_pipeline ibjtpp ON ibjui.RECORD = ibjtpp.RECORD
                  LEFT JOIN idx_biz_jg_design_info ibjdi ON ibjui.RECORD = ibjdi.RECORD
         WHERE ibjui.project_contraption_id = #{sequenceNbr}
-        ORDER BY ibjtpp.REC_DATE ASC
+            ORDER BY ibjtpp.REC_DATE ASC
     </select>
 
     <resultMap id="projectContraptionResultMap" type="java.util.Map">
@@ -373,7 +373,9 @@
         FROM idx_biz_jg_use_info ibjui
         LEFT JOIN idx_biz_jg_tech_params_pipeline ibjtpp ON ibjui.RECORD = ibjtpp.RECORD
         LEFT JOIN idx_biz_jg_design_info ibjdi ON ibjui.RECORD = ibjdi.RECORD
-        WHERE ibjui.project_contraption_id = #{sequenceNbr}
+        WHERE
+            ibjui.project_contraption_id = #{sequenceNbr}
+            and (ibjui."EQU_STATE" is null or  ibjui."EQU_STATE" <![CDATA[ <> ]]> '3')
         ORDER BY ibjtpp.REC_DATE ASC
     </select>