|
@@ -46,6 +46,7 @@
|
|
|
cast(tbs.id as char) as serviceId,
|
|
|
tbs.name as serviceName,
|
|
|
tbsi.sop_no as sopNo,
|
|
|
+ tbsi.update_time as updateTime,
|
|
|
tbsi.crm_no as crmNo,
|
|
|
tbc.begin_time as beginTime,
|
|
|
cast(su1.id as char) as customManagerId,
|
|
@@ -76,8 +77,6 @@
|
|
|
art.NAME_ as taskName,
|
|
|
art.TASK_DEF_KEY_ as taskDefKey,
|
|
|
(select group_concat(cast(art.ID_ as char)) from ACT_RU_TASK art where art.PROC_INST_ID_ = tffa.flow_id) as taskId
|
|
|
--- IFNULL((select group_concat(us1.real_name SEPARATOR ';') from sys_user us1
|
|
|
--- where find_in_set(us1.id, (select tffl.pend_approve_id from t_f_flow_log tffl where tffl.flow_id = tfcfe.flow_id order by tffl.create_time desc limit 1))),'--') as pendApproveName
|
|
|
<if test="fieldName != null and fieldName != ''">
|
|
|
,${fieldName}
|
|
|
</if>
|
|
@@ -135,33 +134,6 @@
|
|
|
</choose>
|
|
|
</if>
|
|
|
and IF(tbs.`status` = 'PUBLISH', tffa.status in ('START', 'DRAFT', 'AUDITING', 'REJECT', 'CANCEL', 'FINISH'), 1 <![CDATA[ <> ]]> 1)
|
|
|
- <!--and EXISTS(
|
|
|
- select t.* from(select cast(art.PROC_INST_ID_ as Decimal(24)) as flowId
|
|
|
- from
|
|
|
- ACT_RU_TASK art
|
|
|
- where 1 = 1
|
|
|
- <if test="userIdList != null and userIdList != '' and userIdList.size() > 0">
|
|
|
- and art.ASSIGNEE_ IN
|
|
|
- <foreach collection="userIdList" item="item" index="index" open="(" separator="," close=")">
|
|
|
- #{item}
|
|
|
- </foreach>
|
|
|
- </if>
|
|
|
- UNION ALL
|
|
|
- select
|
|
|
- art.PROC_INST_ID_ as flowId
|
|
|
- from
|
|
|
- ACT_RU_TASK art
|
|
|
- left join act_ru_identitylink ari on
|
|
|
- ari.TASK_ID_ = art.ID_
|
|
|
- where
|
|
|
- art.ASSIGNEE_ is null
|
|
|
- <if test="userIdList != null and userIdList != '' and userIdList.size() > 0">
|
|
|
- and ari.USER_ID_ IN
|
|
|
- <foreach collection="userIdList" item="item" index="index" open="(" separator="," close=")">
|
|
|
- #{item}
|
|
|
- </foreach>
|
|
|
- </if>
|
|
|
- and ari.TYPE_ = 'candidate') t where t.flowId = art.PROC_INST_ID_)-->
|
|
|
</where>
|
|
|
<choose>
|
|
|
<when test="fieldOrder != null and fieldOrder != ''">
|