新增：添加分析结果报告结果，查询接口

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/analysis/AnalysisDetailVo.java

@@ -44,9 +44,4 @@ public class AnalysisDetailVo {
      */
     private List<AnalysisCommentDescriptionVo> commentDescriptionVos;
 
-    /**
-     * 分析结果报告
-     */
-    private List<AnalysisResultReportVo> reportVos;
-
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/analysis/AnalysisResultVo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import javax.persistence.Table;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 分析结果
@@ -89,4 +90,9 @@ public class AnalysisResultVo {
      */
     private Integer onOffCall;
 
+    /**
+     * 分析结果报告
+     */
+    private List<AnalysisResultReportVo> reportVos;
+
 }

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

@@ -146,7 +146,9 @@ public class AnalysisServiceImpl implements AnalysisService {
      */
     @Override
     public List<AnalysisResultVo> analysisResultList(AnalysisResultDto analysisResultDto) {
-        return analysisResultMapper.selectByCondition(analysisResultDto);
+        List<AnalysisResultVo> resultVos = analysisResultMapper.selectByCondition(analysisResultDto);
+        resultVos.stream().forEach(item -> item.setReportVos(resultReportMapper.selectByBatchCode(item.getBatchCode())));
+        return resultVos;
     }
 
     /**
@@ -256,16 +258,13 @@ public class AnalysisServiceImpl implements AnalysisService {
         List<AnalysisDiagramRelationVo> newDiagramRelationVos = getNewDiagramRelations(batchCode, analysisTypeCode, fieldEngineCode,isIntranet);
         //查询评论
         List<AnalysisCommentDescriptionVo> commentDescriptionVos = commentDescriptionMapper.selecByBatchCodeAndAnalysisTypeCode(batchCode,analysisTypeCode);
-        //查询分析报告
-        List<AnalysisResultReportVo> reportVos = resultReportMapper.selectByBatchCode(batchCode);
         //根据分析类型设置分析结果
         analysisTypeVos.forEach(analysisTypeVo -> {
             //设置相应参数
             AnalysisDetailVo analysisDetailVo = getAnalysisDetailVo(analysisTypeVo,
                                                                     newGeneralFileVos,
                                                                     newDiagramRelationVos,
-                                                                    commentDescriptionVos,
-                                                                    reportVos);
+                                                                    commentDescriptionVos);
             if(analysisDetailVo != null){
                 analysisDetailVos.add(analysisDetailVo);
             }
@@ -626,8 +625,7 @@ public class AnalysisServiceImpl implements AnalysisService {
     private AnalysisDetailVo getAnalysisDetailVo(AnalysisTypeVo analysisTypeVo,
                                                  List<AnalysisGeneralFileVo> newGeneralFileVos,
                                                  List<AnalysisDiagramRelationVo> newDiagramRelationVos,
-                                                 List<AnalysisCommentDescriptionVo> commentDescriptionVos,
-                                                 List<AnalysisResultReportVo> reportVos){
+                                                 List<AnalysisCommentDescriptionVo> commentDescriptionVos){
         List<AnalysisGeneralFileVo> generalFileVos = null;
         if(CollectionUtils.isNotEmpty(newGeneralFileVos)) {
             generalFileVos = newGeneralFileVos.stream().filter(analysisGeneralFileVo -> analysisGeneralFileVo.getAnalysisTypeCode().equals(analysisTypeVo.getTypeCode())).collect(Collectors.toList());
@@ -644,8 +642,7 @@ public class AnalysisServiceImpl implements AnalysisService {
                 .setAnalysisTypeName(analysisTypeVo.getTypeName())
                 .setGeneralFiles(generalFileVos)
                 .setDiagramRelations(diagramRelationVos)
-                .setCommentDescriptionVos(commentDescriptionVos)
-                .setReportVos(reportVos);
+                .setCommentDescriptionVos(commentDescriptionVos);
     }
 
     /**