From 6eba1c33197a669365e3991482c5a7e9eb14fb53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Thu, 25 Apr 2024 23:58:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bigscreen/web/controller/FloweController.java | 15 ++++++++++++++- .../service/impl/FlowLabourInfoServiceImpl.java | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) 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 490fba93..27ddac17 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 @@ -216,6 +216,17 @@ public class FloweController extends BaseController { return AjaxResult.success(flowBusinessKeyService.selectFormDatasByProcInsId(procInsId)); } + /** + * 根据条件查询劳资预警列表 + * JiangYuQi + */ + @PostMapping("/findFlowLabourList") + public TableDataInfo list(FlowLabourInfo flowLabourInfo) + { + List list = flowLabourInfoService.selectFlowLabourInfoList(flowLabourInfo); + return getDataTable(list); + } + /** * 根据条件统计劳资预警信息 * JiangYuQi @@ -234,7 +245,9 @@ public class FloweController extends BaseController { if(obj!=null){ return AjaxResult.success(obj); } - where.setProjectDeptId(deptId<1?"":""+deptId); + if(deptId>0){ + where.setProjectDeptId(""+deptId); + } where.setProjectId(projectId<1?null:projectId); Map data = flowLabourInfoService.findFlowLabourGroupCountByApprove(where); redisCache.setCacheObject(key, data, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/impl/FlowLabourInfoServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/impl/FlowLabourInfoServiceImpl.java index 1026b5a2..ca310537 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/impl/FlowLabourInfoServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/flow/service/impl/FlowLabourInfoServiceImpl.java @@ -65,7 +65,7 @@ public class FlowLabourInfoServiceImpl implements IFlowLabourInfoService @Override public List selectFlowLabourInfoList(FlowLabourInfo flowLabourInfo) { - if(Convert.toInt(flowLabourInfo.getNowRole())>4){ + if(Convert.toInt(flowLabourInfo.getNowRole(),1)>4){ //这里总包只能审批自己单位数据 flowLabourInfo.setDeptId(Convert.toLong(flowLabourInfo.getNowDept())); }