|
|
@@ -278,7 +278,7 @@
|
|
|
</update>
|
|
|
|
|
|
<sql id="getByUserIdSql">
|
|
|
- SELECT <include refid="columns"/>
|
|
|
+ SELECT <include refid="columns"/> ,'' as COMPLETE_TIME_,'' as COMPILE_DEPT,'' as LOCATION_
|
|
|
FROM IBPS_BPM_INST
|
|
|
UNION
|
|
|
SELECT <include refid="columns"/>
|
|
|
@@ -604,7 +604,7 @@
|
|
|
FROM
|
|
|
(
|
|
|
SELECT
|
|
|
- rinst.*
|
|
|
+ rinst.* ,'' as COMPLETE_TIME_,'' as COMPILE_DEPT,'' as LOCATION_
|
|
|
FROM
|
|
|
ibps_bpm_inst rinst
|
|
|
RIGHT JOIN ibps_bpm_approval ap ON ap.PROC_INST_ID_ = rinst.ID_
|
|
|
@@ -693,7 +693,7 @@
|
|
|
<!-- 获取我的请求(包括历史表的结束数据) -->
|
|
|
<select id="getAllMyRequest" resultMap="BpmInstPo">
|
|
|
SELECT <include refid="columns"/> FROM (
|
|
|
- SELECT <include refid="columns"/> FROM IBPS_BPM_INST ibi UNION
|
|
|
+ SELECT <include refid="columns"/> ,'' as COMPLETE_TIME_,'' as COMPILE_DEPT,'' as LOCATION_ FROM IBPS_BPM_INST ibi UNION
|
|
|
SELECT <include refid="columns"/> FROM IBPS_BPM_INST_HIS ibih
|
|
|
) list
|
|
|
WHERE CREATE_BY_=#{userId} AND STATUS_!='draft'
|