feat: bug-384 用户端需要支持管理端用户添加工单和后续操作
This commit is contained in:
parent
109b49d5ec
commit
df47016907
|
|
@ -155,7 +155,7 @@
|
||||||
LEFT JOIN app_user u ON t.user_id=u.id
|
LEFT JOIN app_user u ON t.user_id=u.id
|
||||||
LEFT JOIN admin_user au ON t.user_id=au.id
|
LEFT JOIN admin_user au ON t.user_id=au.id
|
||||||
LEFT JOIN app_area a2 ON u.area_id=a2.id
|
LEFT JOIN app_area a2 ON u.area_id=a2.id
|
||||||
LEFT JOIN device d ON t.device_no=d.device_no
|
LEFT JOIN device d ON t.device_no=d.device_no and d.data_valid_state=1
|
||||||
LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type
|
LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type
|
||||||
LEFT JOIN dictionary_item di ON d.warranty_state=di.id
|
LEFT JOIN dictionary_item di ON d.warranty_state=di.id
|
||||||
LEFT JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=1
|
LEFT JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=1
|
||||||
|
|
@ -178,7 +178,7 @@
|
||||||
LEFT JOIN app_user u ON t.user_id=u.id
|
LEFT JOIN app_user u ON t.user_id=u.id
|
||||||
LEFT JOIN admin_user au ON t.user_id=au.id
|
LEFT JOIN admin_user au ON t.user_id=au.id
|
||||||
LEFT JOIN app_area a2 ON u.area_id=a2.id
|
LEFT JOIN app_area a2 ON u.area_id=a2.id
|
||||||
LEFT JOIN device d ON t.device_no=d.device_no
|
LEFT JOIN device d ON t.device_no=d.device_no and d.data_valid_state=1
|
||||||
LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type
|
LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type
|
||||||
LEFT JOIN dictionary_item di ON d.warranty_state=di.id
|
LEFT JOIN dictionary_item di ON d.warranty_state=di.id
|
||||||
LEFT JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=1
|
LEFT JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=1
|
||||||
|
|
@ -202,7 +202,7 @@
|
||||||
LEFT JOIN admin_user au ON t.user_id=au.id
|
LEFT JOIN admin_user au ON t.user_id=au.id
|
||||||
LEFT JOIN app_area a2 ON u.area_id=a2.id
|
LEFT JOIN app_area a2 ON u.area_id=a2.id
|
||||||
INNER JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=1
|
INNER JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=1
|
||||||
LEFT JOIN device d ON t.device_no=d.device_no
|
LEFT JOIN device d ON t.device_no=d.device_no and d.data_valid_state=1
|
||||||
LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type
|
LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type
|
||||||
LEFT JOIN dictionary_item di ON d.warranty_state=di.id
|
LEFT JOIN dictionary_item di ON d.warranty_state=di.id
|
||||||
LEFT JOIN admin_user auc ON t.cqm=auc.id
|
LEFT JOIN admin_user auc ON t.cqm=auc.id
|
||||||
|
|
@ -224,7 +224,7 @@
|
||||||
LEFT JOIN admin_user au ON t.user_id=au.id
|
LEFT JOIN admin_user au ON t.user_id=au.id
|
||||||
LEFT JOIN app_area a2 ON u.area_id=a2.id
|
LEFT JOIN app_area a2 ON u.area_id=a2.id
|
||||||
INNER JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=1
|
INNER JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=1
|
||||||
LEFT JOIN device d ON t.device_no=d.device_no
|
LEFT JOIN device d ON t.device_no=d.device_no and d.data_valid_state=1
|
||||||
LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type
|
LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type
|
||||||
LEFT JOIN dictionary_item di ON d.warranty_state=di.id
|
LEFT JOIN dictionary_item di ON d.warranty_state=di.id
|
||||||
LEFT JOIN admin_user auc ON t.cqm=auc.id
|
LEFT JOIN admin_user auc ON t.cqm=auc.id
|
||||||
|
|
@ -260,7 +260,7 @@
|
||||||
<if test="favouritesId>0">
|
<if test="favouritesId>0">
|
||||||
AND tf.favorites_id=#{favouritesId}
|
AND tf.favorites_id=#{favouritesId}
|
||||||
</if>
|
</if>
|
||||||
LEFT JOIN device d ON t.device_no=d.device_no
|
LEFT JOIN device d ON t.device_no=d.device_no and d.data_valid_state=1
|
||||||
LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type
|
LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type
|
||||||
LEFT JOIN dictionary_item di ON d.warranty_state=di.id
|
LEFT JOIN dictionary_item di ON d.warranty_state=di.id
|
||||||
LEFT JOIN admin_user auc ON t.cqm=auc.id
|
LEFT JOIN admin_user auc ON t.cqm=auc.id
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue