From 63447fec93e8e562833db30bc848884001b808c4 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 28 十二月 2023 12:13:06 +0800
Subject: [PATCH] 修改
---
zt/core/src/main/resources/mapper/workflow/WfRunTaskDao.xml | 330 +++++++++++++++++++++++++++----------------------------
1 files changed, 162 insertions(+), 168 deletions(-)
diff --git a/zt/core/src/main/resources/mapper/workflow/WfRunTaskDao.xml b/zt/core/src/main/resources/mapper/workflow/WfRunTaskDao.xml
index 646b8a1..c968d35 100644
--- a/zt/core/src/main/resources/mapper/workflow/WfRunTaskDao.xml
+++ b/zt/core/src/main/resources/mapper/workflow/WfRunTaskDao.xml
@@ -8,23 +8,23 @@
,b.dept_id
,b.username
,b.real_name
- ,b.MOBILE
+ ,b.mobile
FROM
- SYS_USER b
+ sys_user b
WHERE
is_delete = 0
<if test="roleId!=null and roleId!=''">
- AND ID IN(
+ AND id IN(
SELECT
- USER_ID
+ user_id
FROM
- SYS_ROLE_USER
- WHERE IS_DELETE = 0 and
- ROLE_ID IN(
+ sys_role_user
+ WHERE is_delete = 0 and
+ role_id IN(
SELECT
- ID
+ id
FROM
- SYS_ROLE
+ sys_role
WHERE
CONCAT( ',', #{roleId}, ',' ) LIKE CONCAT( '%,', id, ',%' )
)
@@ -36,7 +36,7 @@
SELECT
id
FROM
- SYS_DEPT
+ sys_dept
WHERE
CONCAT( ',', #{deptIds}, ',' ) LIKE CONCAT( '%,', id, ',%' )
)
@@ -52,15 +52,15 @@
, b.dept_id
, b.username
, b.real_name
- , b.MOBILE
- FROM SYS_USER b
+ , b.mobile
+ FROM sys_user b
WHERE is_delete = 0
and id in (
- SELECT USER_ID
- FROM SY_PROJECT_EXPERT
- WHERE biz_ID = #{bizId}
+ SELECT user_id
+ FROM sy_project_expert
+ WHERE biz_id = #{bizId}
and flow_Code = #{code}
- and step_Marker = #{stepMarker}
+ and step_marker = #{stepMarker}
and is_delete = 0
)
</select>
@@ -70,8 +70,8 @@
, b.dept_id
, b.username
, b.real_name
- , b.MOBILE
- FROM SYS_USER b
+ , b.mobile
+ FROM sys_user b
WHERE is_delete = 0
and id = #{userId}
limit 1
@@ -86,23 +86,23 @@
<select id="getFlowFinish" resultType="com.zt.modules.workflow.model.WfRunTask">
SELECT id
- FROM WF_RUN_TASK
- WHERE IS_DELETE = 0
- AND (CONCAT('', flow_id) = #{wfDefIdCode} or flow_id in (select id from WF_DEF where code = #{wfDefIdCode}))
+ FROM wf_run_task
+ WHERE is_delete = 0
+ AND (CONCAT('', flow_id) = #{wfDefIdCode} or flow_id in (select id from wf_def where code = #{wfDefIdCode}))
and biz_id = #{bizId}
AND status IN (100)
</select>
<select id="queryCurrentTaskStep" resultType="com.zt.modules.workflowconfig.model.WfDefStep">
SELECT *
- FROM WF_DEF_STEP wds
- WHERE IS_DELETE = 0
- and STEP_TYPE = 0
+ FROM wf_def_step wds
+ WHERE is_delete = 0
+ and step_type = 0
AND id IN (
SELECT step_id
- FROM WF_RUN_TASK
- WHERE IS_DELETE = 0
- AND (CONCAT('', flow_id) = #{wfDefIdCode} or flow_id in (select id from WF_DEF where IS_DELETE = 0 AND code = #{wfDefIdCode}))
+ FROM wf_run_task
+ WHERE is_delete = 0
+ AND (CONCAT('', flow_id) = #{wfDefIdCode} or flow_id in (select id from wf_def where is_delete = 0 AND code = #{wfDefIdCode}))
and biz_id = #{bizId}
AND status IN (0, 1)
)
@@ -110,36 +110,36 @@
<select id="queryCurrentTaskStep100" resultType="com.zt.modules.workflowconfig.model.WfDefStep">
SELECT *
- FROM WF_DEF_STEP wds
- WHERE IS_DELETE = 0
- and STEP_TYPE = 0
+ FROM wf_def_step wds
+ WHERE is_delete = 0
+ and step_type = 0
AND id IN (
SELECT step_id
- FROM WF_RUN_TASK
- WHERE IS_DELETE = 0
- AND (CONCAT('', flow_id) = #{wfDefIdCode} or flow_id in (select id from WF_DEF where IS_DELETE = 0 AND code = #{wfDefIdCode}))
+ FROM wf_run_task
+ WHERE is_delete = 0
+ AND (CONCAT('', flow_id) = #{wfDefIdCode} or flow_id in (select id from wf_def where is_delete = 0 AND code = #{wfDefIdCode}))
and biz_id = #{bizId}
AND status IN (0, 1,100)
)
</select>
<update id="deleteFlowTask">
- update WF_RUN_TASK
+ update wf_run_task
set is_delete = 1
- ,UPDATE_DATE = CURRENT_TIMESTAMP
- where IS_DELETE = 0
+ ,update_date = CURRENT_TIMESTAMP
+ where is_delete = 0
<if test="wfIdCodes!=null and wfIdCodes!=''">
- and FLOW_CODE = #{wfIdCodes}
+ and flow_code = #{wfIdCodes}
</if>
<if test="bizId!=null and bizId!=''">
and biz_Id = #{bizId}
</if>;
- update WF_RUN_INSTANCE
+ update wf_run_instance
set is_delete = 1
- ,UPDATE_DATE = CURRENT_TIMESTAMP
- where IS_DELETE = 0
+ ,update_date = CURRENT_TIMESTAMP
+ where is_delete = 0
<if test="wfIdCodes!=null and wfIdCodes!=''">
- and FLOW_CODE = #{wfIdCodes}
+ and flow_code = #{wfIdCodes}
</if>
<if test="bizId!=null and bizId!=''">
and biz_Id = #{bizId}
@@ -147,7 +147,7 @@
</update>
<update id="setTaskStatus">
- update WF_RUN_TASK
+ update wf_run_task
set status=CASE WHEN receive_id = #{userId} THEN #{status}
ELSE #{status}+1 end
,status2 = 0
@@ -155,44 +155,44 @@
,finish_time2 = NOW()
,finish_id = #{userId}
,finish_name = #{realName}
- ,OPINION = #{option}
- ,UPDATE_DATE = CURRENT_TIMESTAMP
- where IS_DELETE = 0
+ ,opinion = #{option}
+ ,update_date = CURRENT_TIMESTAMP
+ where is_delete = 0
AND biz_id=#{bizId}
and step_id=#{stepId}
and status in (0,1)
<if test="taskGroup=='cj'">
- and RECEIVE_ID in (select user_id from SYS_USER where dept_ID in (select dept_ID from SYS_USER where user_id=#{userId}))
+ and receive_id in (select user_id from sys_user where dept_ID in (select dept_ID from sys_user where user_id=#{userId}))
</if>
<if test="taskGroup=='zy'">
- and RECEIVE_ID in (select teamgroup from SYS_user where user_id =#{userId})
+ and receive_id in (select teamgroup from sys_user where user_id =#{userId})
</if>
<if test="taskGroup=='br'">
- and RECEIVE_ID = #{userId}
+ and receive_id = #{userId}
</if>
<if test="taskGroup=='js'">
- and Group_id2 in (select ROLE_ID from sys_role_user where user_id =#{userId} and is_delete=0)
+ and group_id2 in (select role_id from sys_role_user where user_id =#{userId} and is_delete=0)
</if>
</update>
<update id="setTaskPartFinish">
UPDATE
- WF_RUN_TASK
- SET STATUS2 = ${status}
- , UPDATE_DATE = CURRENT_TIMESTAMP
- WHERE IS_DELETE = 0
+ wf_run_task
+ SET status2 = ${status}
+ , update_date = CURRENT_TIMESTAMP
+ WHERE is_delete = 0
AND biz_id = #{bizId}
- AND STEP_ID = #{currentStepId}
+ AND step_id = #{currentStepId}
AND status in (0,1)
AND status2 not in (1)
</update>
<update id="setTaskPartFinish2">
UPDATE
- WF_RUN_TASK
- SET STATUS = ${status}
- , UPDATE_DATE = CURRENT_TIMESTAMP
- WHERE IS_DELETE = 0
+ wf_run_task
+ SET status = ${status}
+ , update_date = CURRENT_TIMESTAMP
+ WHERE is_delete = 0
AND biz_id = #{bizId}
AND receive_id = #{receiveId}
AND status in (0,1)
@@ -200,11 +200,11 @@
<update id="setTaskPartFinish3">
UPDATE
- WF_RUN_TASK a,
+ wf_run_task a,
sys_user b
- SET a.STATUS = ${status}
- , a.UPDATE_DATE = CURRENT_TIMESTAMP
- WHERE a.IS_DELETE = 0
+ SET a.status = ${status}
+ , a.update_date = CURRENT_TIMESTAMP
+ WHERE a.is_delete = 0
AND a.biz_id = #{bizId}
AND a.receive_id = b.id and b.dept_id = #{receiveDeptId}
AND a.status in (0,1)
@@ -212,25 +212,25 @@
<update id="setTaskRefuse">
UPDATE
- WF_RUN_TASK
- SET STATUS2 = ${status}
- , UPDATE_DATE = CURRENT_TIMESTAMP
- WHERE IS_DELETE = 0
+ wf_run_task
+ SET status2 = ${status}
+ , update_date = CURRENT_TIMESTAMP
+ WHERE is_delete = 0
AND biz_id = #{bizId}
- AND STEP_ID IN (
+ AND step_id IN (
SELECT id
FROM (
SELECT id
- FROM WF_DEF_STEP
- WHERE IS_DELETE = 0
- AND WF_DEF_ID IN (
- SELECT WF_DEF_ID
- FROM WF_DEF_STEP
+ FROM wf_def_step
+ WHERE is_delete = 0
+ AND wf_def_id IN (
+ SELECT wf_def_id
+ FROM wf_def_step
WHERE id = #{currentStepId}
)
AND step_no > (
SELECT step_no
- FROM WF_DEF_STEP
+ FROM wf_def_step
WHERE id = #{currentStepId}
)
) cc
@@ -239,8 +239,8 @@
<select id="getSingleFlowStatus" resultType="com.zt.modules.workflow.model.WfRunTask">
- SELECT s.STEP_NO,b.*,
- (select group_concat(RECEIVE_NAME) from WF_RUN_TASK c WHERE c.group_id=b.group_id AND (b.status=1 OR c.status in(20)) limit 0,3) AS RECEIVE_NAME
+ SELECT s.step_no,b.*,
+ (select group_concat(receive_name) from wf_run_task c WHERE c.group_id=b.group_id AND (b.status=1 OR c.status in(20)) limit 0,3) AS RECEIVE_NAME
FROM (
SELECT id,biz_id,biz_group_id,flow_code,step_id,step_marker,group_id,
CASE WHEN status IN (20,21,100) THEN 20
@@ -249,8 +249,8 @@
ELSE 0 end AS status
FROM (SELECT
*
- FROM WF_RUN_TASK
- WHERE IS_delete =0
+ FROM wf_run_task
+ WHERE is_delete =0
<if test="wfIdCodes!=null and wfIdCodes!=''">
and ( CONCAT(',',#{wfIdCodes},',') like Concat('%,',CONCAT('',flow_id ),',%')
or CONCAT(',',#{wfIdCodes},',') like Concat('%,',flow_code,',%') )
@@ -268,8 +268,8 @@
</select>
<select id="getFlowStatus" resultType="com.zt.modules.workflow.model.WfRunTask">
- SELECT s.STEP_NO,b.*,
- (select group_concat(RECEIVE_NAME) from WF_RUN_TASK c WHERE c.group_id=b.group_id AND (b.status=1 OR c.status in(20)) limit 0,3) AS RECEIVE_NAME
+ SELECT s.step_no,b.*,
+ (select group_concat(receive_name) from wf_run_task c WHERE c.group_id=b.group_id AND (b.status=1 OR c.status in(20)) limit 0,3) AS RECEIVE_NAME
FROM (
SELECT id,biz_id,biz_group_id,flow_code,step_id,step_marker,group_id,
CASE WHEN status IN (20,21,100) THEN 20
@@ -279,9 +279,9 @@
FROM (SELECT
a.*
FROM
- WF_RUN_TASK a
+ wf_run_task a
WHERE IS_delete =0
- and flow_code in (select code from WF_DEF where type = '1')
+ and flow_code in (select code from wf_def where type = '1')
<if test="wfIdCodes!=null and wfIdCodes!=''">
and ( CONCAT(',',#{wfIdCodes},',') like Concat('%,',CONCAT('',flow_id ),',%')
or CONCAT(',',#{wfIdCodes},',') like Concat('%,',flow_code,',%') )
@@ -293,22 +293,22 @@
group BY biz_id,
flow_code,
step_marker
- )b ,WF_DEF_STEP s where b.step_id = s.id
+ )b ,wf_def_step s where b.step_id = s.id
order by flow_code,STEP_NO
</select>
<select id="getFlowStatus2" resultType="com.zt.modules.workflow.model.WfRunTask">
- SELECT s.STEP_NO,
+ SELECT s.step_no,
b.*,
- (select group_concat(distinct RECEIVE_NAME)
- from WF_RUN_TASK c
+ (select group_concat(distinct receive_name)
+ from wf_run_task c
WHERE (b.status = 1 OR c.status in (20))
and group_id in (select group_id
from (
select group_id, biz_id, flow_code, step_marker
from (
SELECT group_id, biz_id, flow_code, step_marker
- FROM WF_RUN_TASK
+ FROM wf_run_task
WHERE biz_group_id = #{bizGroupId}
ORDER BY receive_time desc
) cc
@@ -334,9 +334,9 @@
sum(CASE WHEN status IN (20, 21, 100) THEN 1 ELSE 0 end) AS finishNum
FROM (select *
from (SELECT *
- FROM WF_RUN_TASK
- WHERE IS_delete = 0
- and flow_code in (select code from WF_DEF where type = '2')
+ FROM wf_run_task
+ WHERE is_delete = 0
+ and flow_code in (select code from wf_def where type = '2')
and status IN (0, 1, 20, 21, 100)
and biz_group_id = #{bizGroupId}
ORDER BY receive_time desc
@@ -352,16 +352,16 @@
SELECT biz_group_id,
flow_code,
count(DISTINCT biz_group_id, flow_code, biz_id) AS totalNum
- FROM WF_RUN_TASK a
- WHERE IS_delete = 0
- and flow_code in (select code from WF_DEF where type = '2')
+ FROM wf_run_task a
+ WHERE is_delete = 0
+ and flow_code in (select code from wf_def where type = '2')
and biz_group_id = #{bizGroupId}
GROUP BY biz_group_id, flow_code
) b
WHERE a.biz_group_id = b.biz_group_id
AND a.flow_code = b.flow_code
) b,
- WF_DEF_STEP s
+ wf_def_step s
where b.step_marker = s.step_marker
order by flow_code, STEP_NO
</select>
@@ -374,8 +374,8 @@
FROM (
SELECT
biz_group_id,flow_code,count(DISTINCT biz_id) AS totalNum,
- (SELECT count(1) FROM WF_RUN_TASK b WHERE b.biz_group_id=a.biz_group_id AND b.status=100) AS finishNum
- FROM WF_RUN_TASK a
+ (SELECT count(1) FROM wf_run_task b WHERE b.biz_group_id=a.biz_group_id AND b.status=100) AS finishNum
+ FROM wf_run_task a
WHERE IS_delete =0
and flow_code in (select code from WF_DEF where type = '2')
<if test="wfIdCodes!=null and wfIdCodes!=''">
@@ -388,17 +388,17 @@
</select>
<select id="getPhaseFlowStatus" resultType="com.zt.modules.workflow.model.WfRunTask">
- select CODE as FLOW_CODE,
+ select code as FLOW_CODE,
case
when exists(select 1
from wf_run_instance b
- where b.FLOW_ID = a.id
- and b.BIZ_GROUP_ID = #{bizId}
+ where b.flow_id = a.id
+ and b.biz_group_id = #{bizId}
and b.status in (0, 1)) then 1
when exists(select 1
from wf_run_instance b
- where b.FLOW_ID = a.id
- and b.BIZ_GROUP_ID = #{bizId}
+ where b.flow_id = a.id
+ and b.biz_group_id = #{bizId}
and b.status in (20, 100)) then 20
else 0
end as status
@@ -407,13 +407,13 @@
</select>
<select id="getFlowStepStatus" resultType="com.zt.modules.workflow.model.WfRunTask">
- SELECT a.* FROM WF_RUN_TASK a,
+ SELECT a.* FROM wf_run_task a,
(
SELECT a.id,
- CASE WHEN finish_TIME IS NULL THEN cast('2500-1-1' AS DATE)
- ELSE finish_TIME end finish_TIME
- FROM WF_RUN_TASK a
- WHERE IS_delete =0
+ CASE WHEN finish_time IS NULL THEN cast('2500-1-1' AS DATE)
+ ELSE finish_time end finish_TIME
+ FROM wf_run_task a
+ WHERE is_delete =0
AND status IN (0,1,20,100)
<if test="wfIdCodes!=null and wfIdCodes!=''">
and ( CONCAT(',',#{wfIdCodes},',') like Concat('%,',CONCAT('',flow_id ),',%')
@@ -428,40 +428,40 @@
<select id="isMyStep" resultType="java.lang.Integer">
SELECT count(1)
- FROM WF_RUN_TASK
+ FROM wf_run_task
WHERE is_delete = 0
and biz_id = #{bizId}
and step_Marker = #{stepMarker}
- and receive_Id = #{userId}
+ and receive_id = #{userId}
AND status IN (0, 1)
</select>
<select id="isMyStepFinish" resultType="java.lang.Integer">
SELECT count(1)
- FROM WF_RUN_TASK
+ FROM wf_run_task
WHERE is_delete = 0
and biz_id = #{bizId}
- and step_Marker = #{stepMarker}
- and receive_Id = #{userId}
+ and step_marker = #{stepMarker}
+ and receive_id = #{userId}
AND status in (20, 21)
</select>
<select id="getFlowStepFinish" resultType="java.lang.Integer">
SELECT count(1)
- FROM WF_RUN_TASK
+ FROM wf_run_task
WHERE is_delete = 0
and biz_id = #{bizId}
- and step_Marker = #{stepIdMark}
+ and step_marker = #{stepIdMark}
and (CONCAT('', flow_id) = #{wfIdCode} or flow_code = #{wfIdCode})
AND status IN (0, 1)
</select>
<select id="getFlowStepFinish2" resultType="java.lang.Integer">
SELECT count(1)
- FROM WF_RUN_TASK
+ FROM wf_run_task
WHERE is_delete = 0
and biz_id = #{bizId}
- and step_Marker = #{stepIdMark}
+ and step_marker = #{stepIdMark}
and (CONCAT('', flow_id) = #{wfIdCode} or flow_code = #{wfIdCode})
AND status IN (20, 21, 100)
</select>
@@ -469,16 +469,16 @@
<select id="getStepCount" resultType="com.zt.modules.workflow.model.WfRunTask">
SELECT *
FROM (
- SELECT a.step_marker, (CASE WHEN b.num IS NULL THEN 0 ELSE b.num end) status, a.STEP_NO
- FROM WF_DEF_STEP a /*liquan*/
+ SELECT a.step_marker, (CASE WHEN b.num IS NULL THEN 0 ELSE b.num end) status, a.step_no
+ FROM wf_def_step a /*liquan*/
LEFT JOIN (
SELECT step_marker, count(1) AS Num
FROM (select *
from (SELECT *
- FROM WF_RUN_TASK
- WHERE IS_delete = 0
+ FROM wf_run_task
+ WHERE is_delete = 0
and status IN (0, 1, 100)
- and biz_Group_id = #{bizId}
+ and biz_group_id = #{bizId}
and flow_code = #{wfIdCode}
ORDER BY receive_time desc
) d /*liquan*/
@@ -490,14 +490,14 @@
) cc
GROUP BY biz_group_id, flow_id, flow_code, step_marker
) b ON a.step_marker = b.step_marker
- WHERE a.WF_DEF_ID IN (SELECT id FROM WF_DEF WHERE CODE = #{wfIdCode})
+ WHERE a.wf_def_id IN (SELECT id FROM wf_def WHERE code = #{wfIdCode})
UNION
SELECT 'total',
count(DISTINCT biz_group_id, flow_code, biz_id) AS status,
900
- FROM WF_RUN_TASK a
- WHERE IS_delete = 0
- and biz_Group_id = #{bizId}
+ FROM wf_run_task a
+ WHERE is_delete = 0
+ and biz_group_id = #{bizId}
and flow_code = #{wfIdCode}
GROUP BY biz_group_id, flow_code
) c
@@ -506,25 +506,25 @@
<select id="getBizTaskCount" resultType="java.lang.Integer">
SELECT count(1)
- FROM WF_RUN_TASK
+ FROM wf_run_task
WHERE is_delete = 0
and biz_id = #{bizId}
and flow_code = #{wfIdCode}
</select>
<update id="setTaskRecall">
- UPDATE WF_RUN_TASK
- SET STATUS = 0
- , UPDATE_DATE = CURRENT_TIMESTAMP
- WHERE IS_DELETE = 0
+ UPDATE wf_run_task
+ SET status = 0
+ , update_date = CURRENT_TIMESTAMP
+ WHERE is_delete = 0
AND id = #{taskId}
and (CONCAT('', flow_id) = #{wfIdCode} or flow_code = #{wfIdCode});
- UPDATE WF_RUN_TASK
- SET IS_DELETE = 1
- , UPDATE_DATE = CURRENT_TIMESTAMP
- WHERE IS_DELETE = 0
- AND PREV_ID = #{taskId}
+ UPDATE wf_run_task
+ SET is_delete = 1
+ , update_date = CURRENT_TIMESTAMP
+ WHERE is_delete = 0
+ AND prev_id = #{taskId}
</update>
@@ -538,35 +538,29 @@
and a.user_id = #{userId}
</select>
- <select id="getPlanStatus" resultType="java.lang.Integer">
- SELECT CURRENT_STATE
- FROM zhgl_annual_plan a
- WHERE a.is_delete = 0
- and a.id = #{bizId}
- </select>
<select id="getConnectInformation" resultType="com.zt.modules.workflow.model.WfRunTask">
SELECT *
FROM `wf_run_task`
- where STEP_MARKER in ('yxsc_bb', 'sgqd_bb', 'plan_tybx')
+ where step_marker in ('yxsc_bb', 'sgqd_bb', 'plan_tybx')
and status in (0, 1)
- and RECEIVE_ID in
+ and receive_id in
(select user_id from sys_user where DEPT_ID = #{oldShipTeam})
and is_delete = 0
- group by FLOW_CODE, STEP_MARKER, BIZ_ID
+ group by flow_code, step_marker, biz_id
</select>
<select id="getFlowTrack" resultType="com.zt.modules.workflow.model.WfRunTask">
select * from (
- select step_name,RECEIVE_NAME,RECEIVE_TIME,FINISH_TIME
+ select step_name,receive_name,receive_time,finish_time
from wf_run_task
- where FLOW_CODE=#{flowCode} and BIZ_ID=#{bizId} and is_delete = 0 and status='20'
+ where flow_code=#{flowCode} and biz_id=#{bizId} and is_delete = 0 and status='20'
union
- select step_name,GROUP_CONCAT(RECEIVE_NAME) as RECEIVE_NAME,RECEIVE_TIME,FINISH_TIME
+ select step_name,GROUP_CONCAT(receive_name) as RECEIVE_NAME,receive_time,finish_time
from wf_run_task
- where FLOW_CODE=#{flowCode} and BIZ_ID=#{bizId} and is_delete = 0
+ where flow_code=#{flowCode} and biz_id=#{bizId} and is_delete = 0
and status in (0,1)
- group by step_name,RECEIVE_TIME,FINISH_TIME
- ) b order by RECEIVE_TIME
+ group by step_name,receive_time,finish_time
+ ) b order by receive_time
</select>
<select id="isExistsStep" resultType="java.lang.Integer">
@@ -574,12 +568,12 @@
wf_def_step b
where
a.biz_id = #{bizId} and a.status in (0,20)
- and a.step_id = b.id and b.EXEC_ONE = 1
+ and a.step_id = b.id and b.exec_one = 1
<if test="currentStepId != 0">
- and a.STEP_ID = #{currentStepId}
+ and a.step_id = #{currentStepId}
</if>
<if test="stepMarker != null">
- and a.STEP_MARKER = #{stepMarker}
+ and a.step_marker = #{stepMarker}
</if>
</select>
@@ -591,32 +585,32 @@
a.biz_id = #{bizId} and a.status in (0,1)
and a.step_id = b.id and a.is_delete = 0 and b.is_delete = 0
<if test="currentStepId != 0">
- and a.STEP_ID = #{currentStepId}
+ and a.step_id = #{currentStepId}
</if>
<if test="stepMarker != null">
- and a.STEP_MARKER = #{stepMarker}
+ and a.step_marker = #{stepMarker}
</if>
</select>
<select id="getFlowStepName" resultType="java.lang.String">
SELECT
- STEP_NAME
+ step_name
FROM
wf_run_task
WHERE
- FLOW_CODE = #{wfIdCodes}
- AND BIZ_ID = #{bizId}
- AND `STATUS` = 0
+ flow_code = #{wfIdCodes}
+ AND biz_id = #{bizId}
+ 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
+ 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}'
+ where a.step_id = b.id and a.flow_code ='${flowCode}'
<if test="bizIds != null">
- and a.BIZ_ID in
+ and a.biz_id in
<foreach item="item" collection="bizIds" open="(" separator="," close=")">
#{item}
</foreach>
@@ -628,17 +622,17 @@
<update id="updateConnect">
update `wf_run_task`
- set is_delete =1,UPDATE_DATE = CURRENT_TIMESTAMP
- where STEP_MARKER in ('yxsc_bb', 'sgqd_bb', 'plan_tybx')
+ set is_delete =1,update_date = CURRENT_TIMESTAMP
+ where step_marker in ('yxsc_bb', 'sgqd_bb', 'plan_tybx')
and status in (0, 1)
- and RECEIVE_ID in
- (select user_id from sys_user where DEPT_ID = #{oldShipTeam})
+ and receive_id in
+ (select user_id from sys_user where dept_id = #{oldShipTeam})
and is_delete = 0
</update>
<update id="setReStartStatus">
update `wf_run_task`
- set status = 150,UPDATE_DATE = CURRENT_TIMESTAMP
+ set status = 150,update_date = CURRENT_TIMESTAMP
where flow_code = #{wfIdCode}
and biz_id = #{bizId}
and is_delete = 0
@@ -646,8 +640,8 @@
<update id="deleteFlowStep">
delete from wf_run_task
- where FLOW_CODE = #{wfIdCode}
- and STEP_MARKER = #{stepIdMark}
- and BIZ_ID = #{bizId}
+ where flow_code = #{wfIdCode}
+ and step_marker = #{stepIdMark}
+ and biz_id = #{bizId}
</update>
</mapper>
--
Gitblit v1.9.1