From 53bb1fbc34fc91e57113d825b46ee80edb8b1f09 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Fri, 10 Nov 2023 22:01:29 +0800
Subject: [PATCH] update code

---
 .../com/ruoyi/flowable/service/IFlowBusinessKeyService.java   | 2 +-
 .../flowable/service/impl/FlowBusinessKeyServiceImpl.java     | 4 ++--
 .../java/com/ruoyi/system/mapper/FlowBusinessKeyMapper.java   | 2 +-
 .../main/resources/mapper/flowable/FlowBusinessKeyMapper.xml  | 3 ++-
 .../yanzhu/jh/bigscreen/web/controller/FloweController.java   | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

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 372b552a..6ce8d1e8 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
@@ -65,5 +65,5 @@ public interface IFlowBusinessKeyService {
 
     public List<FlowTaskEntity> groupByUnitFinish(FlowTaskEntity where);
 
-    public List<FlowTaskEntity> groupByProject();
+    public List<FlowTaskEntity> groupByProject(long deptId);
 }
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 67ea4ce4..54300e04 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
@@ -130,7 +130,7 @@ public class FlowBusinessKeyServiceImpl implements IFlowBusinessKeyService {
     }
 
     @Override
-    public List<FlowTaskEntity> groupByProject() {
-        return flowBusinessKeyMapper.groupByProject();
+    public List<FlowTaskEntity> groupByProject(long deptId) {
+        return flowBusinessKeyMapper.groupByProject(deptId);
     }
 }
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 19a28e81..65491246 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
@@ -57,5 +57,5 @@ public interface FlowBusinessKeyMapper {
 
     public List<FlowTaskEntity> groupByUnitFinish(FlowTaskEntity where);
 
-    public List<FlowTaskEntity> groupByProject();
+    public List<FlowTaskEntity> groupByProject(long deptId);
 }
diff --git a/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml b/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
index 7d7bb73c..d791e2c5 100644
--- a/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
@@ -334,9 +334,10 @@
         </where>
     </select>
 
-    <select id="groupByProject" resultType="com.ruoyi.system.domain.FlowTaskEntity">
+    <select id="groupByProject" resultType="com.ruoyi.system.domain.FlowTaskEntity" parameterType="long">
         SELECT a.businessKey,a.cnt duration ,b.projectName businessKeyName FROM (
         SELECT businessKey,COUNT(1) cnt FROM vw_flow_all  WHERE taskName!='提交申请'
+        <if test="deptId !=null and deptId>0">and businessDeptId=#{deptId}</if>
         GROUP BY businessKey ) a,sur_project b WHERE a.businessKey=b.id
         ORDER BY a.cnt DESC
 
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 6de2468b..256c24c6 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
@@ -133,8 +133,8 @@ public class FloweController extends BaseController {
     }
 
     @GetMapping("/groupByProject")
-    public AjaxResult groupByProject(){
-        List<FlowTaskEntity> list=flowBusinessKeyService.groupByProject();
+    public AjaxResult groupByProject(long deptId){
+        List<FlowTaskEntity> list=flowBusinessKeyService.groupByProject(deptId);
         return AjaxResult.success(list);
     }