diff --git a/src/main/resources/mybatis/datasource/gf/ConfinedSpaceMapper.xml b/src/main/resources/mybatis/datasource/gf/ConfinedSpaceMapper.xml index 5dbd21d5..fe3e59d0 100644 --- a/src/main/resources/mybatis/datasource/gf/ConfinedSpaceMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/ConfinedSpaceMapper.xml @@ -73,7 +73,9 @@ f.ACCEPT_CONFESS_DEPARTMENT_ID, f.ACCEPT_CONFESS_USER_ID, f.ACCEPT_CONFESS_USER_SIGNER_PATH, - f.ACCEPT_CONFESS_USER_SIGNER_TIME + f.ACCEPT_CONFESS_USER_SIGNER_TIME, + f.WORK_LATITUDE, + f.WORK_LONGITUDE @@ -137,7 +139,9 @@ ACCEPT_CONFESS_DEPARTMENT_ID, ACCEPT_CONFESS_USER_ID, ACCEPT_CONFESS_USER_SIGNER_PATH, - ACCEPT_CONFESS_USER_SIGNER_TIME + ACCEPT_CONFESS_USER_SIGNER_TIME, + WORK_LATITUDE, + WORK_LONGITUDE @@ -202,7 +206,9 @@ #{ACCEPT_CONFESS_DEPARTMENT_ID}, #{ACCEPT_CONFESS_USER_ID}, #{ACCEPT_CONFESS_USER_SIGNER_PATH}, - #{ACCEPT_CONFESS_USER_SIGNER_TIME} + #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + #{WORK_LATITUDE}, + #{WORK_LONGITUDE} @@ -487,6 +493,8 @@ f.ACCEPT_CONFESS_USER_ID, f.ACCEPT_CONFESS_USER_SIGNER_PATH, f.ACCEPT_CONFESS_USER_SIGNER_TIME, + f.WORK_LATITUDE, + f.WORK_LONGITUDE, (SELECT replace(a.ANALYZE_TIME,'-','/') from GF_CONFINEDSPACEGAS a where a.ISDELETE = '0' AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID ORDER BY @@ -615,6 +623,8 @@ f.CONFESS_USER_SIGNER_TIME, f.ACCEPT_CONFESS_DEPARTMENT_ID, f.ACCEPT_CONFESS_USER_ID, + f.WORK_LATITUDE, + f.WORK_LONGITUDE, IFNULL((SELECT a.ANALYZE_TIME from GF_confinedspacegas a where a.ISDELETE = '0' AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID ORDER BY @@ -845,6 +855,8 @@ f.CONFESS_USER_SIGNER_TIME, f.ACCEPT_CONFESS_DEPARTMENT_ID, f.ACCEPT_CONFESS_USER_ID, + f.WORK_LATITUDE, + f.WORK_LONGITUDE, IFNULL((SELECT replace(a.ANALYZE_TIME,'-','/') from GF_confinedspacegas a where a.ISDELETE = '0' AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID ORDER BY @@ -1067,6 +1079,8 @@ f.CONFESS_USER_SIGNER_TIME, f.ACCEPT_CONFESS_DEPARTMENT_ID, f.ACCEPT_CONFESS_USER_ID, + f.WORK_LATITUDE, + f.WORK_LONGITUDE, IFNULL((SELECT a.ANALYZE_TIME from gf_confinedspacegas a where a.ISDELETE = '0' AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID ORDER BY