wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'origin/dev' into dev

pull/4/head
fangjiakai 2024-02-20 16:38:10 +08:00
parent bd4c1edabf 0d81a7688d
commit cfa5416c1b
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
View File

@ -58,8 +58,6 @@
f.PLS_ID,
f.PLS_NAME,
f.WORK_POSITION,
f.SAFETY_DEPARTMENT_ID,
f.SAFETY_USER_ID,
f.VIDEO_PATH
</sql>
@ -115,8 +113,6 @@
PLS_ID,
PLS_NAME,
WORK_POSITION,
SAFETY_DEPARTMENT_ID,
SAFETY_USER_ID,
VIDEO_PATH
</sql>
@ -172,8 +168,6 @@
#{PLS_ID},
#{PLS_NAME},
#{WORK_POSITION},
#{SAFETY_DEPARTMENT_ID},
#{SAFETY_USER_ID},
#{VIDEO_PATH}
</sql>
@ -266,8 +260,6 @@
PLS_NAME = #{PLS_NAME},
LONGITUDE =#{LONGITUDE},
LATITUDE =#{LATITUDE},
SAFETY_DEPARTMENT_ID =#{SAFETY_DEPARTMENT_ID},
SAFETY_USER_ID = #{SAFETY_USER_ID},
VIDEO_PATH = #{VIDEO_PATH}
where
HOTWORK_ID = #{HOTWORK_ID}
@ -318,13 +310,9 @@
stau.`NAME` as WORK_START_USER_NAME,
endo.`NAME` as WORK_END_DEPARTMENT_NAME,
endu.`NAME` as WORK_END_USER_NAME,
safo.`NAME` as SAFETY_DEPARTMENT_NAME,
safu.`NAME` as SAFETY_USER_NAME,
f.ANALYZE_TIME
FROM
bus_hotwork AS f
left join oa_department as safo on f.SAFETY_DEPARTMENT_ID = safo.DEPARTMENT_ID
left join sys_user as safu on f.SAFETY_USER_ID = safu.USER_ID
bus_hotwork f
left join oa_department as appo on f.APPLY_DEPARTMENT_ID = appo.DEPARTMENT_ID
left join sys_user as appu on f.APPLY_USER_ID = appu.USER_ID