1、合并代码修复

project/src/main/java/com/sdm/project/controller/SimulationRunController.java

@@ -281,18 +281,6 @@ public class SimulationRunController implements ISimulationRunFeignClient {
         return runService.listQuantities();
     }
 
-    /**
-     * 流程关联报告
-     *
-     * @return
-     */
-    @PostMapping("/flowRelateReport")
-    @Operation(summary = "流程关联报告", description = "流程关联报告")
-    public SdmResponse flowRelateReport(@RequestBody SpdmReportReq req) {
-        return runService.flowRelateReport(req);
-    }
-
-}
     /**
      * 查询单位基表
      * @return

project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java

@@ -54,10 +54,6 @@ public interface SimulationTaskMapper extends BaseMapper<SimulationTask> {
 
     List<SpdmTaskVo> getTaskListByName(@Param("taskNameList") List<String> taskNameList);
 
-    List<SpdmTaskVo> getTaskListByTag(@Param("req") TaskCompleteStatisticsReq req);
-
-    List<SpdmTaskVo> getTaskListByName(@Param("taskNameList") List<String> taskNameList);
-
     List<SpdmTaskVo> getTaskListByDemandId(@Param("demandId") String demandId);
 
 }

project/src/main/java/com/sdm/project/service/ISimulationRunService.java

@@ -80,11 +80,6 @@ public interface ISimulationRunService extends IService<SimulationRun> {
 
     SdmResponse saveNodeParams(SpdmNodeParamReq req);
 
-    SdmResponse<List<FlowNodeDto>> listFlowNodes(SpdmTaskRunReq req);
-
-    SdmResponse flowRelateReport(SpdmReportReq req);
-
-}
     SdmResponse<FlowInfoDto> listFlowNodes(SpdmTaskRunReq req);
 
     SdmResponse flowRelateReport(SpdmReportReq req);
@@ -92,4 +87,5 @@ public interface ISimulationRunService extends IService<SimulationRun> {
     SdmResponse<List<SimulationBaseQuantities>> listQuantities();
 
     SdmResponse<List<SimulationBaseUnits>> listUnits(String quantityType);
+
 }

project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java

@@ -1485,12 +1485,6 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
         }
     }
 
-    @Override
-    public SdmResponse flowRelateReport(SpdmReportReq req) {
-        generateReport(req,null);
-        return SdmResponse.success();
-    }
-
     public static void deleteFolder(File folder) {
         if (folder.isDirectory()) {
             File[] files = folder.listFiles();