diff --git a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java index 01c074e6..6087630f 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java @@ -109,4 +109,6 @@ public interface FlowRecordMapper extends BaseMapper { List selectFlowRecordByRecordIdsFlowProcess(@Param("recordIds") List recordIds, @Param("flowProcess") Long flowProcess); List selectFlowRecordByRecordIdsStatus(@Param("recordIds") List recordIds, @Param("status") int status); + + List selectFlowRecordByRecordIdsFlowProcessAndStatus(List recordIds, Long flowProcess, int status); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/FlowRecordService.java b/src/main/java/com/lz/modules/flow/service/FlowRecordService.java index f086d980..c0edc4ea 100644 --- a/src/main/java/com/lz/modules/flow/service/FlowRecordService.java +++ b/src/main/java/com/lz/modules/flow/service/FlowRecordService.java @@ -105,4 +105,6 @@ public interface FlowRecordService extends IService { List selectFlowRecordByRecordIdsFlowProcess(List recordIds, Long flowProcess); List selectFlowRecordByRecordIdsStatus(List recordIds, int status); + + List selectFlowRecordByRecordIdsFlowProcessAndStatus(List recordIds, Long flowProcess, int status); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java index 27b65695..ab37072a 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java @@ -276,4 +276,9 @@ public class FlowRecordServiceImpl extends ServiceImpl selectFlowRecordByRecordIdsFlowProcessAndStatus(List recordIds, Long flowProcess, int status){ + return flowRecordMapper.selectFlowRecordByRecordIdsFlowProcessAndStatus(recordIds, flowProcess, status); + } + } diff --git a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java index c4a1f024..e7a2985f 100644 --- a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java +++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java @@ -301,7 +301,7 @@ public class AssessManagerController extends AbstractController{ log.info("催当前节点的人员,数量{}", flowRecords.size()); }else{ flowRecords = - flowRecordService.selectFlowRecordByRecordIdsFlowProcess(recordIds, flowProcess); + flowRecordService.selectFlowRecordByRecordIdsFlowProcessAndStatus(recordIds, flowProcess, 2); log.info("催指定节点的人员,数量{}", flowRecords.size()); } diff --git a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java index e85918b2..fd0eafc5 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java @@ -377,7 +377,9 @@ public class ChartResultServiceImpl implements ChartResultService { return Collections.EMPTY_LIST; } log.info("selectChartDetailList 管理部门:" + JSON.toJSONString(mandepartmentIds)); - mandepartmentIds.retainAll(allDeparmentIds); + if(CollectionUtils.isNotEmpty(allDeparmentIds)){ + mandepartmentIds.retainAll(allDeparmentIds); + } if(mandepartmentIds.size()==0){ return Collections.EMPTY_LIST; } diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml index de5d20ee..7b712407 100644 --- a/src/main/resources/mapper/flow/FlowRecordMapper.xml +++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml @@ -384,5 +384,15 @@ + +