diff --git a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml index 570c558..15dcb0b 100644 --- a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml @@ -58,8 +58,6 @@ f.PLS_ID, f.PLS_NAME, f.WORK_POSITION, - f.SAFETY_DEPARTMENT_ID, - f.SAFETY_USER_ID, f.VIDEO_PATH @@ -115,8 +113,6 @@ PLS_ID, PLS_NAME, WORK_POSITION, - SAFETY_DEPARTMENT_ID, - SAFETY_USER_ID, VIDEO_PATH @@ -172,8 +168,6 @@ #{PLS_ID}, #{PLS_NAME}, #{WORK_POSITION}, - #{SAFETY_DEPARTMENT_ID}, - #{SAFETY_USER_ID}, #{VIDEO_PATH} @@ -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