diff --git a/pom.xml b/pom.xml
index a046f419..dcda5e8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -210,6 +210,19 @@
${batik.version}
+
+
+ org.apache.rocketmq
+ rocketmq-client-java
+ 5.0.5
+
+
+ org.apache.rocketmq
+ rocketmq-spring-boot-starter
+ 2.2.2
+
+
+
com.aliyun
aliyun-java-sdk-core
@@ -461,7 +474,11 @@
hutool-all
5.0.5
-
+
+ org.projectlombok
+ lombok
+
+
+ and f.UNIT_ID = #{UNIT_ID}
+
+
+ and f.VALIDITY_TIME_END = ]]> #{endday}
+
+ order by f.CREATTIME desc
+
+
delete from
diff --git a/src/main/resources/mybatis/datasource/eightWork/EightWorkCfdMapper.xml b/src/main/resources/mybatis/datasource/eightWork/EightWorkCfdMapper.xml
new file mode 100644
index 00000000..dd86e561
--- /dev/null
+++ b/src/main/resources/mybatis/datasource/eightWork/EightWorkCfdMapper.xml
@@ -0,0 +1,275 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml
index bbdcd6ca..c23306b4 100644
--- a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml
+++ b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationMapper.xml
@@ -179,55 +179,29 @@
left join sys_user u on f.CREATOR = u.USER_ID
left join oa_department d on d.DEPARTMENT_ID = u.DEPARTMENT_ID
left join vi_user_all ua on ua.USER_ID = f.OPERATOR
- where f.ISDELETE = '0'
+ left join sys_user uu on uu.USER_ID = #{pd.loginUserId} and uu.DEPARTMENT_ID = fu.USER_ID
+ where
+
+
+ (
+
+ f.ISDELETE = '0'
and
( f.JOB_NUMBER LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or f.HOT_WORK_POSITION LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
)
-
-
-
- and f.CREATOR = #{pd.CREATOR} and f.state !='-4'
-
-
- and f.STATE in ('1','2','3','4','5','6'
- ,'7','8','9')
-
-
- and (f.STATE in ('11','-3'))
-
-
-
- and (
- (
- f.STATE >= 1
- and f.STATE <= 11
- )
- or f.STATE = '-3'
- )
-
-
-
-
-
-
- and (f.STATE = #{pd.STATE})
-
-
-
-
-
- and f.CORPINFO_ID = #{pd.CORPINFO_ID}
-
-
- and (f.CREATOR = #{pd.CREATOR})
-
-
- and (HOT_WORK_LEVEL_INDEX = #{pd.HOT_WORK_LEVEL_INDEX})
-
-
+
+ and f.CORPINFO_ID = #{pd.CORPINFO_ID}
+
+
+ and (f.CREATOR = #{pd.CREATOR})
+
+
+ and (HOT_WORK_LEVEL_INDEX = #{pd.HOT_WORK_LEVEL_INDEX})
+
+
@@ -300,6 +274,40 @@
and f.HOTWORKAPPLICATION_ID in (select FOREIGN_KEY from bus_hotworkapplicationuser houtUser LEFT JOIN sus_user u on u.user_id = houtUser.USER_ID where u.USERNAME = CONCAT(CONCAT('%', #{pd.keyApproveUserName}),'%') and STATE = '12')
+
+
+
+ and f.CREATOR = #{pd.CREATOR} and f.state !='-4'
+
+
+ and f.STATE in ('1','2','3','4','5','6'
+ ,'7','8','9')
+
+
+ and (f.STATE in ('11','-3'))
+
+
+
+ and (
+ (
+ f.STATE >= 1
+ and f.STATE <= 11
+ )
+ or f.STATE = '-3'
+ )
+
+
+
+
+
+ and (f.STATE != '11')
+ ) or (uu.USER_ID is not null and f.ISDELETE = '0')
+
+
+ and (f.STATE = #{pd.STATE})
+
+
+
group by f.HOTWORKAPPLICATION_ID
ORDER BY f.CREATTIME desc
@@ -541,4 +549,12 @@
GROUP BY HOTWORKAPPLICATION_ID
ORDER BY f.OPERATTIME desc
+
+
diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml
index 58b67881..c717f435 100644
--- a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml
+++ b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml
@@ -319,4 +319,41 @@
order by CREATTIME
+
+
diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkAcceptUserCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkAcceptUserCfdMapper.xml
new file mode 100644
index 00000000..75f2b27d
--- /dev/null
+++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkAcceptUserCfdMapper.xml
@@ -0,0 +1,217 @@
+
+
+
+
+
+
+
+ BUS_HOTWORK_ACCEPTUSER_CFD
+
+
+
+
+ SYS_DICTIONARIES
+
+
+
+ f.ACCEPT_CONFESS_ID,
+ f.HOTWORK_ID,
+ f.CORPINFO_ID,
+ f.ISDELETE,
+ f.OPERATTIME,
+ f.OPERATOR,
+ f.ACCEPT_CONFESS_DEPARTMENT_ID,
+ f.ACCEPT_CONFESS_USER_ID,
+ f.ACCEPT_CONFESS_USER_SIGNER_PATH,
+ f.ACCEPT_CONFESS_USER_SIGNER_TIME,
+ f.ISSELF,
+ f.ACCEPT_USER_ID,
+ f.ACCEPT_USER_SIGNER_PATH,
+ f.ACCEPT_USER_SIGNER_TIME,
+ f.ACCEPT_DEPARTMENT_ID
+
+
+
+
+ ACCEPT_CONFESS_ID,
+ HOTWORK_ID,
+ CORPINFO_ID,
+ ISDELETE,
+ OPERATTIME,
+ OPERATOR,
+ ACCEPT_CONFESS_DEPARTMENT_ID,
+ ACCEPT_CONFESS_USER_ID,
+ ACCEPT_CONFESS_USER_SIGNER_PATH,
+ ACCEPT_CONFESS_USER_SIGNER_TIME,
+ ISSELF,
+ ACCEPT_USER_ID,
+ ACCEPT_USER_SIGNER_PATH,
+ ACCEPT_USER_SIGNER_TIME,
+ ACCEPT_DEPARTMENT_ID
+
+
+
+
+
+ #{ACCEPT_CONFESS_ID},
+ #{HOTWORK_ID},
+ #{CORPINFO_ID},
+ #{ISDELETE},
+ #{OPERATTIME},
+ #{OPERATOR},
+ #{ACCEPT_CONFESS_DEPARTMENT_ID},
+ #{ACCEPT_CONFESS_USER_ID},
+ #{ACCEPT_CONFESS_USER_SIGNER_PATH},
+ #{ACCEPT_CONFESS_USER_SIGNER_TIME},
+ #{ISSELF},
+ #{ACCEPT_USER_ID},
+ #{ACCEPT_USER_SIGNER_PATH},
+ #{ACCEPT_USER_SIGNER_TIME},
+ #{ACCEPT_DEPARTMENT_ID}
+
+
+
+
+ insert into
+
+ (
+
+ ) values (
+
+ )
+
+
+
+
+ delete from
+
+ where
+ ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID}
+
+
+
+
+
+
+ update
+
+ set
+ ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID},
+ HOTWORK_ID = #{HOTWORK_ID},
+ CORPINFO_ID = #{CORPINFO_ID},
+ OPERATTIME = #{OPERATTIME},
+ OPERATOR = #{OPERATOR},
+ ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID},
+ ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID},
+ ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH},
+ ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME},
+ ISSELF = #{ISSELF}
+ where
+ ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ update
+
+ set
+ ISDELETE = '1'
+ where
+ ACCEPT_CONFESS_ID in
+
+ #{item}
+
+
+
+
+
+
+
diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml
new file mode 100644
index 00000000..df9170bb
--- /dev/null
+++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml
@@ -0,0 +1,1713 @@
+
+
+
+
+
+
+ BUS_HOTWORK_CFD
+
+
+
+
+ SYS_DICTIONARIES
+
+
+
+
+ f.CORPINFO_ID,
+ f.ISDELETE,
+ f.CREATTIME,
+ f.CREATOR,
+ f.OPERATTIME,
+ f.OPERATOR,
+ f.CHECK_NO,
+ f.WORK_CONTENT,
+ f.WORK_START_DATE,
+ f.WORK_END_DATE,
+ f.CONFIRM_DEPARTMENT_ID,
+ f.CONFIRM_USER_ID,
+ f.CONFIRM_USER_SIGNER_PATH,
+ f.CONFIRM_USER_SIGNER_TIME,
+ f.AUDIT_DEPARTMENT_ID,
+ f.AUDIT_USER_ID,
+ f.AUDIT_USER_SIGNER_PATH,
+ f.AUDIT_USER_SIGNER_TIME,
+ f.APPROVE_DEPARTMENT_ID,
+ f.APPROVE_USER_ID,
+ f.APPROVE_USER_SIGNER_PATH,
+ f.APPROVE_USER_SIGNER_TIME,
+ f.APPLY_STATUS,
+ f.CONFIRM_CONTENT,
+ f.AUDIT_CONTENT,
+ f.APPROVE_CONTENT,
+ f.OTHER_PROTECTIVE_MEASURES,
+ f.ACCEPT_DEPARTMENT_ID,
+ f.ACCEPT_USER_ID,
+ f.ACCEPT_USER_SIGNER_PATH,
+ f.ACCEPT_USER_SIGNER_TIME,
+ f.ACCEPT_CONTENT,
+ f.APPLY_DEPARTMENT_ID,
+ f.APPLY_USER_ID,
+ f.WORK_PLACE,
+ f.WORK_LEVEL,
+ f.WORK_USER,
+ f.WORK_LONGITUDE,
+ f.WORK_LATITUDE,
+ f.SPECIAL_WORK,
+ f.RISK_IDENTIFICATION,
+ f.WORK_MANAGER,
+ f.ANALYZE_DEPARTMENT_ID,
+ f.ANALYZE_USER_ID,
+ f.GUARDIAN_DEPARTMENT_ID,
+ f.GUARDIAN_USER_ID,
+ f.GUARDIAN_USER_SIGNER_PATH,
+ f.GUARDIAN_USER_SIGNER_TIME,
+ f.GUARDIAN_CONTENT,
+ f.LEADER_DEPARTMENT_ID,
+ f.LEADER_USER_ID,
+ f.LEADER_USER_SIGNER_PATH,
+ f.LEADER_USER_SIGNER_TIME,
+ f.LEADER_CONTENT,
+ f.MONITOR_DEPARTMENT_ID,
+ f.MONITOR_USER_ID,
+ f.MONITOR_USER_SIGNER_PATH,
+ f.MONITOR_USER_SIGNER_TIME,
+ f.MONITOR_CONTENT,
+ f.CONFESS_USER,
+ f.EDUCATE_USER,
+ f.ACCEPT_EDUCATE_USER,
+ f.TRIAL_USER,
+ f.WORK_FUNCTION,
+ f.GUARDIAN_USER,
+ f.HOTWORK_ID,
+ f.CONFESS_DEPARTMENT_ID,
+ f.CONFESS_USER_ID,
+ f.CONFESS_USER_SIGNER_PATH,
+ f.CONFESS_USER_SIGNER_TIME,
+ f.ACCEPT_CONFESS_DEPARTMENT_ID,
+ f.ACCEPT_CONFESS_USER_ID,
+ f.ACCEPT_CONFESS_USER_SIGNER_PATH,
+ f.ACCEPT_CONFESS_USER_SIGNER_TIME,
+ f.ANALYZE_TIME
+
+
+
+
+ CORPINFO_ID,
+ ISDELETE,
+ CREATTIME,
+ CREATOR,
+ OPERATTIME,
+ OPERATOR,
+ CHECK_NO,
+ WORK_CONTENT,
+ WORK_START_DATE,
+ WORK_END_DATE,
+ CONFIRM_DEPARTMENT_ID,
+ CONFIRM_USER_ID,
+ CONFIRM_USER_SIGNER_PATH,
+ CONFIRM_USER_SIGNER_TIME,
+ AUDIT_DEPARTMENT_ID,
+ AUDIT_USER_ID,
+ AUDIT_USER_SIGNER_PATH,
+ AUDIT_USER_SIGNER_TIME,
+ APPROVE_DEPARTMENT_ID,
+ APPROVE_USER_ID,
+ APPROVE_USER_SIGNER_PATH,
+ APPROVE_USER_SIGNER_TIME,
+ APPLY_STATUS,
+ CONFIRM_CONTENT,
+ AUDIT_CONTENT,
+ APPROVE_CONTENT,
+ OTHER_PROTECTIVE_MEASURES,
+ ACCEPT_DEPARTMENT_ID,
+ ACCEPT_USER_ID,
+ ACCEPT_USER_SIGNER_PATH,
+ ACCEPT_USER_SIGNER_TIME,
+ ACCEPT_CONTENT,
+ APPLY_DEPARTMENT_ID,
+ APPLY_USER_ID,
+ WORK_PLACE,
+ WORK_LEVEL,
+ WORK_USER,
+ WORK_LONGITUDE,
+ WORK_LATITUDE,
+ SPECIAL_WORK,
+ RISK_IDENTIFICATION,
+ WORK_MANAGER,
+ ANALYZE_DEPARTMENT_ID,
+ ANALYZE_USER_ID,
+ GUARDIAN_DEPARTMENT_ID,
+ GUARDIAN_USER_ID,
+ GUARDIAN_USER_SIGNER_PATH,
+ GUARDIAN_USER_SIGNER_TIME,
+ GUARDIAN_CONTENT,
+ LEADER_DEPARTMENT_ID,
+ LEADER_USER_ID,
+ LEADER_USER_SIGNER_PATH,
+ LEADER_USER_SIGNER_TIME,
+ LEADER_CONTENT,
+ MONITOR_DEPARTMENT_ID,
+ MONITOR_USER_ID,
+ MONITOR_USER_SIGNER_PATH,
+ MONITOR_USER_SIGNER_TIME,
+ MONITOR_CONTENT,
+ CONFESS_USER,
+ EDUCATE_USER,
+ ACCEPT_EDUCATE_USER,
+ TRIAL_USER,
+ WORK_FUNCTION,
+ GUARDIAN_USER,
+ HOTWORK_ID,
+ CONFESS_DEPARTMENT_ID,
+ CONFESS_USER_ID,
+ CONFESS_USER_SIGNER_PATH,
+ CONFESS_USER_SIGNER_TIME,
+ ACCEPT_CONFESS_DEPARTMENT_ID,
+ ACCEPT_CONFESS_USER_ID,
+ ACCEPT_CONFESS_USER_SIGNER_PATH,
+ ACCEPT_CONFESS_USER_SIGNER_TIME,
+ ANALYZE_TIME
+
+
+
+
+ #{CORPINFO_ID},
+ #{ISDELETE},
+ #{CREATTIME},
+ #{CREATOR},
+ #{OPERATTIME},
+ #{OPERATOR},
+ #{CHECK_NO},
+ #{WORK_CONTENT},
+ #{WORK_START_DATE},
+ #{WORK_END_DATE},
+ #{CONFIRM_DEPARTMENT_ID},
+ #{CONFIRM_USER_ID},
+ #{CONFIRM_USER_SIGNER_PATH},
+ #{CONFIRM_USER_SIGNER_TIME},
+ #{AUDIT_DEPARTMENT_ID},
+ #{AUDIT_USER_ID},
+ #{AUDIT_USER_SIGNER_PATH},
+ #{AUDIT_USER_SIGNER_TIME},
+ #{APPROVE_DEPARTMENT_ID},
+ #{APPROVE_USER_ID},
+ #{APPROVE_USER_SIGNER_PATH},
+ #{APPROVE_USER_SIGNER_TIME},
+ #{APPLY_STATUS},
+ #{CONFIRM_CONTENT},
+ #{AUDIT_CONTENT},
+ #{APPROVE_CONTENT},
+ #{OTHER_PROTECTIVE_MEASURES},
+ #{ACCEPT_DEPARTMENT_ID},
+ #{ACCEPT_USER_ID},
+ #{ACCEPT_USER_SIGNER_PATH},
+ #{ACCEPT_USER_SIGNER_TIME},
+ #{ACCEPT_CONTENT},
+ #{APPLY_DEPARTMENT_ID},
+ #{APPLY_USER_ID},
+ #{WORK_PLACE},
+ #{WORK_LEVEL},
+ #{WORK_USER},
+ #{WORK_LONGITUDE},
+ #{WORK_LATITUDE},
+ #{SPECIAL_WORK},
+ #{RISK_IDENTIFICATION},
+ #{WORK_MANAGER},
+ #{ANALYZE_DEPARTMENT_ID},
+ #{ANALYZE_USER_ID},
+ #{GUARDIAN_DEPARTMENT_ID},
+ #{GUARDIAN_USER_ID},
+ #{GUARDIAN_USER_SIGNER_PATH},
+ #{GUARDIAN_USER_SIGNER_TIME},
+ #{GUARDIAN_CONTENT},
+ #{LEADER_DEPARTMENT_ID},
+ #{LEADER_USER_ID},
+ #{LEADER_USER_SIGNER_PATH},
+ #{LEADER_USER_SIGNER_TIME},
+ #{LEADER_CONTENT},
+ #{MONITOR_DEPARTMENT_ID},
+ #{MONITOR_USER_ID},
+ #{MONITOR_USER_SIGNER_PATH},
+ #{MONITOR_USER_SIGNER_TIME},
+ #{MONITOR_CONTENT},
+ #{CONFESS_USER},
+ #{EDUCATE_USER},
+ #{ACCEPT_EDUCATE_USER},
+ #{TRIAL_USER},
+ #{WORK_FUNCTION},
+ #{GUARDIAN_USER},
+ #{HOTWORK_ID},
+ #{CONFESS_DEPARTMENT_ID},
+ #{CONFESS_USER_ID},
+ #{CONFESS_USER_SIGNER_PATH},
+ #{CONFESS_USER_SIGNER_TIME},
+ #{ACCEPT_CONFESS_DEPARTMENT_ID},
+ #{ACCEPT_CONFESS_USER_ID},
+ #{ACCEPT_CONFESS_USER_SIGNER_PATH},
+ #{ACCEPT_CONFESS_USER_SIGNER_TIME},
+ #{ANALYZE_TIME}
+
+
+
+
+ insert into
+
+ (
+
+ ) values (
+
+ )
+
+
+
+
+ update
+
+ set
+ ISDELETE = '1'
+ where
+ HOTWORK_ID = #{HOTWORK_ID}
+
+
+ update
+
+ set
+ ANALYZE_TIME = #{ANALYZE_TIME}
+ where
+ HOTWORK_ID = #{HOTWORK_ID}
+
+
+
+ update
+
+ set
+ CORPINFO_ID = #{CORPINFO_ID},
+ ISDELETE = #{ISDELETE},
+ CREATTIME = #{CREATTIME},
+ CREATOR = #{CREATOR},
+ OPERATTIME = #{OPERATTIME},
+ OPERATOR = #{OPERATOR},
+ CHECK_NO = #{CHECK_NO},
+ WORK_CONTENT = #{WORK_CONTENT},
+ WORK_START_DATE = #{WORK_START_DATE},
+ WORK_END_DATE = #{WORK_END_DATE},
+ CONFIRM_DEPARTMENT_ID = #{CONFIRM_DEPARTMENT_ID},
+ CONFIRM_USER_ID = #{CONFIRM_USER_ID},
+ CONFIRM_USER_SIGNER_PATH = #{CONFIRM_USER_SIGNER_PATH},
+ CONFIRM_USER_SIGNER_TIME = #{CONFIRM_USER_SIGNER_TIME},
+ AUDIT_DEPARTMENT_ID = #{AUDIT_DEPARTMENT_ID},
+ AUDIT_USER_ID = #{AUDIT_USER_ID},
+ AUDIT_USER_SIGNER_PATH = #{AUDIT_USER_SIGNER_PATH},
+ AUDIT_USER_SIGNER_TIME = #{AUDIT_USER_SIGNER_TIME},
+ APPROVE_DEPARTMENT_ID = #{APPROVE_DEPARTMENT_ID},
+ APPROVE_USER_ID = #{APPROVE_USER_ID},
+ APPROVE_USER_SIGNER_PATH = #{APPROVE_USER_SIGNER_PATH},
+ APPROVE_USER_SIGNER_TIME = #{APPROVE_USER_SIGNER_TIME},
+ APPLY_STATUS = #{APPLY_STATUS},
+ CONFIRM_CONTENT = #{CONFIRM_CONTENT},
+ AUDIT_CONTENT = #{AUDIT_CONTENT},
+ APPROVE_CONTENT = #{APPROVE_CONTENT},
+ OTHER_PROTECTIVE_MEASURES = #{OTHER_PROTECTIVE_MEASURES},
+ ACCEPT_DEPARTMENT_ID = #{ACCEPT_DEPARTMENT_ID},
+ ACCEPT_USER_ID = #{ACCEPT_USER_ID},
+ ACCEPT_USER_SIGNER_PATH = #{ACCEPT_USER_SIGNER_PATH},
+ ACCEPT_USER_SIGNER_TIME = #{ACCEPT_USER_SIGNER_TIME},
+ ACCEPT_CONTENT = #{ACCEPT_CONTENT},
+ APPLY_DEPARTMENT_ID = #{APPLY_DEPARTMENT_ID},
+ APPLY_USER_ID = #{APPLY_USER_ID},
+ WORK_PLACE = #{WORK_PLACE},
+ WORK_LEVEL = #{WORK_LEVEL},
+ WORK_USER = #{WORK_USER},
+ WORK_LONGITUDE = #{WORK_LONGITUDE},
+ WORK_LATITUDE = #{WORK_LATITUDE},
+ SPECIAL_WORK = #{SPECIAL_WORK},
+ RISK_IDENTIFICATION = #{RISK_IDENTIFICATION},
+ WORK_MANAGER = #{WORK_MANAGER},
+ ANALYZE_DEPARTMENT_ID = #{ANALYZE_DEPARTMENT_ID},
+ ANALYZE_USER_ID = #{ANALYZE_USER_ID},
+ GUARDIAN_DEPARTMENT_ID = #{GUARDIAN_DEPARTMENT_ID},
+ GUARDIAN_USER_ID = #{GUARDIAN_USER_ID},
+ GUARDIAN_USER_SIGNER_PATH = #{GUARDIAN_USER_SIGNER_PATH},
+ GUARDIAN_USER_SIGNER_TIME = #{GUARDIAN_USER_SIGNER_TIME},
+ GUARDIAN_CONTENT = #{GUARDIAN_CONTENT},
+ LEADER_DEPARTMENT_ID = #{LEADER_DEPARTMENT_ID},
+ LEADER_USER_ID = #{LEADER_USER_ID},
+ LEADER_USER_SIGNER_PATH = #{LEADER_USER_SIGNER_PATH},
+ LEADER_USER_SIGNER_TIME = #{LEADER_USER_SIGNER_TIME},
+ LEADER_CONTENT = #{LEADER_CONTENT},
+ MONITOR_DEPARTMENT_ID = #{MONITOR_DEPARTMENT_ID},
+ MONITOR_USER_ID = #{MONITOR_USER_ID},
+ MONITOR_USER_SIGNER_PATH = #{MONITOR_USER_SIGNER_PATH},
+ MONITOR_USER_SIGNER_TIME = #{MONITOR_USER_SIGNER_TIME},
+ MONITOR_CONTENT = #{MONITOR_CONTENT},
+ CONFESS_USER = #{CONFESS_USER},
+ EDUCATE_USER = #{EDUCATE_USER},
+ ACCEPT_EDUCATE_USER = #{ACCEPT_EDUCATE_USER},
+ TRIAL_USER = #{TRIAL_USER},
+ WORK_FUNCTION=#{WORK_FUNCTION},
+ GUARDIAN_USER=#{GUARDIAN_USER},
+ CONFESS_DEPARTMENT_ID = #{CONFESS_DEPARTMENT_ID},
+ CONFESS_USER_ID = #{CONFESS_USER_ID},
+ CONFESS_USER_SIGNER_PATH = #{CONFESS_USER_SIGNER_PATH},
+ CONFESS_USER_SIGNER_TIME = #{CONFESS_USER_SIGNER_TIME},
+ ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID},
+ ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID},
+ ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH},
+ ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME},
+ HOTWORK_ID = HOTWORK_ID
+ where
+ HOTWORK_ID = #{HOTWORK_ID}
+
+
+
+ update
+
+ set
+ APPLY_STATUS = #{APPLY_STATUS}
+ where
+ HOTWORK_ID = #{HOTWORK_ID}
+
+
+
+ update
+ bus_confinedspace f
+ set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
+ WHERE
+ f.ISDELETE = '0'
+ AND f.APPLY_STATUS > 0
+ AND f.CORPINFO_ID = #{CORPINFO_ID}
+ and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
+
+
+ update
+ bus_blindboard f
+ set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
+ WHERE
+ f.ISDELETE = '0'
+ AND f.APPLY_STATUS > 0
+ AND f.CORPINFO_ID = #{CORPINFO_ID}
+ and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
+
+
+ update
+ bus_electricity f
+ set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
+ WHERE
+ f.ISDELETE = '0'
+ AND f.APPLY_STATUS > 0
+ AND f.CORPINFO_ID = #{CORPINFO_ID}
+ and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
+
+
+ update
+ bus_hoisting f
+ set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
+ WHERE
+ f.ISDELETE = '0'
+ AND f.APPLY_STATUS > 0
+ AND f.CORPINFO_ID = #{CORPINFO_ID}
+ and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
+
+
+ update
+ bus_breakground f
+ set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
+ WHERE
+ f.ISDELETE = '0'
+ AND f.APPLY_STATUS > 0
+ AND f.CORPINFO_ID = #{CORPINFO_ID}
+ and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
+
+
+ update
+ bus_cutroad f
+ set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
+ WHERE
+ f.ISDELETE = '0'
+ AND f.APPLY_STATUS > 0
+ AND f.CORPINFO_ID = #{CORPINFO_ID}
+ and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
+
+
+ update
+ bus_highwork f
+ set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
+ WHERE
+ f.ISDELETE = '0'
+ AND f.APPLY_STATUS > 0
+ AND f.CORPINFO_ID = #{CORPINFO_ID}
+ and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
+
+
+ update
+
+ bus_hotwork_cfd f
+ set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)'))
+ WHERE
+ f.ISDELETE = '0'
+ AND f.APPLY_STATUS > 0
+ AND f.CORPINFO_ID = #{CORPINFO_ID}
+ and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ update
+
+ set
+ ISDELETE = '1'
+ where
+ HOTWORK_ID in
+
+ #{item}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkGasCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkGasCfdMapper.xml
new file mode 100644
index 00000000..f360cd40
--- /dev/null
+++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkGasCfdMapper.xml
@@ -0,0 +1,138 @@
+
+
+
+
+
+
+ BUS_HOTWORKGAS_CFD
+
+
+
+
+ SYS_DICTIONARIES
+
+
+
+
+ f.HOTWORK_ID,
+ f.ANALYZE_TIME,
+ f.ANALYZE_PLACE,
+ f.ANALYZE_RESULT,
+ f.ANALYZE_USER,
+ f.ISDELETE,
+ f.HOTWORKGAS_ID
+
+
+
+
+ HOTWORK_ID,
+ ANALYZE_TIME,
+ ANALYZE_PLACE,
+ ANALYZE_RESULT,
+ ANALYZE_USER,
+ ISDELETE,
+ HOTWORKGAS_ID
+
+
+
+
+ #{HOTWORK_ID},
+ #{ANALYZE_TIME},
+ #{ANALYZE_PLACE},
+ #{ANALYZE_RESULT},
+ #{ANALYZE_USER},
+ #{ISDELETE},
+ #{HOTWORKGAS_ID}
+
+
+
+
+ insert into
+
+ (
+
+ ) values (
+
+ )
+
+
+
+
+ update
+
+ set
+ ISDELETE = '1'
+ where
+ HOTWORKGAS_ID = #{HOTWORKGAS_ID}
+
+
+
+
+ update
+
+ set
+ HOTWORK_ID = #{HOTWORK_ID},
+ ANALYZE_TIME = #{ANALYZE_TIME},
+ ANALYZE_PLACE = #{ANALYZE_PLACE},
+ ANALYZE_RESULT = #{ANALYZE_RESULT},
+ ANALYZE_USER = #{ANALYZE_USER},
+ ISDELETE = #{ISDELETE},
+ HOTWORKGAS_ID = HOTWORKGAS_ID
+ where
+ HOTWORKGAS_ID = #{HOTWORKGAS_ID}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ update
+
+ set
+ ISDELETE = '1'
+ where
+ HOTWORKGAS_ID in
+
+ #{item}
+
+
+
+
diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkLogCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkLogCfdMapper.xml
new file mode 100644
index 00000000..21e0b147
--- /dev/null
+++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkLogCfdMapper.xml
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+ BUS_HOTWORKLOG_CFD
+
+
+
+
+ SYS_DICTIONARIES
+
+
+
+
+ f.HOTWORK_ID,
+ f.ACTION,
+ f.CREATTIME,
+ f.CREATOR,
+ f.HOTWORKLOG_ID
+
+
+
+
+ HOTWORK_ID,
+ ACTION,
+ CREATTIME,
+ CREATOR,
+ HOTWORKLOG_ID
+
+
+
+
+ #{HOTWORK_ID},
+ #{ACTION},
+ #{CREATTIME},
+ #{CREATOR},
+ #{HOTWORKLOG_ID}
+
+
+
+
+ insert into
+
+ (
+
+ ) values (
+
+ )
+
+
+
+
+ update
+
+ set
+ ISDELETE = '1'
+ where
+ HOTWORKLOG_ID = #{HOTWORKLOG_ID}
+
+
+
+
+ update
+
+ set
+ HOTWORK_ID = #{HOTWORK_ID},
+ ACTION = #{ACTION},
+ CREATTIME = #{CREATTIME},
+ CREATOR = #{CREATOR},
+ HOTWORKLOG_ID = HOTWORKLOG_ID
+ where
+ HOTWORKLOG_ID = #{HOTWORKLOG_ID}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ update
+
+ set
+ ISDELETE = '1'
+ where
+ HOTWORKLOG_ID in
+
+ #{item}
+
+
+
+
diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkToMeasuresCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkToMeasuresCfdMapper.xml
new file mode 100644
index 00000000..b3ba03ae
--- /dev/null
+++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkToMeasuresCfdMapper.xml
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+ BUS_HOTWORKTOMEASURES_CFD
+
+
+
+
+ SYS_DICTIONARIES
+
+
+
+
+ f.HOTWORK_ID,
+ f.BUS_HOTWORK_MEASURES_ID,
+ f.STATUS,
+ f.ANSWER1,
+ f.ANSWER2,
+ f.ANSWER3,
+ f.ANSWER4,
+ f.HOTWORKTOMEASURES_ID,
+ f.CONFIRM_ID,
+ f.CONFIRM_NAME
+
+
+
+
+ HOTWORK_ID,
+ BUS_HOTWORK_MEASURES_ID,
+ STATUS,
+ ANSWER1,
+ ANSWER2,
+ ANSWER3,
+ ANSWER4,
+ HOTWORKTOMEASURES_ID,
+ CONFIRM_ID,
+ CONFIRM_NAME
+
+
+
+
+ #{HOTWORK_ID},
+ #{BUS_HOTWORK_MEASURES_ID},
+ #{STATUS},
+ #{ANSWER1},
+ #{ANSWER2},
+ #{ANSWER3},
+ #{ANSWER4},
+ #{HOTWORKTOMEASURES_ID},
+ #{CONFIRM_ID},
+ #{CONFIRM_NAME}
+
+
+
+
+ insert into
+
+ (
+
+ ) values (
+
+ )
+
+
+
+
+ delete from
+
+ where
+ HOTWORK_ID = #{HOTWORK_ID}
+
+
+
+
+ update
+
+ set
+ HOTWORK_ID = #{HOTWORK_ID},
+ BUS_HOTWORK_MEASURES_ID = #{BUS_HOTWORK_MEASURES_ID},
+ STATUS = #{STATUS},
+ ANSWER1 = #{ANSWER1},
+ ANSWER2 = #{ANSWER2},
+ ANSWER3 = #{ANSWER3},
+ ANSWER4 = #{ANSWER4},
+ HOTWORKTOMEASURES_ID = HOTWORKTOMEASURES_ID,
+ ICONFIRM_ID = #{CONFIRM_ID},
+ CONFRM_NAME = #{CONFIRM_NAME}
+ where
+ HOTWORKTOMEASURES_ID = #{HOTWORKTOMEASURES_ID}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ update
+
+ set
+ ISDELETE = '1'
+ where
+ HOTWORKTOMEASURES_ID in
+
+ #{item}
+
+
+
+
diff --git a/src/main/resources/mybatis/datasource/mq/MqErrorMessageLogMapper.xml b/src/main/resources/mybatis/datasource/mq/MqErrorMessageLogMapper.xml
new file mode 100644
index 00000000..e2b35718
--- /dev/null
+++ b/src/main/resources/mybatis/datasource/mq/MqErrorMessageLogMapper.xml
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+ MQ_MESSAGE_ERROR_LOG
+
+
+
+
+ SYS_DICTIONARIES
+
+
+
+
+ f.MESSAGE_LOG_ID,
+ f.ERROR_MESSAGE,
+ f.TIME,
+ f.TYPE,
+ f.SOURCE,
+ f.MESSAGE_ERROR_LOG_ID
+
+
+
+
+ MESSAGE_LOG_ID,
+ ERROR_MESSAGE,
+ TIME,
+ TYPE,
+ SOURCE,
+ MESSAGE_ERROR_LOG_ID
+
+
+
+
+ #{MESSAGE_LOG_ID},
+ #{ERROR_MESSAGE},
+ #{TIME},
+ #{TYPE},
+ #{SOURCE},
+ #{MESSAGE_ERROR_LOG_ID}
+
+
+
+
+ insert into
+
+ (
+
+ ) values (
+
+ )
+
+
+
+
+ update
+
+ set
+ ISDELETE = '1'
+ where
+ MESSAGE_ERROR_LOG_ID = #{MESSAGE_ERROR_LOG_ID}
+
+
+
+
+ update
+
+ set
+ MESSAGE_LOG_ID = #{MESSAGE_LOG_ID},
+ ERROR_MESSAGE = #{ERROR_MESSAGE},
+ TIME = #{TIME},
+ TYPE = #{TYPE},
+ SOURCE = #{SOURCE},
+ MESSAGE_ERROR_LOG_ID = MESSAGE_ERROR_LOG_ID
+ where
+ MESSAGE_ERROR_LOG_ID = #{MESSAGE_ERROR_LOG_ID}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ update
+
+ set
+ ISDELETE = '1'
+ where
+ MESSAGE_ERROR_LOG_ID in
+
+ #{item}
+
+
+
+
diff --git a/src/main/resources/mybatis/datasource/mq/MqMessageLogMapper.xml b/src/main/resources/mybatis/datasource/mq/MqMessageLogMapper.xml
new file mode 100644
index 00000000..98685a2b
--- /dev/null
+++ b/src/main/resources/mybatis/datasource/mq/MqMessageLogMapper.xml
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+ MQ_MESSAGE_LOG
+
+
+
+
+ SYS_DICTIONARIES
+
+
+
+
+ f.ID,
+ f.PRODUCER_NAME,
+ f.MARK,
+ f.MARK_NAME,
+ f.MESSAGE,
+ f.CREATE_TIME,
+ f.MESSAGE_LOG_ID,
+ f.TYPE,
+ f.DIGESTION_FLAG,
+ f.PLAN_TIME
+
+
+
+
+ ID,
+ PRODUCER_NAME,
+ MARK,
+ MARK_NAME,
+ MESSAGE,
+ CREATE_TIME,
+ MESSAGE_LOG_ID,
+ TYPE,
+ DIGESTION_FLAG,
+ PLAN_TIME
+
+
+
+
+ #{ID},
+ #{PRODUCER_NAME},
+ #{MARK},
+ #{MARK_NAME},
+ #{MESSAGE},
+ #{CREATE_TIME},
+ #{MESSAGE_LOG_ID},
+ #{TYPE},
+ #{DIGESTION_FLAG},
+ #{PLAN_TIME}
+
+
+
+
+ insert into
+
+ (
+
+ ) values (
+
+ )
+
+
+
+
+ delete from
+
+ where
+ MESSAGE_LOG_ID = #{MESSAGE_LOG_ID}
+
+
+
+
+ update
+
+ set
+ ID = #{ID},
+ PRODUCER_NAME = #{PRODUCER_NAME},
+ MARK = #{MARK},
+ MARK_NAME = #{MARK_NAME},
+ MESSAGE = #{MESSAGE},
+ CREATE_TIME = #{CREATE_TIME},
+ TYPE = #{TYPE},
+ DIGESTION_FLAG = #{DIGESTION_FLAG},
+ PLAN_TIME = #{PLAN_TIME},
+ MESSAGE_LOG_ID = MESSAGE_LOG_ID
+ where
+ MESSAGE_LOG_ID = #{MESSAGE_LOG_ID}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ delete from
+
+ where
+ MESSAGE_LOG_ID in
+
+ #{item}
+
+
+
+
diff --git a/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml b/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml
new file mode 100644
index 00000000..23c4ba79
--- /dev/null
+++ b/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml
@@ -0,0 +1,225 @@
+
+
+
+
+
+
+ BUS_PERSONNELMANAGEMENT_CFD
+
+
+
+
+ SYS_DICTIONARIES
+
+
+
+
+ f.CREATOR,
+ f.UNITS_ID,
+ f.PTYPE,
+ f.JOB_TYPE,
+ f.OPERATIONITEM,
+ f.NAME,
+ f.SEX,
+ f.CERTIFICATE_NUM,
+ f.REVIEWTIME,
+ f.PHONENUM,
+ f.IDENTITYCARD,
+ f.LICENSING,
+ f.VALID_STIME,
+ f.VALID_ETIME,
+ f.CREATTIME,
+ f.OPERATOR,
+ f.OPERATTIME,
+ f.ISDELETE,
+ f.CORPINFO_ID,
+ f.PERSONNELMANAGEMENT_ID
+
+
+
+
+ CREATOR,
+ UNITS_ID,
+ PTYPE,
+ JOB_TYPE,
+ OPERATIONITEM,
+ NAME,
+ SEX,
+ CERTIFICATE_NUM,
+ REVIEWTIME,
+ PHONENUM,
+ IDENTITYCARD,
+ LICENSING,
+ VALID_STIME,
+ VALID_ETIME,
+ CREATTIME,
+ OPERATOR,
+ OPERATTIME,
+ ISDELETE,
+ CORPINFO_ID,
+ PERSONNELMANAGEMENT_ID
+
+
+
+
+ #{CREATOR},
+ #{UNITS_ID},
+ #{PTYPE},
+ #{JOB_TYPE},
+ #{OPERATIONITEM},
+ #{NAME},
+ #{SEX},
+ #{CERTIFICATE_NUM},
+ #{REVIEWTIME},
+ #{PHONENUM},
+ #{IDENTITYCARD},
+ #{LICENSING},
+ #{VALID_STIME},
+ #{VALID_ETIME},
+ #{CREATTIME},
+ #{OPERATOR},
+ #{OPERATTIME},
+ #{ISDELETE},
+ #{CORPINFO_ID},
+ #{PERSONNELMANAGEMENT_ID}
+
+
+
+
+ insert into
+
+ (
+
+ ) values (
+
+ )
+
+
+
+
+ update
+
+ set
+ ISDELETE = '1'
+ where
+ PERSONNELMANAGEMENT_ID = #{PERSONNELMANAGEMENT_ID}
+
+
+
+
+ update
+
+ set
+ UNITS_ID = #{UNITS_ID},
+ PTYPE = #{PTYPE},
+ JOB_TYPE = #{JOB_TYPE},
+ OPERATIONITEM = #{OPERATIONITEM},
+ NAME = #{NAME},
+ SEX = #{SEX},
+ CERTIFICATE_NUM = #{CERTIFICATE_NUM},
+ REVIEWTIME = #{REVIEWTIME},
+ PHONENUM = #{PHONENUM},
+ IDENTITYCARD = #{IDENTITYCARD},
+ LICENSING = #{LICENSING},
+ VALID_STIME = #{VALID_STIME},
+ VALID_ETIME = #{VALID_ETIME}
+ where
+ PERSONNELMANAGEMENT_ID = #{PERSONNELMANAGEMENT_ID}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ update
+
+ set
+ ISDELETE = '1'
+ where
+ PERSONNELMANAGEMENT_ID in
+
+ #{item}
+
+
+
+
diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml
index 52653c68..629f5fff 100644
--- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml
+++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml
@@ -755,6 +755,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by u.DEPARTMENT_ID asc, u.SORT asc,u.LAST_LOGIN desc
+
+
+