diff --git a/src/main/java/com/lz/modules/flow/service/FlowService.java b/src/main/java/com/lz/modules/flow/service/FlowService.java index 80a5a1f0..f01cc681 100644 --- a/src/main/java/com/lz/modules/flow/service/FlowService.java +++ b/src/main/java/com/lz/modules/flow/service/FlowService.java @@ -2,6 +2,7 @@ package com.lz.modules.flow.service; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.modules.flow.entity.Flow; +import com.lz.modules.flow.entity.FlowChart; import java.util.List; @@ -33,4 +34,6 @@ public interface FlowService extends IService { List selectByFlowId(Long flowId); + + FlowChart selectFlowChartByChartId(Long flowId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowServiceImpl.java index fe6a4aec..57c36e07 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowServiceImpl.java @@ -3,6 +3,8 @@ package com.lz.modules.flow.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lz.modules.flow.dao.FlowMapper; import com.lz.modules.flow.entity.Flow; +import com.lz.modules.flow.entity.FlowChart; +import com.lz.modules.flow.service.FlowChartService; import com.lz.modules.flow.service.FlowService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,6 +28,9 @@ public class FlowServiceImpl extends ServiceImpl implements Fl private FlowMapper flowMapper; + @Autowired + private FlowChartService flowChartService; + @Override public Flow selectFlowById(Long id){ @@ -65,5 +70,12 @@ public class FlowServiceImpl extends ServiceImpl implements Fl return flowMapper.selectByFlowId(flowId); } + @Override + public FlowChart selectFlowChartByChartId(Long flowId) { + Flow flow = flowMapper.selectFlowById(flowId); + FlowChart flowChart = flowChartService.selectFlowChartById(flow.getChartId()); + return flowChart; + } + } diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 7fb4fd37..9e6c23b0 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -121,6 +121,9 @@ public class ResultRecordServiceImpl extends ServiceImpl