当前办理人，单位

src/main/java/com/chinaweal/aiccs/aiccs/business/entity/dto/TaskListUnionDto.java

@@ -2,6 +2,7 @@ package com.chinaweal.aiccs.aiccs.business.entity.dto;
 
 
 import lombok.Data;
+
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -207,4 +208,24 @@ public class TaskListUnionDto implements Serializable{
      * 待办列表类型，ts表示TSTaskList数据，xr表示XrTaskList数据
      */
     private String tasklistType;
+
+    /**
+     * 当前执行用户id
+     */
+    private String curruserid;
+
+    /**
+     * 当前执行用户名称
+     */
+    private String currusername;
+
+    /**
+     * 当前执行用户所在单位id
+     */
+    private String orgunitid;
+
+    /**
+     * 当前执行用户所在单位名称
+     */
+    private String orgunitname;
 }

src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml

@@ -61,7 +61,10 @@
         <result column="CREATETIME" property="createTime" />
         <result column="subBusType" property="subBusType" />
         <result column="tasklistType" property="tasklistType" />
-
+        <result column="CURRUSERID" property="curruserid"/>
+        <result column="CURRUSERNAME" property="currusername"/>
+        <result column="ORGUNITID" property="orgunitid"/>
+        <result column="ORGUNITNAME" property="orgunitname"/>
     </resultMap>
 
     <resultMap id="crgsTaskListMap" type="com.chinaweal.aiccs.crgs.system.entity.TaskList">
