diff --git a/capability/src/main/java/com/sdm/capability/service/impl/FlowServiceImpl.java b/capability/src/main/java/com/sdm/capability/service/impl/FlowServiceImpl.java index ab1fd8b9..db8ea8ed 100644 --- a/capability/src/main/java/com/sdm/capability/service/impl/FlowServiceImpl.java +++ b/capability/src/main/java/com/sdm/capability/service/impl/FlowServiceImpl.java @@ -346,7 +346,7 @@ public class FlowServiceImpl extends BaseService implements IFlowService { } for(SimulationFlowTemplate flowTemplate : queryTemplate) { - SdmResponse bindResponse = simuluationTaskPoolFeignClient.getFlowTemplateBindTaskRelate(flowTemplate.templateCode); + SdmResponse bindResponse = simuluationTaskPoolFeignClient.getFlowTemplateBindTaskRelate(flowTemplate.templateCode, 0); if(bindResponse.isSuccess()) { List flowBindTaskPoolItems = (List)bindResponse.getData(); diff --git a/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java b/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java index c0ceac00..a334d392 100644 --- a/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java +++ b/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java @@ -302,7 +302,7 @@ public class SimulationReportTemplateServiceImpl extends ServiceImpl flowBindTaskPoolItems = (List)bindResponse.getData(); diff --git a/common/src/main/java/com/sdm/common/feign/impl/task/SimuluationTaskPoolFeignClientImpl.java b/common/src/main/java/com/sdm/common/feign/impl/task/SimuluationTaskPoolFeignClientImpl.java index a17eb755..d43d2c93 100644 --- a/common/src/main/java/com/sdm/common/feign/impl/task/SimuluationTaskPoolFeignClientImpl.java +++ b/common/src/main/java/com/sdm/common/feign/impl/task/SimuluationTaskPoolFeignClientImpl.java @@ -55,10 +55,10 @@ public class SimuluationTaskPoolFeignClientImpl implements ISimuluationTaskPoolF } @Override - public SdmResponse> getFlowTemplateBindTaskRelate(String flowCode) { + public SdmResponse> getFlowTemplateBindTaskRelate(String flowCode, int type) { SdmResponse response; try { - response = simuluationTaskPoolFeignClient.getFlowTemplateBindTaskRelate(flowCode); + response = simuluationTaskPoolFeignClient.getFlowTemplateBindTaskRelate(flowCode, type); if (!response.isSuccess()) { response = SdmResponse.failed("获取流程模版与分析项的绑定关系失败"); } diff --git a/common/src/main/java/com/sdm/common/feign/inter/task/ISimuluationTaskPoolFeignClient.java b/common/src/main/java/com/sdm/common/feign/inter/task/ISimuluationTaskPoolFeignClient.java index 2f0350ef..bafd7bef 100644 --- a/common/src/main/java/com/sdm/common/feign/inter/task/ISimuluationTaskPoolFeignClient.java +++ b/common/src/main/java/com/sdm/common/feign/inter/task/ISimuluationTaskPoolFeignClient.java @@ -26,7 +26,7 @@ public interface ISimuluationTaskPoolFeignClient { @GetMapping(value = "/taskpool/getFlowTaskRelate") - SdmResponse> getFlowTemplateBindTaskRelate(@RequestParam("flowCode")String flowCode); + SdmResponse> getFlowTemplateBindTaskRelate(@RequestParam("flowCode")String flowCode, @RequestParam(value = "type", required = false) int type); @GetMapping(value = "/taskpool/getTaskPoolTaskMap") @ResponseBody diff --git a/task/src/main/java/com/sdm/task/controller/SimuluationTaskPoolController.java b/task/src/main/java/com/sdm/task/controller/SimuluationTaskPoolController.java index 97d83646..38bcc3a0 100644 --- a/task/src/main/java/com/sdm/task/controller/SimuluationTaskPoolController.java +++ b/task/src/main/java/com/sdm/task/controller/SimuluationTaskPoolController.java @@ -12,6 +12,8 @@ import com.sdm.task.model.entity.TaskPoolUpdateBean; import com.sdm.task.model.req.ExportTaskPoolReq; import com.sdm.task.service.ISimulationTaskPoolService; import jakarta.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -140,9 +142,9 @@ public class SimuluationTaskPoolController implements ISimuluationTaskPoolFeignC } @GetMapping(value = "/getFlowTaskRelate") - public SdmResponse> getFlowTemplateBindTaskRelate(@RequestParam("flowCode")String flowCode) + public SdmResponse> getFlowTemplateBindTaskRelate(@RequestParam("flowCode")String flowCode, @RequestParam(value = "type", required = false) int type) { - return service.getTaskAndFlowTemplateRelateByFlowCode(flowCode,0); + return service.getTaskAndFlowTemplateRelateByFlowCode(flowCode, ObjectUtils.isNotEmpty(type) ? type : 0); } @GetMapping(value = "statisticDisciplineConfidence")