sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xds
姜玉琦 2024-04-07 21:38:37 +08:00
parent e9c16e7964
commit 172adad75a
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowBusinessKeyService.java
View File

@ -88,7 +88,7 @@ public interface IFlowBusinessKeyService {
public List<FlowTaskEntity> groupByUnitFinish(FlowTaskEntity where); public List<FlowTaskEntity> groupByUnitFinish(FlowTaskEntity where);
public List<FlowTaskEntity> groupByProject(long deptId); public List<FlowTaskEntity> groupByProject(long deptId,String proType);
/** /**
* 根据条件查询安全类作业工作流列表 * 根据条件查询安全类作业工作流列表

4
ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowBusinessKeyServiceImpl.java
View File

@ -159,8 +159,8 @@ public class FlowBusinessKeyServiceImpl implements IFlowBusinessKeyService {
} }
@Override @Override
public List<FlowTaskEntity> groupByProject(long deptId) { public List<FlowTaskEntity> groupByProject(long deptId,String proType) {
return flowBusinessKeyMapper.groupByProject(deptId); return flowBusinessKeyMapper.groupByProject(deptId,proType);
} }
/** /**

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/FlowBusinessKeyMapper.java
View File

@ -80,7 +80,7 @@ public interface FlowBusinessKeyMapper {
public List<FlowTaskEntity> groupByUnitFinish(FlowTaskEntity where); public List<FlowTaskEntity> groupByUnitFinish(FlowTaskEntity where);
public List<FlowTaskEntity> groupByProject(long deptId); public List<FlowTaskEntity> groupByProject(@Param("deptId")long deptId,@Param("proType")String proType);
/** /**
* 根据条件查询安全类作业工作流列表 * 根据条件查询安全类作业工作流列表

2
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/FloweController.java
View File

@ -186,7 +186,7 @@ public class FloweController extends BaseController {
if(obj!=null){ if(obj!=null){
return success(obj); return success(obj);
} }
List<FlowTaskEntity> list=flowBusinessKeyService.groupByProject(deptId); List<FlowTaskEntity> list=flowBusinessKeyService.groupByProject(deptId,where.getProType());
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return success(list); return success(list);
} }