项目4库bug修改

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubInfoQueryServiceImpl.java

@@ -176,9 +176,12 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
         List<SubInfoFixDetailPreNew> preNewList = subInfoMapper.selectSubPreNewBySubIds(ids);
         Map<String, List<SubInfoFixDetailPreNew>> preNewMap = preNewList.stream().collect(Collectors.groupingBy(SubInfoFixDetailPreNew::getSubId));
 
-        // 查询项目 最新月报内容(建设进度)
-        List<RptCont> rptContList = subInfoMapper.selectNewestMonthReport(ids);
-        Map<String, String> rptContentMap = rptContList.stream().collect(Collectors.toMap(RptCont::getSubId, RptCont::getContent));
+        // 在建、投产查询项目 最新月报内容(建设进度)
+        Map<String, String> rptContentMap = new HashMap<>();
+        if (Arrays.asList(SubInfoStatusEnum.ZJ.getCode(), SubInfoStatusEnum.TC.getCode()).contains(queryVO.getStatus())) {
+            List<RptCont> rptContList = subInfoMapper.selectNewestMonthReport(ids);
+            rptContentMap = rptContList.stream().collect(Collectors.toMap(RptCont::getSubId, RptCont::getContent));
+        }
 
         List<TSystable> byKind = tSysTableService.getByKind(SysTableKind.JSDD);
         Map<String, String> kindMap = byKind.stream().collect(Collectors.toMap(TSystable::getCode, TSystable::getTitle));
@@ -202,7 +205,7 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
                     }
                 }
 
-                // 项目前期手续办理情况
+                // 项目前期手续办理情况 [导出]
                 List<SubInfoFixDetailPreNew> subInfoFixDetailPreNewList = preNewMap.get(e.getId());
                 StringBuilder sb = new StringBuilder();
                 if (com.rtrh.common.util.CollectionUtil.isNotEmpty(subInfoFixDetailPreNewList)) {