bug：安装告知打印汇总表

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

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

@@ -2496,9 +2496,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      * 获取导出基本信息数据
      * @param useRegistrationSeqs
      * @param category
+     * @param whetherToFilterStatus 是否过滤设备状态 是：true（过滤设备状态为在用），否：false（所有的）
      * @return
      */
-    public  List<CompletableFuture<byte[]>> getExportSummaryBasicInfoData(List<Long> useRegistrationSeqs, String category,String type){
+    public List<CompletableFuture<byte[]>> getExportSummaryBasicInfoData(List<Long> useRegistrationSeqs, String category, String type, Boolean whetherToFilterStatus) {
         List<CompletableFuture<byte[]>> futureList = new ArrayList<>();
         // 总数
         double total;
@@ -2523,8 +2524,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             if (CollectionUtils.isNotEmpty(equipmentLists)) {
                 equipmentLists.stream()
                         .map(obj -> (JSONObject) obj)
-                        .filter(equipmentItem -> this.checkEquStatusInUse(equipmentItem.getString("record")))
-                        .forEach(item ->{
+                        .filter(equipmentItem -> whetherToFilterStatus || this.checkEquStatusInUse(equipmentItem.getString("record")))
+                        .forEach(item -> {
                             item.put("useDate", timeToMonths(useDateValue));
                             allEquipment.add(item);
                             addedEquCodes.add(item.getString("equCode"));
@@ -2585,10 +2586,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      */
     private boolean checkEquStatusInUse(String record) {
         IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.lambdaQuery().eq(IdxBizJgUseInfo::getRecord, record).one();
-        if (!Objects.isNull(useInfo) && ValidationUtil.isEmpty(useInfo.getEquState())) {
-            return true;
+        if (!Objects.isNull(useInfo) && !ValidationUtil.isEmpty(useInfo.getEquState())) {
+            return EquimentEnum.ZAIYONG.getCode().toString().equals(useInfo.getEquState());
         }
-        return EquimentEnum.ZAIYONG.getCode().toString().equals(useInfo.getEquState());
+        return false;
     }
 
     /**
@@ -2600,7 +2601,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     public void exportSummaryBasicInfo(List<Long> useRegistrationSeqs, HttpServletResponse response, String category) {
         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,"");
+        List<CompletableFuture<byte[]>> futures = getExportSummaryBasicInfoData(useRegistrationSeqs, category, "", Boolean.FALSE);
         if ("8300".equals(category) || "8200".equals(category) || "8100".equals(category)) {
             // 文件名前缀
             String filePrefix = "压力管道基本信息汇总表_";