修改分析详情接口

energy-manage-service/src/main/java/com/energy/manage/service/service/analysis/impl/AnalysisServiceImpl.java

@@ -503,7 +503,7 @@ public class AnalysisServiceImpl implements AnalysisService {
             return analysisDetailVos;
         }
         //最新总文件
-        List<AnalysisGeneralFileVo> newGeneralFileVos = getNewGeneralFiles(batchCode,analysisTypeCode,isIntranet);
+        List<AnalysisGeneralFileVo> newGeneralFileVos = getAllGeneralFiles(batchCode,analysisTypeVos,isIntranet);
         //获取最新分文件
         List<AnalysisDiagramRelationVo> newDiagramRelationVos = getNewDiagramRelations(batchCode, analysisTypeCode, fieldEngineCodes,isIntranet);
         //查询评论
@@ -859,6 +859,18 @@ public class AnalysisServiceImpl implements AnalysisService {
 //        return engineGroupVos.parallelStream().collect(Collectors.toMap(WindEngineGroupVo::getEngineCode,WindEngineGroupVo::getEngineName, (k1, k2) -> k1, LinkedHashMap::new));
     }
 
+    /**
+     * 获取所有分析类型总文件
+     * @param batchCode
+     * @param typeVos
+     * @param isIntranet
+     * @return
+     */
+    private List<AnalysisGeneralFileVo> getAllGeneralFiles(String batchCode,List<AnalysisTypeVo> typeVos, boolean isIntranet){
+        List<AnalysisGeneralFileVo> resultList = new ArrayList<>();
+        typeVos.stream().forEach(typeVo -> resultList.addAll(getNewGeneralFiles(batchCode,typeVo.getTypeCode(),isIntranet)));
+        return resultList;
+    }
 
     /**
      * 获取总文件

energy-manage-service/src/main/resources/mybatis/analysis/AnalysisGeneralFileMapper.xml

@@ -24,7 +24,7 @@
         left join analysis_type type
         on type.type_code = general.analysis_type_code
         where general.batch_code = #{batchCode,jdbcType=VARCHAR}
-        <if test="analysisTypeCode!=null and analysisTypeCode!=''">
+        <if test="analysisTypeCode != null and analysisTypeCode != ''">
             and general.analysis_type_code = #{analysisTypeCode,jdbcType=VARCHAR}
         </if>
     </select>