diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowBusinessKeyService.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowBusinessKeyService.java index e7d1cec1..ea9403be 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowBusinessKeyService.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowBusinessKeyService.java @@ -88,7 +88,7 @@ public interface IFlowBusinessKeyService { public List groupByUnitFinish(FlowTaskEntity where); - public List groupByProject(long deptId); + public List groupByProject(long deptId,String proType); /** * 根据条件查询安全类作业工作流列表 diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowBusinessKeyServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowBusinessKeyServiceImpl.java index 4d06726e..afd4efa3 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowBusinessKeyServiceImpl.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowBusinessKeyServiceImpl.java @@ -159,8 +159,8 @@ public class FlowBusinessKeyServiceImpl implements IFlowBusinessKeyService { } @Override - public List groupByProject(long deptId) { - return flowBusinessKeyMapper.groupByProject(deptId); + public List groupByProject(long deptId,String proType) { + return flowBusinessKeyMapper.groupByProject(deptId,proType); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FlowBusinessKeyMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FlowBusinessKeyMapper.java index 28d18dc5..f7694429 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FlowBusinessKeyMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FlowBusinessKeyMapper.java @@ -80,7 +80,7 @@ public interface FlowBusinessKeyMapper { public List groupByUnitFinish(FlowTaskEntity where); - public List groupByProject(long deptId); + public List groupByProject(@Param("deptId")long deptId,@Param("proType")String proType); /** * 根据条件查询安全类作业工作流列表 diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/FloweController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/FloweController.java index 3d5e0d59..f879b356 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/FloweController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/FloweController.java @@ -186,7 +186,7 @@ public class FloweController extends BaseController { if(obj!=null){ return success(obj); } - List list=flowBusinessKeyService.groupByProject(deptId); + List list=flowBusinessKeyService.groupByProject(deptId,where.getProType()); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return success(list); }