From 46fb684ba924ada80ed9c0a57ef7151efe432149 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 13 十二月 2023 15:44:33 +0800
Subject: [PATCH] 修改

---
 zt/core/src/main/resources/mapper/workflow/WfRunTaskDao.xml |   58 +++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/zt/core/src/main/resources/mapper/workflow/WfRunTaskDao.xml b/zt/core/src/main/resources/mapper/workflow/WfRunTaskDao.xml
index eb8eaf6..646b8a1 100644
--- a/zt/core/src/main/resources/mapper/workflow/WfRunTaskDao.xml
+++ b/zt/core/src/main/resources/mapper/workflow/WfRunTaskDao.xml
@@ -4,17 +4,17 @@
 <mapper namespace="com.zt.modules.workflow.dao.WfRunTaskDao">
     <select id="getTaskUser" resultType="com.zt.core.sys.model.SysUser">
         SELECT
-        b.user_id as id
+         b. id
         ,b.dept_id
-        ,b.user_name as username
-        ,b.nick_name as real_name
-        ,b.phonenumber as MOBILE
+        ,b.username
+        ,b.real_name
+        ,b.MOBILE
         FROM
         SYS_USER b
         WHERE
-        del_flag = 0
+        is_delete = 0
         <if test="roleId!=null and roleId!=''">
-            AND USER_ID IN(
+            AND ID IN(
             SELECT
             USER_ID
             FROM
@@ -34,11 +34,11 @@
         <if test="deptIds!=null and deptIds!=''">
             AND dept_ID IN(
             SELECT
-            dept_id
+            id
             FROM
             SYS_DEPT
             WHERE
-            CONCAT( ',', #{deptIds}, ',' ) LIKE CONCAT( '%,', dept_id, ',%' )
+            CONCAT( ',', #{deptIds}, ',' ) LIKE CONCAT( '%,', id, ',%' )
             )
         </if>
 
@@ -48,14 +48,14 @@
     </select>
 
     <select id="getAssignUser" resultType="com.zt.core.sys.model.SysUser">
-        SELECT b.user_id     as id
+        SELECT b.id
              , b.dept_id
-             , b.user_name   as username
-             , b.nick_name   as real_name
-             , b.phonenumber as MOBILE
+             , b.username
+             , b.real_name
+             , b.MOBILE
         FROM SYS_USER b
-        WHERE del_flag = 0
-          and user_id in (
+        WHERE is_delete = 0
+          and id in (
             SELECT USER_ID
             FROM SY_PROJECT_EXPERT
             WHERE biz_ID = #{bizId}
@@ -66,14 +66,14 @@
     </select>
 
     <select id="getUserById" resultType="com.zt.core.sys.model.SysUser">
-        SELECT b.user_id     as id
+        SELECT b.id
              , b.dept_id
-             , b.user_name   as username
-             , b.nick_name   as real_name
-             , b.phonenumber as MOBILE
+             , b.username
+             , b.real_name
+             , b.MOBILE
         FROM SYS_USER b
-        WHERE del_flag = 0
-          and user_id = #{userId}
+        WHERE is_delete = 0
+          and id = #{userId}
         limit 1
     </select>
 
@@ -206,7 +206,7 @@
           , a.UPDATE_DATE = CURRENT_TIMESTAMP
         WHERE a.IS_DELETE = 0
           AND a.biz_id = #{bizId}
-          AND a.receive_id = b.user_id and b.dept_id = #{receiveDeptId}
+          AND a.receive_id = b.id and b.dept_id = #{receiveDeptId}
           AND a.status in (0,1)
     </update>
 
@@ -609,6 +609,22 @@
             AND `STATUS` = 0
             LIMIT 0,1
     </select>
+    <select id="getRunFlow" resultType="com.zt.common.entity.FlowInfo">
+        select * from (
+                          select distinct(a.biz_id) biz_id, a.STEP_MARKER,b.STEP_NO
+                          from wf_run_task a
+                             ,wf_def_step b
+                          where a.STEP_ID = b.id and a.FLOW_CODE ='${flowCode}'
+                            <if test="bizIds != null">
+                                and a.BIZ_ID in
+                                <foreach item="item" collection="bizIds" open="(" separator="," close=")">
+                                    #{item}
+                                </foreach>
+                            </if>
+                          order by STEP_NO desc
+                      ) c
+        group by biz_id
+    </select>
 
     <update id="updateConnect">
         update `wf_run_task`

--
Gitblit v1.9.1