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

Compare commits

base: sxyanzhu:c067dacc847bff6c23a346fd013b12faec3f879c
Branches Tags
sxyanzhu:dev_caq
sxyanzhu:dev
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release
..
compare: sxyanzhu:26316752c134ea6050e47d4ef097baa8b53f7b5a
Branches Tags
sxyanzhu:dev_caq
sxyanzhu:dev
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release

No commits in common. "c067dacc847bff6c23a346fd013b12faec3f879c" and "26316752c134ea6050e47d4ef097baa8b53f7b5a" have entirely different histories.
c067dacc84 ... 26316752c1

4 changed files with 5 additions and 5 deletions
Show Stats 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,String proType); public List<FlowTaskEntity> groupByProject(long deptId);
/** /**
* 根据条件查询安全类作业工作流列表 * 根据条件查询安全类作业工作流列表

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,String proType) { public List<FlowTaskEntity> groupByProject(long deptId) {
return flowBusinessKeyMapper.groupByProject(deptId,proType); return flowBusinessKeyMapper.groupByProject(deptId);
} }
/** /**

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(@Param("deptId")long deptId,@Param("proType")String proType); public List<FlowTaskEntity> groupByProject(long deptId);
/** /**
* 根据条件查询安全类作业工作流列表 * 根据条件查询安全类作业工作流列表

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,where.getProType()); List<FlowTaskEntity> list=flowBusinessKeyService.groupByProject(deptId);
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);
} }