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

提交代码

dev_xds
姜玉琦 2024-04-25 23:58:56 +08:00
parent 08d0cc59b8
commit 6eba1c3319
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,6 +216,17 @@ public class FloweController extends BaseController {
return AjaxResult.success(flowBusinessKeyService.selectFormDatasByProcInsId(procInsId)); return AjaxResult.success(flowBusinessKeyService.selectFormDatasByProcInsId(procInsId));
} }
/**
* 根据条件查询劳资预警列表
* JiangYuQi
*/
@PostMapping("/findFlowLabourList")
public TableDataInfo list(FlowLabourInfo flowLabourInfo)
{
List<FlowLabourInfo> list = flowLabourInfoService.selectFlowLabourInfoList(flowLabourInfo);
return getDataTable(list);
}
/** /**
* 根据条件统计劳资预警信息 * 根据条件统计劳资预警信息
* JiangYuQi * JiangYuQi
@ -234,7 +245,9 @@ public class FloweController extends BaseController {
if(obj!=null){ if(obj!=null){
return AjaxResult.success(obj); return AjaxResult.success(obj);
} }
where.setProjectDeptId(deptId<1?"":""+deptId); if(deptId>0){
where.setProjectDeptId(""+deptId);
}
where.setProjectId(projectId<1?null:projectId); where.setProjectId(projectId<1?null:projectId);
Map<String, Object> data = flowLabourInfoService.findFlowLabourGroupCountByApprove(where); Map<String, Object> data = flowLabourInfoService.findFlowLabourGroupCountByApprove(where);
redisCache.setCacheObject(key, data, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); redisCache.setCacheObject(key, data, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);

2
yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/impl/FlowLabourInfoServiceImpl.java
View File

@ -65,7 +65,7 @@ public class FlowLabourInfoServiceImpl implements IFlowLabourInfoService
@Override @Override
public List<FlowLabourInfo> selectFlowLabourInfoList(FlowLabourInfo flowLabourInfo) public List<FlowLabourInfo> selectFlowLabourInfoList(FlowLabourInfo flowLabourInfo)
{ {
if(Convert.toInt(flowLabourInfo.getNowRole())>4){ if(Convert.toInt(flowLabourInfo.getNowRole(),1)>4){
//这里总包只能审批自己单位数据 //这里总包只能审批自己单位数据
flowLabourInfo.setDeptId(Convert.toLong(flowLabourInfo.getNowDept())); flowLabourInfo.setDeptId(Convert.toLong(flowLabourInfo.getNowDept()));
} }