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

八项作业中作业人显示，吊装作业安全措施添加吨数

pull/5/head
chenxinying 2024-03-01 16:55:50 +08:00
parent f26dbe0980
commit c7e8305bb2
10 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zcloud/service/eightwork/impl/HoistingServiceImpl.java
View File

@ -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);
}

4
src/main/resources/mybatis/datasource/eightwork/BlindBoardMapper.xml
View File

@ -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,

4
src/main/resources/mybatis/datasource/eightwork/BreakGroundMapper.xml
View File

@ -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,

7
src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml
View File

@ -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
<include refid="Field"></include>,
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,

15
src/main/resources/mybatis/datasource/eightwork/ConfinedspaceToMeasuresMapper.xml
View File

@ -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
</sql>
<!-- 字段用于新增 -->
@ -32,7 +35,10 @@
CONFINEDSPACETOMEASURES_ID,
CONFIRM_ID,
SIGN_PATH,
IMG_PATH
IMG_PATH,
ANSWER1,
ANSWER2,
ANSWER3
</sql>
<!-- 字段值 -->
@ -43,7 +49,10 @@
#{CONFINEDSPACETOMEASURES_ID},
#{CONFIRM_ID},
#{SIGN_PATH},
#{IMG_PATH}
#{IMG_PATH},
#{ANSWER1},
#{ANSWER2},
#{ANSWER3}
</sql>
<!-- 新增-->

4
src/main/resources/mybatis/datasource/eightwork/ElectricityMapper.xml
View File

@ -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,

6
src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml
View File

@ -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,

4
src/main/resources/mybatis/datasource/eightwork/HoistingMapper.xml
View File

@ -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,

12
src/main/resources/mybatis/datasource/eightwork/HoistingToMeasuresMapper.xml
View File

@ -21,7 +21,8 @@
f.CONFIRM_ID,
f.SIGN_PATH,
f.SIGN_TIME,
f.IMG_PATH
f.IMG_PATH,
f.ANSWER1
</sql>
<!-- 字段用于新增 -->
@ -33,7 +34,8 @@
CONFIRM_ID,
SIGN_PATH,
SIGN_TIME,
IMG_PATH
IMG_PATH,
ANSWER1
</sql>
<!-- 字段值 -->
@ -45,7 +47,8 @@
#{CONFIRM_ID},
#{SIGN_PATH},
#{SIGN_TIME},
#{IMG_PATH}
#{IMG_PATH},
#{ANSWER1}
</sql>
<!-- 新增-->
@ -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}
</update>

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

@ -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}