From c7e8305bb26d876f149a14d655e0c2d8961854a5 Mon Sep 17 00:00:00 2001 From: chenxinying <1039655633@qq.com> Date: Fri, 1 Mar 2024 16:55:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A=E4=B8=AD?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BA=BA=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=90=8A?= =?UTF-8?q?=E8=A3=85=E4=BD=9C=E4=B8=9A=E5=AE=89=E5=85=A8=E6=8E=AA=E6=96=BD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=A8=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eightwork/impl/HoistingServiceImpl.java | 1 + .../datasource/eightwork/BlindBoardMapper.xml | 4 ++-- .../datasource/eightwork/BreakGroundMapper.xml | 4 ++-- .../datasource/eightwork/ConfinedspaceMapper.xml | 7 +++---- .../eightwork/ConfinedspaceToMeasuresMapper.xml | 15 ++++++++++++--- .../datasource/eightwork/ElectricityMapper.xml | 4 ++-- .../datasource/eightwork/HighWorkMapper.xml | 6 +++--- .../datasource/eightwork/HoistingMapper.xml | 4 ++-- .../eightwork/HoistingToMeasuresMapper.xml | 12 ++++++++---- .../datasource/eightwork/HotWorkMapper.xml | 3 +-- 10 files changed, 36 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/zcloud/service/eightwork/impl/HoistingServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/HoistingServiceImpl.java index 2046377..245553a 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/HoistingServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/HoistingServiceImpl.java @@ -271,6 +271,7 @@ public class HoistingServiceImpl implements HoistingService { measure.put("STATUS", json.get("STATUS")); measure.put("SIGN_PATH", json.get("SIGN_PATH")); measure.put("SIGN_TIME", json.get("SIGN_TIME")); + measure.put("ANSWER1", json.get("ANSWER1")); measure.put("IMG_PATH", json.get("IMG_PATH")); hoistingToMeasuresMapper.edit(measure); } diff --git a/src/main/resources/mybatis/datasource/eightwork/BlindBoardMapper.xml b/src/main/resources/mybatis/datasource/eightwork/BlindBoardMapper.xml index 9f24cc7..a06f6ac 100644 --- a/src/main/resources/mybatis/datasource/eightwork/BlindBoardMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/BlindBoardMapper.xml @@ -244,7 +244,7 @@ worko.`NAME` as WORKSHOP_DEPARTMENT_NAME, worku.`NAME` as WORKSHOP_USER_NAME, woro.`NAME` as WORK_USER_DEPARTMENT_NAME, - woru.`NAME` as WORK_USER_NAME, + woru.`NAME` as WORK_USER_USER_NAME, cono.`NAME` as CONFESS_DEPARTMENT_NAME, conu.`NAME` as CONFESS_USER_NAME, acco.`NAME` as ACCEPT_CONFESS_DEPARTMENT_NAME, @@ -351,7 +351,7 @@ stao.`NAME` as WORK_START_DEPARTMENT_NAME, stau.`NAME` as WORK_START_USER_NAME, woro.`NAME` as WORK_USER_DEPARTMENT_NAME, - woru.`NAME` as WORK_USER_NAME, + woru.`NAME` as WORK_USER_USER_NAME, worko.`NAME` as WORKSHOP_DEPARTMENT_NAME, worku.`NAME` as WORKSHOP_USER_NAME, log.STEP_NAME, diff --git a/src/main/resources/mybatis/datasource/eightwork/BreakGroundMapper.xml b/src/main/resources/mybatis/datasource/eightwork/BreakGroundMapper.xml index 8bff7ae..209411e 100644 --- a/src/main/resources/mybatis/datasource/eightwork/BreakGroundMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/BreakGroundMapper.xml @@ -255,7 +255,7 @@ f.SPECIAL_WORK, f.RISK_IDENTIFICATION, woro.`NAME` as WORK_USER_DEPARTMENT_NAME, - woru.`NAME` as WORK_USER_NAME, + woru.`NAME` as WORK_USER_USER_NAME, cono.`NAME` as CONFESS_DEPARTMENT_NAME, conu.`NAME` as CONFESS_USER_NAME, acco.`NAME` as ACCEPT_CONFESS_DEPARTMENT_NAME, @@ -382,7 +382,7 @@ endo.`NAME` as WORK_END_DEPARTMENT_NAME, endu.`NAME` as WORK_END_USER_NAME, woro.`NAME` as WORK_USER_DEPARTMENT_NAME, - woru.`NAME` as WORK_USER_NAME, + woru.`NAME` as WORK_USER_USER_NAME, log.STEP_NAME, log.NEXT_STEP_ID, log.NEXT_STEP_NAME, diff --git a/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml b/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml index ee41f01..9bbe15f 100644 --- a/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml @@ -227,8 +227,7 @@ MEDIUM_NAME = #{MEDIUM_NAME}, LIMITSPACE_ID = #{LIMITSPACE_ID}, WORK_USER_DEPARTMENT_ID =#{WORK_USER_DEPARTMENT_ID}, - LONGITUDE =#{LONGITUDE}, - LATITUDE =#{LATITUDE}, + WORK_POSITION =#{WORK_POSITION}, VIDEO_PATH = #{VIDEO_PATH} where CONFINEDSPACE_ID = #{CONFINEDSPACE_ID} @@ -254,7 +253,7 @@ f.SPECIAL_WORK, f.RISK_IDENTIFICATION, woro.`NAME` as WORK_USER_DEPARTMENT_NAME, - woru.`NAME` as WORK_USER_NAME, + woru.`NAME` as WORK_USER_USER_NAME, anao.`NAME` as ANALYZE_DEPARTMENT_NAME, anau.`NAME` as ANALYZE_USER_NAME, cono.`NAME` as CONFESS_DEPARTMENT_NAME, @@ -357,7 +356,7 @@ select , woro.`NAME` as WORK_USER_DEPARTMENT_NAME, - woru.`NAME` as WORK_USER_NAME, + woru.`NAME` as WORK_USER_USER_NAME, appo.`NAME` as APPLY_DEPARTMENT_NAME, appu.`NAME` as APPLY_USER_NAME, anao.`NAME` as ANALYZE_DEPARTMENT_NAME, diff --git a/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceToMeasuresMapper.xml b/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceToMeasuresMapper.xml index d79c658..91f86b6 100644 --- a/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceToMeasuresMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceToMeasuresMapper.xml @@ -21,7 +21,10 @@ f.CONFIRM_ID, f.SIGN_PATH, f.SIGN_TIME, - f.IMG_PATH + f.IMG_PATH, + f.ANSWER1, + f.ANSWER2, + f.ANSWER3 @@ -32,7 +35,10 @@ CONFINEDSPACETOMEASURES_ID, CONFIRM_ID, SIGN_PATH, - IMG_PATH + IMG_PATH, + ANSWER1, + ANSWER2, + ANSWER3 @@ -43,7 +49,10 @@ #{CONFINEDSPACETOMEASURES_ID}, #{CONFIRM_ID}, #{SIGN_PATH}, - #{IMG_PATH} + #{IMG_PATH}, + #{ANSWER1}, + #{ANSWER2}, + #{ANSWER3} diff --git a/src/main/resources/mybatis/datasource/eightwork/ElectricityMapper.xml b/src/main/resources/mybatis/datasource/eightwork/ElectricityMapper.xml index 2ba5748..708a33c 100644 --- a/src/main/resources/mybatis/datasource/eightwork/ElectricityMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/ElectricityMapper.xml @@ -321,7 +321,7 @@ bcu.NAME as GUARDIAN_USER_NAME, woro.`NAME` as WORK_USER_DEPARTMENT_NAME, - woru.`NAME` as WORK_USER_NAME, + woru.`NAME` as WORK_USER_USER_NAME, stao.`NAME` as WORK_START_DEPARTMENT_NAME, stau.`NAME` as WORK_START_USER_NAME, @@ -448,7 +448,7 @@ bcu.NAME as GUARDIAN_USER_NAME, woro.`NAME` as WORK_USER_DEPARTMENT_NAME, - woru.`NAME` as WORK_USER_NAME, + woru.`NAME` as WORK_USER_USER_NAME, stao.`NAME` as WORK_START_DEPARTMENT_NAME, stau.`NAME` as WORK_START_USER_NAME, diff --git a/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml index 022f0c3..434a4e6 100644 --- a/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml @@ -253,7 +253,7 @@ f.SPECIAL_WORK, f.RISK_IDENTIFICATION, woro.`NAME` as WORK_USER_DEPARTMENT_NAME, - woru.`NAME` as WORK_USER_NAME, + woru.`NAME` as WORK_USER_USER_NAME, cono.`NAME` as CONFESS_DEPARTMENT_NAME, conu.`NAME` as CONFESS_USER_NAME, acco.`NAME` as ACCEPT_CONFESS_DEPARTMENT_NAME, @@ -362,13 +362,13 @@ appro.`NAME` as APPROVE_DEPARTMENT_NAME, appru.`NAME` as APPROVE_USER_NAME, acceo.`NAME` as ACCEPT_DEPARTMENT_NAME, - acceu.`NAME` as ACCEPT_USER_NAME, + acceu.`NAME` as WORK_USER_USER_NAME, stao.`NAME` as WORK_START_DEPARTMENT_NAME, stau.`NAME` as WORK_START_USER_NAME, endo.`NAME` as WORK_END_DEPARTMENT_NAME, endu.`NAME` as WORK_END_USER_NAME, woro.`NAME` as WORK_USER_DEPARTMENT_NAME, - woru.`NAME` as WORK_USER_NAME, + woru.`NAME` as WORK_USER_USER_NAME, log.STEP_NAME, log.NEXT_STEP_ID, log.NEXT_STEP_NAME, diff --git a/src/main/resources/mybatis/datasource/eightwork/HoistingMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HoistingMapper.xml index 1c7532b..18315d5 100644 --- a/src/main/resources/mybatis/datasource/eightwork/HoistingMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/HoistingMapper.xml @@ -279,7 +279,7 @@ appo.`NAME` as APPLY_DEPARTMENT_NAME, appu.`NAME` as APPLY_USER_NAME, woro.`NAME` as WORK_USER_DEPARTMENT_NAME, - woru.`NAME` as WORK_USER_NAME, + woru.`NAME` as WORK_USER_USER_NAME, cono.`NAME` as CONFESS_DEPARTMENT_NAME, conu.`NAME` as CONFESS_USER_NAME, acco.`NAME` as ACCEPT_CONFESS_DEPARTMENT_NAME, @@ -406,7 +406,7 @@ proo.`NAME` as PROJECT_MANAGER_DEPARTMENT_NAME, prou.`NAME` as PROJECT_MANAGER_USER_NAME, woro.`NAME` as WORK_USER_DEPARTMENT_NAME, - woru.`NAME` as WORK_USER_NAME, + woru.`NAME` as WORK_USER_USER_NAME, appo.`NAME` as APPLY_DEPARTMENT_NAME, appu.`NAME` as APPLY_USER_NAME, log.STEP_NAME, diff --git a/src/main/resources/mybatis/datasource/eightwork/HoistingToMeasuresMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HoistingToMeasuresMapper.xml index a771a9e..8708f13 100644 --- a/src/main/resources/mybatis/datasource/eightwork/HoistingToMeasuresMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/HoistingToMeasuresMapper.xml @@ -21,7 +21,8 @@ f.CONFIRM_ID, f.SIGN_PATH, f.SIGN_TIME, - f.IMG_PATH + f.IMG_PATH, + f.ANSWER1 @@ -33,7 +34,8 @@ CONFIRM_ID, SIGN_PATH, SIGN_TIME, - IMG_PATH + IMG_PATH, + ANSWER1 @@ -45,7 +47,8 @@ #{CONFIRM_ID}, #{SIGN_PATH}, #{SIGN_TIME}, - #{IMG_PATH} + #{IMG_PATH}, + #{ANSWER1} @@ -94,7 +97,8 @@ STATUS = #{STATUS}, SIGN_PATH = #{SIGN_PATH}, IMG_PATH = #{IMG_PATH}, - SIGN_TIME = #{SIGN_TIME} + SIGN_TIME = #{SIGN_TIME}, + ANSWER1 = #{ANSWER1} where HOISTINGTOMEASURES_ID = #{HOISTINGTOMEASURES_ID} diff --git a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml index 0911ed3..b69ba17 100644 --- a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml @@ -258,8 +258,7 @@ ACCEPT_TIME = #{ACCEPT_TIME}, PLS_ID = #{PLS_ID}, PLS_NAME = #{PLS_NAME}, - LONGITUDE =#{LONGITUDE}, - LATITUDE =#{LATITUDE}, + WORK_POSITION =#{WORK_POSITION}, VIDEO_PATH = #{VIDEO_PATH} where HOTWORK_ID = #{HOTWORK_ID}