@@ -566,9 +569,12 @@
         from(
             <choose>
                 <when test="customParamMap.finished != null and customParamMap.finished != '' ">
-                    (select DISTINCT ta.TASKLISTID, ta.WORKFLOWID, ta.BIZSEQID, ta.SIGNUSERID, ta.SENDERORGID, ta.SENDERUSERID, ta.SENDTOORGID, ta.ACCEPTNO, ta.BUSNAME, ta.SIGNTIME,ta.BUSTYPE, ta.BUSSTATUS, ta.LINKNAME, ta.AUDITDEPTTYPE, ta.ISSIGNON,ta.SIGNLOGINNAME, ta.SENDERTIME, ta.SENDERNAME, ta.ACCEPTGROUPID, ta.AREA_CODE, ta.LAUPTIME , n.currentNode as currentNodeOrBizStatus,SUBSTR(n.NODEFLOW, 1, INSTR(n.NODEFLOW, '_') - 1) as lastNode, ta.CREATETIME
+                    (select DISTINCT ta.TASKLISTID, ta.WORKFLOWID, ta.BIZSEQID, ta.SIGNUSERID, ta.SENDERORGID, ta.SENDERUSERID, ta.SENDTOORGID, ta.ACCEPTNO, ta.BUSNAME, ta.SIGNTIME,ta.BUSTYPE, ta.BUSSTATUS, ta.LINKNAME, ta.AUDITDEPTTYPE, ta.ISSIGNON,ta.SIGNLOGINNAME, ta.SENDERTIME, ta.SENDERNAME, ta.ACCEPTGROUPID, ta.AREA_CODE, ta.LAUPTIME , n.currentNode as currentNodeOrBizStatus,SUBSTR(n.NODEFLOW, 1, INSTR(n.NODEFLOW, '_') - 1) as lastNode, ta.CREATETIME,
+                    n.CURRUSERID CURRUSERID, tu1.REALNAME CURRUSERNAME, torg1.ORGUNITID ORGUNITID, torg1.ORGUNITNAME ORGUNITNAME
                     from TSTaskList ta
                     LEFT JOIN TShwfProcessNode n on ta.WorkflowID = n.processid
+                    LEFT JOIN CXAICORG.T_USERS tu1 on n.CURRUSERID = tu1.USERID
+                    LEFT JOIN CXAICORG.T_ORGUNITS torg1 on tu1.ORGUNITID = torg1.ORGUNITID
                     where ta.BUSSTATUS = 2 AND ta.WORKFLOWID IN (
                     SELECT
                     DISTINCT WORKFLOWID
@@ -592,9 +598,12 @@
                         </if>
                     </where>) and REGEXP_LIKE(n.currentNode, '^end|over', 'i') = 1)
                 union all
-                    (select DISTINCT t.TASKLISTID, t.WORKFLOWID, t.BIZSEQID, t.SIGNUSERID, t.SENDERORGID, t.SENDERUSERID, t.SENDTOORGID, t.ACCEPTNO, t.BUSNAME, t.SIGNTIME, t.BUSTYPE, t.BUSSTATUS, t.LINKNAME, t.AUDITDEPTTYPE, t.ISSIGNON, t.SIGNLOGINNAME, t.SENDERTIME, t.SENDERNAME, t.ACCEPTGROUPID, t.AREA_CODE, t.LAUPTIME , n.currentNode as currentNodeOrBizStatus ,SUBSTR(n.NODEFLOW, 1, INSTR(n.NODEFLOW, '_') - 1) as lastNode, t.CREATETIME
+                    (select DISTINCT t.TASKLISTID, t.WORKFLOWID, t.BIZSEQID, t.SIGNUSERID, t.SENDERORGID, t.SENDERUSERID, t.SENDTOORGID, t.ACCEPTNO, t.BUSNAME, t.SIGNTIME, t.BUSTYPE, t.BUSSTATUS, t.LINKNAME, t.AUDITDEPTTYPE, t.ISSIGNON, t.SIGNLOGINNAME, t.SENDERTIME, t.SENDERNAME, t.ACCEPTGROUPID, t.AREA_CODE, t.LAUPTIME , n.currentNode as currentNodeOrBizStatus ,SUBSTR(n.NODEFLOW, 1, INSTR(n.NODEFLOW, '_') - 1) as lastNode, t.CREATETIME,
+                    n.CURRUSERID CURRUSERID, tu1.REALNAME CURRUSERNAME, torg1.ORGUNITID ORGUNITID, torg1.ORGUNITNAME ORGUNITNAME
                     from tsrevtasklist t
                     LEFT JOIN TShwfProcessNode n on t.WorkflowID = n.processid
+                    LEFT JOIN CXAICORG.T_USERS tu1 on n.CURRUSERID = tu1.USERID
+                    LEFT JOIN CXAICORG.T_ORGUNITS torg1 on tu1.ORGUNITID = torg1.ORGUNITID
                     where t.BUSSTATUS = 2 AND t.WORKFLOWID IN (
                     SELECT
                     DISTINCT WORKFLOWID
@@ -621,10 +630,12 @@
                 union all
                 </when>
             </choose>
-            (select DISTINCT t.TASKLISTID, t.WORKFLOWID, t.BIZSEQID, t.SIGNUSERID, t.SENDERORGID, t.SENDERUSERID, t.SENDTOORGID, t.ACCEPTNO, t.BUSNAME, t.SIGNTIME, t.BUSTYPE, t.BUSSTATUS, t.LINKNAME, t.AUDITDEPTTYPE, t.ISSIGNON, t.SIGNLOGINNAME, t.SENDERTIME, t.SENDERNAME, t.ACCEPTGROUPID, t.AREA_CODE, t.LAUPTIME , b.STATUS as currentNodeOrBizStatus, null as lastNode, t.CREATETIME
+            (select DISTINCT t.TASKLISTID, t.WORKFLOWID, t.BIZSEQID, t.SIGNUSERID, t.SENDERORGID, t.SENDERUSERID, t.SENDTOORGID, t.ACCEPTNO, t.BUSNAME, t.SIGNTIME, t.BUSTYPE, t.BUSSTATUS, t.LINKNAME, t.AUDITDEPTTYPE, t.ISSIGNON, t.SIGNLOGINNAME, t.SENDERTIME, t.SENDERNAME, t.ACCEPTGROUPID, t.AREA_CODE, t.LAUPTIME , b.STATUS as currentNodeOrBizStatus, null as lastNode, t.CREATETIME,
-            from tsrevtasklist t, tsbizrevlist b
+            n.CURRUSERID CURRUSERID, tu1.REALNAME CURRUSERNAME, torg1.ORGUNITID ORGUNITID, torg1.ORGUNITNAME ORGUNITNAME
+            from tsrevtasklist t, tsbizrevlist b,TShwfProcessNode n, CXAICORG.T_USERS tu1, CXAICORG.T_ORGUNITS torg1
             where t.bizseqid = b.bizseq and t.busstatus = '0' and b.ISREMOVE = '0'
-            and t.WORKFLOWID in (SELECT DISTINCT WORKFLOWID FROM tsopinion tso
+            and n.CURRUSERID = tu1.USERID and tu1.ORGUNITID = torg1.ORGUNITID
+            and t.WorkflowID = n.processid and t.WORKFLOWID in (SELECT DISTINCT WORKFLOWID FROM tsopinion tso
             <where>
                 <if test="customParamMap.childUnitSwitch != null and customParamMap.childUnitSwitch != ''">
                     <choose>
@@ -643,9 +654,12 @@
                 </if>
             </where>))
         union all
-            (select DISTINCT ta.TASKLISTID, ta.WORKFLOWID, ta.BIZSEQID, ta.SIGNUSERID, ta.SENDERORGID, ta.SENDERUSERID, ta.SENDTOORGID, ta.ACCEPTNO, ta.BUSNAME, ta.SIGNTIME, ta.BUSTYPE, ta.BUSSTATUS, ta.LINKNAME, ta.AUDITDEPTTYPE, ta.ISSIGNON,ta.SIGNLOGINNAME, ta.SENDERTIME, ta.SENDERNAME, ta.ACCEPTGROUPID, ta.AREA_CODE, ta.LAUPTIME, n.currentNode as currentNodeOrBizStatus,SUBSTR(n.NODEFLOW, 1, INSTR(n.NODEFLOW, '_') - 1) as lastNode, ta.CREATETIME
+            (select DISTINCT ta.TASKLISTID, ta.WORKFLOWID, ta.BIZSEQID, ta.SIGNUSERID, ta.SENDERORGID, ta.SENDERUSERID, ta.SENDTOORGID, ta.ACCEPTNO, ta.BUSNAME, ta.SIGNTIME, ta.BUSTYPE, ta.BUSSTATUS, ta.LINKNAME, ta.AUDITDEPTTYPE, ta.ISSIGNON,ta.SIGNLOGINNAME, ta.SENDERTIME, ta.SENDERNAME, ta.ACCEPTGROUPID, ta.AREA_CODE, ta.LAUPTIME, n.currentNode as currentNodeOrBizStatus,SUBSTR(n.NODEFLOW, 1, INSTR(n.NODEFLOW, '_') - 1) as lastNode, ta.CREATETIME,
+            n.CURRUSERID CURRUSERID, tu1.REALNAME CURRUSERNAME, torg1.ORGUNITID ORGUNITID, torg1.ORGUNITNAME ORGUNITNAME
             from TSTaskList ta
             LEFT JOIN TSTwfProcessNode n on ta.WorkflowID = n.processid
+            LEFT JOIN CXAICORG.T_USERS tu1 on n.CURRUSERID = tu1.USERID
+            LEFT JOIN CXAICORG.T_ORGUNITS torg1 on tu1.ORGUNITID = torg1.ORGUNITID
             where ta.BUSSTATUS in ('-1', '0', '1', '3', '5')
             <if test="customParamMap.childUnitSwitch != null and customParamMap.childUnitSwitch != ''">
                 <choose>