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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -147,4 +148,7 @@ public class JgUseRegistrationManageDto extends BaseDto {
 
     @ApiModelProperty("使用单位seq")
     private String useUnitSeq;
+
+    @ApiModelProperty("证书是否打印标记")
+    private JSONObject certificatePrintTag;
 }

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

 package com.yeejoin.amos.boot.module.jg.api.entity;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -240,4 +241,10 @@ public class JgUseRegistrationManage extends BaseEntity {
      */
     @TableField("is_do_business")
     private String isDoBusiness;
+
+    /**
+     * 证书是否打印标记
+     */
+    @TableField("certificate_print_tag")
+    private JSONObject certificatePrintTag;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationController.java

@@ -226,7 +226,7 @@ public class JgUseRegistrationController extends BaseController {
     public void exportSummaryBasicInfo(HttpServletResponse response,
                                        @RequestParam("sequenceNbr") String sequenceNbr,
                                        @RequestParam("category") String category) {
-        jgUseRegistrationServiceImpl.exportSummaryBasicInfo(Collections.singletonList(Long.valueOf(sequenceNbr)), response, category);
+        jgUseRegistrationServiceImpl.exportSummaryBasicInfo(Collections.singletonList(Long.valueOf(sequenceNbr)), response, category, null);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -710,7 +710,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);
+            List<CompletableFuture<byte[]>> exportSummaryBasicInfoData = jgUseRegistrationService.getExportSummaryBasicInfoData(Collections.singletonList(Long.valueOf(sequenceNbr)), jgInstallationNotice.getEquCategoryCode(), "安装告知", Boolean.TRUE, 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

@@ -1167,7 +1167,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 boolean isFirstMerge = jgProjectContraption.getIsFirstMerge();
                 mapData.put("isFirstMerge", isFirstMerge);
                 // 装置表写入使用登记证编号、将装置名称写入到使用登记表
-                updateRegAndProjectContraption(jgUseRegistration, mapData, jgProjectContraption);
+                this.updateRegAndProjectContraption(jgUseRegistration, mapData, jgProjectContraption);
                 // 首次合并 + 特殊登记，给工程装置生成设备代码和监管码
                 if (isFirstMerge || "2".equals(jgUseRegistration.getRegType())) {
                     Map<String, Object> createCodeMap = new HashMap<>();
@@ -2556,13 +2556,52 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     /**
+     * 获取装置下的管道信息（根据整个记录去重）
+     *
+     * @param projectContraptionList 装置 ID 列表
+     * @return 去重后的管道信息 JSON 数组
+     */
+    public List<Map<String, Object>> queryPipelineList(Set<String> projectContraptionList) {
+        if (CollectionUtils.isEmpty(projectContraptionList)) {
+            return Collections.emptyList();
+        }
+        Set<String> result = new HashSet<>();
+        return projectContraptionList.stream()
+                .filter(Objects::nonNull)
+                .map(jgProjectContraptionService.getBaseMapper()::selectEquipList)
+                .filter(Objects::nonNull)
+                .flatMap(List::stream)
+                .peek(map -> map.put("productName", map.get("pipeName")))
+                .filter(map -> result.add(JSONObject.toJSONString(map)))
+                .collect(Collectors.toList());
+    }
+
+    public List<Map<String, Object>> getEquipInfoList(List<Long> useRegistrationSeqs, String category, Set<String> projectContraptionIdList) {
+        LambdaQueryWrapper<JgUseRegistrationEq> lambda = new QueryWrapper<JgUseRegistrationEq>().lambda();
+        lambda.in(JgUseRegistrationEq::getEquipTransferId, useRegistrationSeqs);
+        lambda.select(JgUseRegistrationEq::getEquId);
+        List<JgUseRegistrationEq> eqs = jgUseRegistrationEqService.getBaseMapper().selectList(lambda);
+        List<String> records = eqs.stream().map(JgUseRegistrationEq::getEquId).collect(toList());
+        if (!"2300".equals(category)) {
+            return this.queryPipelineList(projectContraptionIdList);
+        } else {
+            List<DictionarieValueModel> fillingMedium = Systemctl.dictionarieClient.dictValues("FILLING_MEDIUM").getResult();
+            Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataValue));
+            List<Map<String, Object>> tableData = jgUseRegistrationMapper.queryForUnitVesselEquipment(records);
+            tableData.forEach(i -> i.put("chargingMedium", fillingMediumMap.get(i.get("chargingMedium"))));
+            return tableData;
+        }
+    }
+
+    /**
      * 获取导出基本信息数据
      * @param useRegistrationSeqs
      * @param category
      * @param whetherToFilterStatus 是否过滤设备状态 是：true（过滤设备状态为在用），否：false（所有的）
      * @return
      */
-    public List<CompletableFuture<byte[]>> getExportSummaryBasicInfoData(List<Long> useRegistrationSeqs, String category, String type, Boolean whetherToFilterStatus) {
+    public List<CompletableFuture<byte[]>> getExportSummaryBasicInfoData(List<Long> useRegistrationSeqs, String category, String type,
+                                                                         Boolean whetherToFilterStatus, Set<String> projectContraptionIdList) {
         List<CompletableFuture<byte[]>> futureList = new ArrayList<>();
         // 总数
         double total;
@@ -2575,26 +2614,38 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             throw new BadRequest("没有查询到汇总信息！");
         }
         JSONArray allEquipment = new JSONArray();
-        // 用Set存储已添加的equCode，防止重复添加
         Set<String> addedEquCodes = new HashSet<>();
-        registrationHistoryList.forEach(historyList -> {
-            JSONObject jsonObject = JSONObject.parseObject(historyList.getChangeData());
-            JSONArray equipmentLists = "安装告知".equals(type)
-                    ? (JSONArray) jsonObject.get("deviceList")
-                    : (JSONArray) jsonObject.get("equipmentLists");
-
-            final String useDateValue = jsonObject.getString("useDate");
-            if (CollectionUtils.isNotEmpty(equipmentLists)) {
-                equipmentLists.stream()
-                        .map(obj -> (JSONObject) obj)
-                        .filter(equipmentItem -> whetherToFilterStatus || this.checkEquStatusInUse(equipmentItem.getString("record")))
-                        .forEach(item -> {
-                            item.put("useDate", timeToMonths(useDateValue));
+
+        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");
+                    if ((whetherToFilterStatus || this.checkEquStatusInUse(record))) {
+                        allEquipment.add(new JSONObject(map));
+                    }
+                });
+            }
+        } else {
+            registrationHistoryList.forEach(history -> {
+                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)) {
+                    deviceList.forEach(map -> {
+                        JSONObject item = new JSONObject(map);
+                        String equCode = item.getString("equCode");
+                        String record = item.getString("record");
+                        if ((whetherToFilterStatus || this.checkEquStatusInUse(record)) && addedEquCodes.add(equCode)) {
+                            item.put("useDate", timeToMonths(useDate));
                             allEquipment.add(item);
-                            addedEquCodes.add(item.getString("equCode"));
+                        }
                     });
                 }
             });
+        }
+
         total = allEquipment.size();
         AgencyUserModel result = new AgencyUserModel();
         // 暂时拿第一条的 监管部门和安全管理人员
@@ -2661,10 +2712,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      * @param useRegistrationSeqs
      * @param response
      */
-    public void exportSummaryBasicInfo(List<Long> useRegistrationSeqs, HttpServletResponse response, String category) {
+    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);
+        List<CompletableFuture<byte[]>> futures = getExportSummaryBasicInfoData(useRegistrationSeqs, category, "", Boolean.FALSE, projectContraptionIdList);
         if ("8300".equals(category) || "8200".equals(category) || "8100".equals(category)) {
             // 文件名前缀
             String filePrefix = "压力管道基本信息汇总表_";
@@ -2680,7 +2731,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // byte[]压缩zip
             toZipFile(response, futures, filePrefix, customFileName);
         }
-
     }
 
     /**