修复在建项目bug

projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubInfoMapper.xml

@@ -582,7 +582,7 @@
         WHERE
             src.logic_delete_flag = 0
           AND src.kind = '1'
-          AND src.content IS NOT NULL;
+          AND src.content IS NOT NULL
     </select>
     <select id="exportFixCbDetailExcel" resultType="com.rtrh.projects.modules.projects.vo.export.SubInfoFixCbDetail">
         SELECT sub_info.id as id,

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

@@ -199,11 +199,11 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
         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));
+            rptContentMap = rptContList.stream().collect(Collectors.toMap(RptCont::getSubId, RptCont::getContent, (v1, v2) -> v1));
         }
 
         List<TSystable> byKind = tSysTableService.getByKind(SysTableKind.JSDD);
-        Map<String, String> kindMap = byKind.stream().collect(Collectors.toMap(TSystable::getCode, TSystable::getTitle));
+        Map<String, String> kindMap = byKind.stream().collect(Collectors.toMap(TSystable::getCode, TSystable::getTitle, (v1, v2) -> v1));
 
         if (CollectionUtil.isNotEmpty(data)) {
             for (SubInfoGxj e : data) {
@@ -301,7 +301,7 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
         Map<String, Long> abc = list.stream().collect(Collectors.groupingBy(e -> StringUtils.defaultIfBlank(e.getAbc(), NullValueEnum.UNKNOWN_CATEGORY.getCode()), Collectors.counting()));
         // 建设地点统计
         List<TSystable> jsddDict = tSysTableService.getByKind(SysTableKind.JSDD);
-        Map<String, String> jsddNameMap = jsddDict.stream().collect(Collectors.toMap(TSystable::getCode, TSystable::getTitle));
+        Map<String, String> jsddNameMap = jsddDict.stream().collect(Collectors.toMap(TSystable::getCode, TSystable::getTitle, (v1, v2) -> v1));
         Map<String, Long> subject = list.stream().collect(Collectors.groupingBy(e -> StringUtils.defaultIfBlank(e.getSubjectId(), "."), Collectors.counting()));
         List<StatisticsVO.KvNum> jsddList = new ArrayList<>();
         subject.forEach((k, v) -> {
@@ -312,7 +312,7 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
         });
         // 行业统计
         List<SubIndu> hyflDict = subInduService.queryParentAll();
-        Map<String, String> hyflNameMap = hyflDict.stream().collect(Collectors.toMap(SubIndu::getCode, SubIndu::getTitle));
+        Map<String, String> hyflNameMap = hyflDict.stream().collect(Collectors.toMap(SubIndu::getCode, SubIndu::getTitle, (v1, v2) -> v1));
         hyflNameMap.put(NullValueEnum.UNKNOWN_INDUS_KIND.getCode(), NullValueEnum.UNKNOWN_INDUS_KIND.getDesc());
         Map<String, Long> indusKind = list.stream()
                 .collect(Collectors.groupingBy(e -> {