From ec8dab461b0474b567c931b505cd3210f29886fb Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Thu, 28 Dec 2023 23:34:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=B7=A5=E7=A8=8B=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/IFlowBusinessKeyService.java        |  2 ++
 .../impl/FlowBusinessKeyServiceImpl.java        |  5 +++++
 .../system/mapper/FlowBusinessKeyMapper.java    |  1 +
 .../mapper/flowable/FlowBusinessKeyMapper.xml   | 15 ++++++++++++++-
 .../web/controller/FloweController.java         | 17 +++++++++++++++--
 5 files changed, 37 insertions(+), 3 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 d769c8fd..de2dbb05 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
@@ -73,4 +73,6 @@ public interface IFlowBusinessKeyService {
      * @return
      */
     public List<FlowTaskEntity> findSafetyWorkList(FlowTaskEntity flowTaskEntity);
+
+    public List<FlowTaskEntity> listByCategory(FlowTaskEntity where);
 }
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 b232b624..936c6234 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
@@ -143,4 +143,9 @@ public class FlowBusinessKeyServiceImpl implements IFlowBusinessKeyService {
     public List<FlowTaskEntity> findSafetyWorkList(FlowTaskEntity flowTaskEntity) {
         return flowBusinessKeyMapper.findSafetyWorkList(flowTaskEntity);
     }
+
+    @Override
+    public List<FlowTaskEntity> listByCategory(FlowTaskEntity where) {
+        return flowBusinessKeyMapper.listByCategory(where);
+    }
 }
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 aa12fe31..86234b74 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
@@ -66,4 +66,5 @@ public interface FlowBusinessKeyMapper {
      */
     public List<FlowTaskEntity> findSafetyWorkList(FlowTaskEntity flowTaskEntity);
 
+    public List<FlowTaskEntity> listByCategory(FlowTaskEntity where);
 }
diff --git a/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml b/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
index cad55f27..6bfb6014 100644
--- a/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
@@ -297,7 +297,20 @@
         )  a
         GROUP BY cat
     </select>
-
+    <select id="listByCategory"   parameterType="com.ruoyi.system.domain.FlowTaskEntity" resultType="com.ruoyi.system.domain.FlowTaskEntity">
+        SELECT * FROM vw_flow_all
+        <where>
+        <if test="category != null  and category != ''"> and category = #{category}</if>
+        <if test="deptId !=null and deptId>0">and businessDeptId=#{deptId}</if>
+        <if test="projectId !=null and projectId>0">and businessKey=#{projectId}</if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and businessKey in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        </where>
+    </select>
     <select id="listByUnit"   parameterType="com.ruoyi.system.domain.FlowTaskEntity" resultType="com.ruoyi.system.domain.FlowTaskEntity">
         SELECT * FROM vw_flow_all WHERE finishTime IS NULL
         <if test="taskId!=null">
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 c9f02070..4ee95d27 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
@@ -111,16 +111,29 @@ public class FloweController extends BaseController {
 
     @PostMapping("/listByUnit")
     public TableDataInfo listByUnit(@RequestBody FlowTaskEntity where){
-        startPage();
-        List<FlowTaskEntity> list=flowBusinessKeyService.listByUnit(where);
         if(where.getDeptId()<=0){
             if (SecurityUtils.isUserB()) {
                 where.setPrjIds(getProjectIds());
             }
         }
+        startPage();
+        List<FlowTaskEntity> list=flowBusinessKeyService.listByUnit(where);
         return getDataTable(list);
     }
 
+    @PostMapping("/listByCategory")
+    public  TableDataInfo listByCategory(@RequestBody FlowTaskEntity where){
+        if(where.getDeptId()<=0){
+            if (SecurityUtils.isUserB()) {
+                where.setPrjIds(getProjectIds());
+            }
+        }
+        startPage();
+        List<FlowTaskEntity> list=flowBusinessKeyService.listByCategory(where);
+        return getDataTable(list);
+    }
+
+
     @PostMapping("/listByState")
     public TableDataInfo listByState(@RequestBody FlowTaskEntity where){
         startPage();