From 9d81b9866dfb837bcf831538bc875155930b470b Mon Sep 17 00:00:00 2001 From: alllenliufor3 <1009545232@qq.com> Date: Wed, 13 Apr 2022 14:21:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=20=E5=B7=B2=E5=8A=9E?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5?= =?UTF-8?q?=EF=BC=88=E4=BF=AE=E6=94=B9=E5=BD=93=E5=89=8D=E7=8E=AF=E8=8A=82?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=8F=8A=E8=8A=82=E7=82=B9id=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/flowable/biz/flowtask/FlowTaskMapper.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml index b1a922cf94..2be929bd6a 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml @@ -125,9 +125,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT * FROM ( SELECT DISTINCT ahti.ID_, - /*ahti.NAME_,*/ + ahti.NAME_, ahti.ASSIGNEE_, ahti.START_TIME_, + ahti.TASK_DEF_KEY_ taskDefKey, ahpi.START_USER_ID_, ahpi.END_ACT_ID_, ahpi.END_TIME_, @@ -136,13 +137,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" arpd.KEY_ AS PROC_DEF_KEY_, arpd.NAME_ AS PROC_DEF_NAME_, arpd.VERSION_ AS PROC_DEF_VERSION_, - arpd.DEPLOYMENT_ID_ AS DEPLOYMENT_ID_, - sfl.taskDefKey AS taskDefKey, - sfl.nodeState NAME_ + arpd.DEPLOYMENT_ID_ AS DEPLOYMENT_ID_ + /*sfl.taskDefKey AS taskDefKey,*/ + /*sfl.nodeState NAME_*/ FROM ACT_HI_PROCINST ahpi INNER JOIN (SELECT PROC_INST_ID_ from ACT_HI_TASKINST WHERE ASSIGNEE_=#{userSid} AND END_TIME_ IS NOT NULL) temp ON ahpi.PROC_INST_ID_=temp.PROC_INST_ID_ - LEFT JOIN ACT_HI_TASKINST ahti on ahti.PROC_INST_ID_=temp.PROC_INST_ID_ + /*LEFT JOIN ACT_HI_TASKINST ahti on ahti.PROC_INST_ID_=temp.PROC_INST_ID_*/ + LEFT JOIN (SELECT * FROM (SELECT DISTINCT(ID_) ID_,NAME_,ASSIGNEE_,START_TIME_,TASK_DEF_KEY_,PROC_INST_ID_ FROM ACT_HI_TASKINST ORDER BY START_TIME_ DESC) t1 GROUP BY t1.PROC_INST_ID_) ahti ON ahti.PROC_INST_ID_ = temp.PROC_INST_ID_ INNER JOIN `ACT_HI_VARINST` A0 ON ahpi.PROC_INST_ID_ = A0.PROC_INST_ID_ LEFT JOIN ACT_RE_PROCDEF arpd ON ahpi.PROC_DEF_ID_ = arpd.ID_ LEFT JOIN sys_form_link sfl ON ahpi.PROC_INST_ID_ = sfl.procInsId