|
|
@@ -121,9 +121,9 @@
|
|
|
m.created,
|
|
|
m.id as majorId,
|
|
|
(select name from major_production where deleted = 0 and major_id = m.id and report_no= ifnull(wfni.business_min_id,wfni.business_sub_id)) as productionName,
|
|
|
- cc1.NAME AS cClienteleName,
|
|
|
- cc2.NAME AS cClienteleSubName,
|
|
|
- cl1.NAME AS cClienteleContactName,
|
|
|
+ cc1.name AS cClienteleName,
|
|
|
+ cc2.name AS cClienteleSubName,
|
|
|
+ cl1.name AS cClienteleContactName,
|
|
|
cl1.mobile AS cMobile,
|
|
|
wtr.created as taskCreated
|
|
|
FROM
|
|
|
@@ -131,7 +131,7 @@
|
|
|
LEFT JOIN work_node_task wnt ON wnt.id = wtr.task_id
|
|
|
inner JOIN (
|
|
|
SELECT
|
|
|
- wn.NAME,
|
|
|
+ wn.name,
|
|
|
wn.CODE,
|
|
|
wfni.id,
|
|
|
wfni.business_id ,
|
|
|
@@ -206,8 +206,8 @@
|
|
|
(
|
|
|
( SELECT * FROM work_flow_log WHERE handler_id = #{todoVO.handlerId} and business_type='MAJOR_BUSINESS' ) wf
|
|
|
LEFT JOIN ( SELECT id, node_id, business_id ,state FROM work_flow_node_instance ) wfni ON wf.instance_id = wfni.id
|
|
|
- LEFT JOIN ( SELECT id, NAME FROM work_node WHERE deleted = 0 ) wn ON wn.id = wfni.node_id
|
|
|
- LEFT JOIN ( SELECT id, order_id, NAME FROM major WHERE deleted = 0 ) m ON m.id = wf.business_id
|
|
|
+ LEFT JOIN ( SELECT id, name FROM work_node WHERE deleted = 0 ) wn ON wn.id = wfni.node_id
|
|
|
+ LEFT JOIN ( SELECT id, order_id, name FROM major WHERE deleted = 0 ) m ON m.id = wf.business_id
|
|
|
LEFT JOIN user u ON u.id = wf.handler_id
|
|
|
)
|
|
|
<where>
|
|
|
@@ -279,7 +279,7 @@
|
|
|
LEFT JOIN work_node_task wnt ON wnt.id = wtr.task_id
|
|
|
INNER JOIN (
|
|
|
SELECT
|
|
|
- wn.NAME,
|
|
|
+ wn.name,
|
|
|
wn.CODE,
|
|
|
wfni.id,
|
|
|
wfni.business_id,
|
|
|
@@ -328,13 +328,13 @@
|
|
|
and p.created <= #{personal.endDate}
|
|
|
</if>
|
|
|
<if test="personal!=null and personal.nodeCode!=null and personal.nodeCode!=''">
|
|
|
- and wn.code = #{personal.nodeCode}
|
|
|
+ and wfni.code = #{personal.nodeCode}
|
|
|
</if>
|
|
|
<if test="personal!=null and personal.clientName!=null and personal.clientName!=''">
|
|
|
- and cc.NAME like concat('%',#{personal.clientName},'%')
|
|
|
+ and cc.name like concat('%',#{personal.clientName},'%')
|
|
|
</if>
|
|
|
<if test="personal!=null and personal.clientSubName!=null and personal.clientSubName!=''">
|
|
|
- and cc1.NAME like concat('%',#{personal.clientSubName},'%')
|
|
|
+ and cc1.name like concat('%',#{personal.clientSubName},'%')
|
|
|
</if>
|
|
|
<if test="personal!=null and personal.clientManager!=null and personal.clientManager!='' ">
|
|
|
and u.name like concat('%',#{personal.clientManager},'%')
|
|
|
@@ -428,7 +428,7 @@
|
|
|
work_task_record wtr
|
|
|
inner JOIN (
|
|
|
SELECT
|
|
|
- wn.NAME,
|
|
|
+ wn.name,
|
|
|
wn.CODE,
|
|
|
wfni.id,
|
|
|
wfni.business_id ,
|
|
|
@@ -469,7 +469,7 @@
|
|
|
LEFT JOIN work_node_task wnt ON wnt.id = wtr.task_id
|
|
|
INNER JOIN (
|
|
|
SELECT
|
|
|
- wn.NAME,
|
|
|
+ wn.name,
|
|
|
wn.CODE,
|
|
|
wfni.id,
|
|
|
wfni.business_id,
|
