From 5b227786011836c9f2ce1c9c10b9d13c6521392a Mon Sep 17 00:00:00 2001 From: limingyu Date: Tue, 14 Nov 2023 10:16:26 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E6=9B=B9=E5=A6=83=E7=94=B8=E5=8A=A8?= =?UTF-8?q?=E7=81=AB=E4=BD=9C=E4=B8=9A=E6=90=AC=E5=88=B0=E6=B8=AF=E5=8A=A1?= =?UTF-8?q?=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 19 +- .../highriskwork/AppHotworkCfdController.java | 1513 +++++++++++++++ .../eightWork/AppEightWorkCfdController.java | 160 ++ .../highriskwork/HotworkCfdController.java | 318 +++ .../AppPersonnelManagementCfdController.java | 234 +++ .../PersonnelManagementCfdController.java | 244 +++ src/main/java/com/zcloud/dto/Response.java | 68 + .../java/com/zcloud/dto/TenCorpConst.java | 7 + src/main/java/com/zcloud/dto/TenCorpDto.java | 45 + src/main/java/com/zcloud/dto/Warden.java | 87 + .../eightWork/EightWorkCfdMapper.java | 26 + .../HotworkAcceptUserCfdMapper.java | 67 + .../highriskwork/HotworkCfdMapper.java | 89 + .../highriskwork/HotworkGasCfdMapper.java | 59 + .../highriskwork/HotworkLogCfdMapper.java | 59 + .../HotworkToMeasuresCfdMapper.java | 59 + .../mq/MqErrorMessageLogMapper.java | 59 + .../datasource/mq/MqMessageLogMapper.java | 59 + .../PersonnelManagementCfdMapper.java | 67 + .../mapper/datasource/system/UsersMapper.java | 7 + .../eightWork/EightWorkCfdService.java | 26 + .../impl/EightWorkCfdServiceImpl.java | 41 + .../HotworkAcceptUserCfdService.java | 67 + .../highriskwork/HotworkCfdService.java | 88 + .../highriskwork/HotworkGasCfdService.java | 59 + .../highriskwork/HotworkLogCfdService.java | 59 + .../HotworkToMeasuresCfdService.java | 59 + .../impl/HotworkAcceptUserCfdServiceImpl.java | 102 + .../impl/HotworkCfdServiceImpl.java | 150 ++ .../impl/HotworkGasCfdServiceImpl.java | 83 + .../impl/HotworkLogCfdServiceImpl.java | 83 + .../impl/HotworkToMeasuresCfdServiceImpl.java | 83 + .../com/zcloud/service/mq/LogService.java | 11 + .../zcloud/service/mq/SendMessageService.java | 11 + .../service/mq/impl/LogServiceImpl.java | 43 + .../mq/impl/SendMessageServiceImpl.java | 129 ++ .../PersonnelManagementCfdService.java | 67 + .../PersonnelManagementCfdServiceImpl.java | 95 + .../service/system/DictionariesService.java | 2 + .../zcloud/service/system/UsersService.java | 7 + .../system/impl/DictionariesServiceImpl.java | 13 + .../service/system/impl/UsersServiceImpl.java | 34 + src/main/java/com/zcloud/util/Const.java | 3 + src/main/java/com/zcloud/util/Warden.java | 4 + .../java/com/zcloud/util/mq/MqSendUtil.java | 49 + src/main/java/com/zcloud/util/mq/MqUtil.java | 87 + .../eightWork/EightWorkCfdMapper.xml | 275 +++ .../HotworkAcceptUserCfdMapper.xml | 217 +++ .../highriskwork/HotworkCfdMapper.xml | 1713 +++++++++++++++++ .../highriskwork/HotworkGasCfdMapper.xml | 138 ++ .../highriskwork/HotworkLogCfdMapper.xml | 127 ++ .../HotworkToMeasuresCfdMapper.xml | 145 ++ .../datasource/mq/MqErrorMessageLogMapper.xml | 131 ++ .../datasource/mq/MqMessageLogMapper.xml | 143 ++ .../PersonnelManagementMapper.xml | 225 +++ .../mybatis/datasource/system/UsersMapper.xml | 29 + 56 files changed, 7843 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java create mode 100644 src/main/java/com/zcloud/controller/eightWork/AppEightWorkCfdController.java create mode 100644 src/main/java/com/zcloud/controller/highriskwork/HotworkCfdController.java create mode 100644 src/main/java/com/zcloud/controller/specialoperation/AppPersonnelManagementCfdController.java create mode 100644 src/main/java/com/zcloud/controller/specialoperation/PersonnelManagementCfdController.java create mode 100644 src/main/java/com/zcloud/dto/Response.java create mode 100644 src/main/java/com/zcloud/dto/TenCorpConst.java create mode 100644 src/main/java/com/zcloud/dto/TenCorpDto.java create mode 100644 src/main/java/com/zcloud/dto/Warden.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/eightWork/EightWorkCfdMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkAcceptUserCfdMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkCfdMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkGasCfdMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkLogCfdMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/highriskwork/HotworkToMeasuresCfdMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/mq/MqErrorMessageLogMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/mq/MqMessageLogMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/specialoperation/PersonnelManagementCfdMapper.java create mode 100644 src/main/java/com/zcloud/service/eightWork/EightWorkCfdService.java create mode 100644 src/main/java/com/zcloud/service/eightWork/impl/EightWorkCfdServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/highriskwork/HotworkAcceptUserCfdService.java create mode 100644 src/main/java/com/zcloud/service/highriskwork/HotworkCfdService.java create mode 100644 src/main/java/com/zcloud/service/highriskwork/HotworkGasCfdService.java create mode 100644 src/main/java/com/zcloud/service/highriskwork/HotworkLogCfdService.java create mode 100644 src/main/java/com/zcloud/service/highriskwork/HotworkToMeasuresCfdService.java create mode 100644 src/main/java/com/zcloud/service/highriskwork/impl/HotworkAcceptUserCfdServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/highriskwork/impl/HotworkGasCfdServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/highriskwork/impl/HotworkLogCfdServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/highriskwork/impl/HotworkToMeasuresCfdServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/mq/LogService.java create mode 100644 src/main/java/com/zcloud/service/mq/SendMessageService.java create mode 100644 src/main/java/com/zcloud/service/mq/impl/LogServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/mq/impl/SendMessageServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/specialoperation/PersonnelManagementCfdService.java create mode 100644 src/main/java/com/zcloud/service/specialoperation/impl/PersonnelManagementCfdServiceImpl.java create mode 100644 src/main/java/com/zcloud/util/mq/MqSendUtil.java create mode 100644 src/main/java/com/zcloud/util/mq/MqUtil.java create mode 100644 src/main/resources/mybatis/datasource/eightWork/EightWorkCfdMapper.xml create mode 100644 src/main/resources/mybatis/datasource/highriskwork/HotworkAcceptUserCfdMapper.xml create mode 100644 src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml create mode 100644 src/main/resources/mybatis/datasource/highriskwork/HotworkGasCfdMapper.xml create mode 100644 src/main/resources/mybatis/datasource/highriskwork/HotworkLogCfdMapper.xml create mode 100644 src/main/resources/mybatis/datasource/highriskwork/HotworkToMeasuresCfdMapper.xml create mode 100644 src/main/resources/mybatis/datasource/mq/MqErrorMessageLogMapper.xml create mode 100644 src/main/resources/mybatis/datasource/mq/MqMessageLogMapper.xml create mode 100644 src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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..fe769ec9 --- /dev/null +++ b/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml @@ -0,0 +1,225 @@ + + + + + + + BUS_PERSONNELMANAGEMENT + + + + + 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 b81ad005..4c5ef89c 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -749,6 +749,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by u.DEPARTMENT_ID asc, u.SORT asc,u.LAST_LOGIN desc + + + + + + delete from diff --git a/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml b/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml index fe769ec9..23c4ba79 100644 --- a/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml +++ b/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml @@ -4,7 +4,7 @@ - BUS_PERSONNELMANAGEMENT + BUS_PERSONNELMANAGEMENT_CFD @@ -158,7 +158,7 @@ f left join sys_dictionaries a on a.DICTIONARIES_ID = f.JOB_TYPE left join bus_corp_info b on b.CORPINFO_ID = f.CORPINFO_ID - left join `qa-cfd-regulatory`.bus_units r on r.UNITS_ID = f.UNITS_ID + left join `qa-gwj-regulatory`.bus_units r on r.UNITS_ID = f.UNITS_ID where f.ISDELETE = '0' and @@ -201,7 +201,7 @@ left join sys_dictionaries a on a.DICTIONARIES_ID = f.JOB_TYPE left join bus_corp_info b on b.CORPINFO_ID = f.CORPINFO_ID - left join bus_units r on r.UNITS_ID = f.UNITS_ID + left join bus_units_cfd r on r.UNITS_ID = f.UNITS_ID where f.ISDELETE = '0' and f.CORPINFO_ID = #{CORPINFO_ID} From 72cb39f096d1c623c742151e43e55708cdfd5864 Mon Sep 17 00:00:00 2001 From: limingyu Date: Tue, 5 Dec 2023 14:13:49 +0800 Subject: [PATCH 06/22] =?UTF-8?q?=E6=9B=B9=E5=A6=83=E7=94=B8=E5=8A=A8?= =?UTF-8?q?=E7=81=AB=E4=BD=9C=E4=B8=9A=E6=90=AC=E5=88=B0=E6=B8=AF=E5=8A=A1?= =?UTF-8?q?=E5=B1=804?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 4d9aabe4..cd3b02af 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -74,7 +74,8 @@ smb.basePath=/mnt/qgfile/file/ rocketmq.consumer.group2=edu-admin-edit rocketmq.consumer.group1=edu-admin-add #rocketmq.name-server=10.0.140.141:9876 -rocketmq.name-server=192.168.0.70:9876 +#rocketmq.name-server=192.168.0.70:9876 +rocketmq.name-server=192.168.151.57:9876 rocketmq.producer.group=libmiddle rocketmq.producer.send-message-timeout=3000 rocketmq.producer.compress-message-body-threshold=4096 From 761630df7771839bc1e93c642b9b2a9c51f8923a Mon Sep 17 00:00:00 2001 From: limingyu Date: Tue, 5 Dec 2023 14:19:09 +0800 Subject: [PATCH 07/22] =?UTF-8?q?=E6=9B=B9=E5=A6=83=E7=94=B8=E5=8A=A8?= =?UTF-8?q?=E7=81=AB=E4=BD=9C=E4=B8=9A=E6=90=AC=E5=88=B0=E6=B8=AF=E5=8A=A1?= =?UTF-8?q?=E5=B1=805?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/highriskwork/AppHotWorkApplicationController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java index f10a74f8..3f88b6e5 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java @@ -859,7 +859,7 @@ public class AppHotWorkApplicationController extends BaseController { } String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); -// Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + pd.get("CORPINFO_ID").toString() + "/" + ffile); + Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + pd.get("CORPINFO_ID").toString() + "/" + ffile); hotUser.put("AUTOGRAPH",Const.FILEPATHYHTP + pd.get("CORPINFO_ID").toString() + "/" + ffile + "/" + fileName); } From 81450f048a79cbc01de2f93d0ccf22066b6768ab Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Tue, 5 Dec 2023 14:27:11 +0800 Subject: [PATCH 08/22] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=88=86=E5=85=AC=E5=8F=B8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/openApi/OpenApiController.java | 16 ++++ .../controller/xgf/CorpFgsController.java | 78 +++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 src/main/java/com/zcloud/controller/xgf/CorpFgsController.java diff --git a/src/main/java/com/zcloud/controller/openApi/OpenApiController.java b/src/main/java/com/zcloud/controller/openApi/OpenApiController.java index 841f5464..970af126 100644 --- a/src/main/java/com/zcloud/controller/openApi/OpenApiController.java +++ b/src/main/java/com/zcloud/controller/openApi/OpenApiController.java @@ -97,4 +97,20 @@ public class OpenApiController extends BaseController { map.put("result", errInfo); return map; } + + /**列表 + * @throws Exception + */ + @RequestMapping(value="/corp/findById") + @ResponseBody + public Object findById() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = corpInfoService.findById(pd); //列出Post列表 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/xgf/CorpFgsController.java b/src/main/java/com/zcloud/controller/xgf/CorpFgsController.java new file mode 100644 index 00000000..96b0084b --- /dev/null +++ b/src/main/java/com/zcloud/controller/xgf/CorpFgsController.java @@ -0,0 +1,78 @@ +package com.zcloud.controller.xgf; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.util.HttpClientService; +import com.zcloud.util.Jurisdiction; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author fangjiakai + * @date 2023/05/15 11:09 + */ +@Controller +@RequestMapping("/corpFgs") +public class CorpFgsController extends BaseController { + + @Value("${preventionxgf.api.url}") + private String xgfUrl; + + /** + * 相关方单位列表 + * @param page + * @return + * @throws Exception + */ + @RequestMapping(value="/corpFgsList") + @ResponseBody + public Object batchList(Page page) throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpFgs/corpFgsList" +getPageUrl(page), pd); + return result; + } + + /** + * 相关方单位人员列表 + * @param page + * @return + * @throws Exception + */ + @RequestMapping(value="/corpUserFgsList") + @ResponseBody + public Object batchUserList(Page page) throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpUserFgs/corpUserFgsList" +getPageUrl(page), pd); + return result; + } + + /** + * 相关方单位人员-人员基础信息管理-人员详细信息 + * @return + * @throws Exception + */ + @RequestMapping(value="/getCorpUserDetail") + @ResponseBody + public Object getCorpUserDetail() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpUserFgs/corpUserDetailInfoById", pd); + return result; + } + + private String getPageUrl(Page page){ + return "?showCount=" +page.getShowCount() + "¤tPage=" + page.getUrlCurrentPage(); + } + + +} From 2817e16fe5aef77a7ed82ce6a68c39710a10dd23 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Wed, 6 Dec 2023 13:43:53 +0800 Subject: [PATCH 09/22] =?UTF-8?q?=E5=85=B3=E8=81=94=E5=85=AB=E9=A1=B9?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/xgf/CorpFgsController.java | 16 +++ .../xgf/app/AppCorpFgsController.java | 110 ++++++++++++++++++ .../service/corpFgs/CorpFgsService.java | 19 +++ .../corpFgs/impl/CorpFgsServiceImpl.java | 46 ++++++++ .../gf/impl/GFBlindBoardServiceImpl.java | 11 +- .../gf/impl/GFHighWorkServiceImpl.java | 9 +- 6 files changed, 209 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/zcloud/controller/xgf/app/AppCorpFgsController.java create mode 100644 src/main/java/com/zcloud/service/corpFgs/CorpFgsService.java create mode 100644 src/main/java/com/zcloud/service/corpFgs/impl/CorpFgsServiceImpl.java diff --git a/src/main/java/com/zcloud/controller/xgf/CorpFgsController.java b/src/main/java/com/zcloud/controller/xgf/CorpFgsController.java index 96b0084b..ab9db99b 100644 --- a/src/main/java/com/zcloud/controller/xgf/CorpFgsController.java +++ b/src/main/java/com/zcloud/controller/xgf/CorpFgsController.java @@ -74,5 +74,21 @@ public class CorpFgsController extends BaseController { return "?showCount=" +page.getShowCount() + "¤tPage=" + page.getUrlCurrentPage(); } + /** + * 相关方单位--根据企业端corpInfoId查询到对应的相关方部门树形结构 + * @return + * @throws Exception + */ + @RequestMapping(value="/listTreeByFgsId") + @ResponseBody + public Object listTreeByFgsId() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi//corpFgs/listTreeByFgsId", pd); + return result; + } + } diff --git a/src/main/java/com/zcloud/controller/xgf/app/AppCorpFgsController.java b/src/main/java/com/zcloud/controller/xgf/app/AppCorpFgsController.java new file mode 100644 index 00000000..fef97c0b --- /dev/null +++ b/src/main/java/com/zcloud/controller/xgf/app/AppCorpFgsController.java @@ -0,0 +1,110 @@ +package com.zcloud.controller.xgf.app; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.util.HttpClientService; +import com.zcloud.util.Tools; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author fangjiakai + * @date 2023/05/15 11:09 + */ +@Controller +@RequestMapping("/app/corpFgs") +public class AppCorpFgsController extends BaseController { + + @Value("${preventionxgf.api.url}") + private String xgfUrl; + + /** + * 相关方单位列表 + * @param page + * @return + * @throws Exception + */ + @RequestMapping(value="/corpFgsList") + @ResponseBody + public Object batchList(Page page) throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpFgs/corpFgsList" +getPageUrl(page), pd); + return result; + } + + /** + * 相关方单位人员列表 + * @param page + * @return + * @throws Exception + */ + @RequestMapping(value="/corpUserFgsList") + @ResponseBody + public Object batchUserList(Page page) throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpUserFgs/corpUserFgsList" +getPageUrl(page), pd); + return result; + } + + /** + * 相关方单位人员-人员基础信息管理-人员详细信息 + * @return + * @throws Exception + */ + @RequestMapping(value="/getCorpUserDetail") + @ResponseBody + public Object getCorpUserDetail() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi/corpUserFgs/corpUserDetailInfoById", pd); + return result; + } + + private String getPageUrl(Page page){ + return "?showCount=" +page.getShowCount() + "¤tPage=" + page.getUrlCurrentPage(); + } + + /** + * 相关方单位--根据企业端corpInfoId查询到对应的相关方部门树形结构 + * @return + * @throws Exception + */ + @RequestMapping(value="/listTreeByFgsId") + @ResponseBody + public Object listTreeByFgsId() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi//corpFgs/listTreeByFgsId", pd); + return result; + } + + /** + * 根据相关方部门id获取部门下所有人员 + * @return + * @throws Exception + */ + @RequestMapping(value="/findUserByDepartmentId") + @ResponseBody + public Object findUserByDepartmentId() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Map result = HttpClientService.doPost(xgfUrl + "/openApi//corpUserFgs/findUserByDepartmentId", pd); + return result; + } + + +} diff --git a/src/main/java/com/zcloud/service/corpFgs/CorpFgsService.java b/src/main/java/com/zcloud/service/corpFgs/CorpFgsService.java new file mode 100644 index 00000000..bf5fc6e7 --- /dev/null +++ b/src/main/java/com/zcloud/service/corpFgs/CorpFgsService.java @@ -0,0 +1,19 @@ +package com.zcloud.service.corpFgs; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：用电气体检测 + * 作者：luoxiaobao + * 时间：2021-09-08 + * 官网：www.zcloudchina.com + */ +public interface CorpFgsService { + + String getXgfUserName(String workUser); + +} + diff --git a/src/main/java/com/zcloud/service/corpFgs/impl/CorpFgsServiceImpl.java b/src/main/java/com/zcloud/service/corpFgs/impl/CorpFgsServiceImpl.java new file mode 100644 index 00000000..c8a95429 --- /dev/null +++ b/src/main/java/com/zcloud/service/corpFgs/impl/CorpFgsServiceImpl.java @@ -0,0 +1,46 @@ +package com.zcloud.service.corpFgs.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.eightWork.ElectricityYthGasMapper; +import com.zcloud.service.corpFgs.CorpFgsService; +import com.zcloud.service.eightWork.ElectricityYthGasService; +import com.zcloud.util.HttpClientService; +import com.zcloud.util.Tools; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; + +/** + * 说明：用电气体检测 + * 作者：luoxiaobao + * 时间：2021-09-08 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class CorpFgsServiceImpl implements CorpFgsService { + + + @Value("${preventionxgf.api.url}") + private String xgfUrl; + + @Override + public String getXgfUserName(String workUser){ + PageData pd = new PageData(); + pd.put("USER_ID",workUser); + Map result = HttpClientService.doPost(xgfUrl + "/openApi/user/findUserById", pd); + Map pageData = (Map) result.get("pd"); + if(Tools.isEmpty(pageData)){ + return workUser; + }else { + return pageData.get("NAME").toString(); + } + + } +} + diff --git a/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java index 49bf00e3..991d6f6e 100644 --- a/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java +++ b/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardServiceImpl.java @@ -1,8 +1,10 @@ package com.zcloud.service.gf.impl; +import com.zcloud.controller.xgf.app.AppCorpFgsController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.gf.GFBlindBoardMapper; +import com.zcloud.service.corpFgs.CorpFgsService; import com.zcloud.service.gf.GFBlindBoardService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,6 +25,9 @@ public class GFBlindBoardServiceImpl implements GFBlindBoardService { @Resource private GFBlindBoardMapper GFblindboardMapper; + @Resource + private CorpFgsService corpFgsService; + /**新增 * @param pd * @throws Exception @@ -76,7 +81,11 @@ public class GFBlindBoardServiceImpl implements GFBlindBoardService { * @throws Exception */ public PageData findById(PageData pd)throws Exception{ - return GFblindboardMapper.findById(pd); + PageData pageData = GFblindboardMapper.findById(pd); + //调用接口 获取用户信息 + String workUser = corpFgsService.getXgfUserName(pageData.getString("WORK_USER")); + pageData.put("WORK_USER",workUser); + return pageData; } /**批量删除 diff --git a/src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java index 19dc4e2a..5a86ee6b 100644 --- a/src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java +++ b/src/main/java/com/zcloud/service/gf/impl/GFHighWorkServiceImpl.java @@ -3,6 +3,7 @@ package com.zcloud.service.gf.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.gf.GFHighWorkMapper; +import com.zcloud.service.corpFgs.CorpFgsService; import com.zcloud.service.gf.GFHighWorkService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,6 +23,8 @@ public class GFHighWorkServiceImpl implements GFHighWorkService { @Resource private GFHighWorkMapper GFhighworkMapper; + @Resource + private CorpFgsService corpFgsService; /**新增 * @param pd @@ -77,7 +80,11 @@ public class GFHighWorkServiceImpl implements GFHighWorkService { * @throws Exception */ public PageData findById(PageData pd)throws Exception{ - return GFhighworkMapper.findById(pd); + PageData pageData = GFhighworkMapper.findById(pd); + //调用接口 获取用户信息 + String workUser = corpFgsService.getXgfUserName(pageData.getString("PROJECT_MANAGER")); + pageData.put("PROJECT_MANAGER",workUser); + return pageData; } /**批量删除 From de3503d0e86fbb94d2b9b24d22bdb5860982d591 Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 6 Dec 2023 15:02:41 +0800 Subject: [PATCH 10/22] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E5=9F=B9?= =?UTF-8?q?=E8=AE=AD=E6=96=B0=E5=A2=9E=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/controller/xgf/RelevantUnitsController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/zcloud/controller/xgf/RelevantUnitsController.java b/src/main/java/com/zcloud/controller/xgf/RelevantUnitsController.java index 3af5bc64..443a6470 100644 --- a/src/main/java/com/zcloud/controller/xgf/RelevantUnitsController.java +++ b/src/main/java/com/zcloud/controller/xgf/RelevantUnitsController.java @@ -190,6 +190,7 @@ public class RelevantUnitsController extends BaseController { public Object saveCorpInfo() throws Exception { PageData pd = new PageData(); pd = this.getPageData(); + pd.put("SUPERVISE_CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); Map result = HttpClientService.doPost(xgfUrl + "/api/corpinfo/saveDataForApi", pd); return result; } From 32f2a32e67a017bc2665dc8ad4c2e614d69cb937 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 7 Dec 2023 15:02:01 +0800 Subject: [PATCH 11/22] =?UTF-8?q?=E5=8E=86=E5=8F=B2bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/openApi/OpenApiController.java | 22 +++++++++++++++++++ .../datasource/system/DepartmentMapper.java | 2 ++ .../mapper/datasource/system/UsersMapper.java | 2 ++ .../service/system/DepartmentService.java | 2 ++ .../zcloud/service/system/UsersService.java | 2 ++ .../system/impl/DepartmentServiceImpl.java | 5 +++++ .../service/system/impl/UsersServiceImpl.java | 5 +++++ .../datasource/system/DepartmentMapper.xml | 3 +++ .../mybatis/datasource/system/UsersMapper.xml | 3 +++ 9 files changed, 46 insertions(+) diff --git a/src/main/java/com/zcloud/controller/openApi/OpenApiController.java b/src/main/java/com/zcloud/controller/openApi/OpenApiController.java index 841f5464..dcb1e989 100644 --- a/src/main/java/com/zcloud/controller/openApi/OpenApiController.java +++ b/src/main/java/com/zcloud/controller/openApi/OpenApiController.java @@ -82,6 +82,28 @@ public class OpenApiController extends BaseController { return map; } + @RequestMapping(value="/user/getUserInfo") + @ResponseBody + public Object getUserInfo() throws Exception{ + PageData map = new PageData(); + PageData pd = this.getPageData(); + PageData userInfo = usersService.getUserInfo(pd); //列出Post列表 + map.putAll(userInfo); + map.put("result", "success"); + return map; + } + + @RequestMapping(value="/department/getDepartmentInfo") + @ResponseBody + public Object getDepartmentInfo() throws Exception{ + PageData map = new PageData(); + PageData pd = this.getPageData(); + PageData departmentInfo = departmentService.getDepartmentInfo(pd); //列出Post列表 + map.putAll(departmentInfo); + map.put("result", "success"); + return map; + } + /**列表 * @throws Exception */ diff --git a/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java index da0ee487..c35c14e6 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java @@ -173,5 +173,7 @@ public interface DepartmentMapper{ * @return */ List listTreeManageAndCorpForPcPunishThePerson(PageData pd); + + PageData getInfo(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java index 63de3eb8..198a7090 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java @@ -292,4 +292,6 @@ public interface UsersMapper { List selectUserListByUserIds(PageData pd); void resetCardNo(PageData pd); + + PageData getUserInfo(PageData pd); } diff --git a/src/main/java/com/zcloud/service/system/DepartmentService.java b/src/main/java/com/zcloud/service/system/DepartmentService.java index 61c7e0ba..b863fdab 100644 --- a/src/main/java/com/zcloud/service/system/DepartmentService.java +++ b/src/main/java/com/zcloud/service/system/DepartmentService.java @@ -223,5 +223,7 @@ public interface DepartmentService{ List listTreeManageAndCorp1(PageData pd)throws Exception; List listTreeManageAndCorpForPcPunishThePerson(PageData pd) throws Exception; + + PageData getDepartmentInfo(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java index 74747c24..eb3c9194 100644 --- a/src/main/java/com/zcloud/service/system/UsersService.java +++ b/src/main/java/com/zcloud/service/system/UsersService.java @@ -343,4 +343,6 @@ public interface UsersService { List selectUserListByUserIds(PageData selectPageData); void resetCardNo(PageData pd); + + PageData getUserInfo(PageData pd); } diff --git a/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java index 7d631fdd..7ed7767a 100644 --- a/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java @@ -409,5 +409,10 @@ public class DepartmentServiceImpl implements DepartmentService{ public List listTreeManageAndCorpForPcPunishThePerson(PageData pd) throws Exception { return departmentMapper.listTreeManageAndCorpForPcPunishThePerson(pd); } + + @Override + public PageData getDepartmentInfo(PageData pd) throws Exception { + return departmentMapper.getInfo(pd); + } } diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index 9bec3e26..62bd107b 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -434,4 +434,9 @@ public class UsersServiceImpl implements UsersService { public void resetCardNo(PageData pd) { usersMapper.resetCardNo(pd); } + + @Override + public PageData getUserInfo(PageData pd) { + return usersMapper.getUserInfo(pd); + } } diff --git a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml index 1f8157e8..f4ffc72b 100644 --- a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml +++ b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml @@ -550,4 +550,7 @@ + diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 52653c68..c2b10336 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -1287,4 +1287,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + From 98dc83e051672a20a0d8ffe74470b7184bbc4dff Mon Sep 17 00:00:00 2001 From: limingyu Date: Mon, 11 Dec 2023 10:00:16 +0800 Subject: [PATCH 12/22] =?UTF-8?q?=E5=BB=B6=E6=97=B6=E7=9B=91=E7=81=AB?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=A4=9A=E4=BA=BA=E5=90=8C=E6=97=B6=E7=9B=91?= =?UTF-8?q?=E7=81=AB=EF=BC=8C=E5=9C=A8=E5=90=8C=E4=B8=80=E4=B8=AA=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E4=B8=AD=E9=83=BD=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=92=8C=E5=8F=91=E5=B8=83=E7=9B=91=E7=81=AB=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/highriskwork/AppHomeController.java | 39 ++++++- .../AppHotWorkApplicationController.java | 51 +++++++-- ...ppHotWorkApplicationDelayedController.java | 38 ++++++- .../HotWorkApplicationMapper.java | 2 + .../HotWorkApplicationUserMapper.java | 2 + .../HotWorkApplicationService.java | 2 + .../HotWorkApplicationUserService.java | 2 + .../impl/HotWorkApplicationServiceImpl.java | 8 ++ .../HotWorkApplicationUserServiceImpl.java | 5 + .../java/com/zcloud/util/WaterMarkUtil.java | 15 +++ .../resources/application-local.properties | 23 ++++ .../highriskwork/HotWorkApplicationMapper.xml | 102 ++++++++++-------- .../HotWorkApplicationUserMapper.xml | 37 +++++++ 13 files changed, 275 insertions(+), 51 deletions(-) create mode 100644 src/main/java/com/zcloud/util/WaterMarkUtil.java diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java index 9e8de2cf..28342ca4 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHomeController.java @@ -9,6 +9,7 @@ import com.zcloud.service.inspection.SafetyEnvironmentalInspectorService; import com.zcloud.service.inspection.SafetyEnvironmentalService; import com.zcloud.service.keyProjects.KeyprojectHiddenService; import com.zcloud.util.*; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -86,6 +87,24 @@ public class AppHomeController extends BaseController { PageData myGasAnaly = new PageData(); if(!Tools.isEmpty(pd.get("USER_ID"))){ varList = hotworkapplicationService.getCountByMyApproval(pd.getString("USER_ID")); + PageData delayedCount = hotworkapplicationService.getCountByMyApprovalForDelayedHotWork(pd.getString("USER_ID")); + if (varList.size() > 0) { + boolean isDelayedExist = false; + for (PageData data : varList) { + if (StringUtils.equals(data.getString("STATE"),"10")) isDelayedExist = true; + } + if (isDelayedExist) { + for (PageData pageData : varList){ + if (StringUtils.equals(pageData.getString("STATE"),"10")) { + pageData.put("count",delayedCount.getString("count")); + } + } + } else { + varList.add(delayedCount); + } + } else { + varList.add(delayedCount); + } myGasAnaly = hotworkapplicationService.getCountByMyGasAnaly(pd.getString("USER_ID")); } map.put("result", errInfo); @@ -126,6 +145,24 @@ public class AppHomeController extends BaseController { PageData myGasAnaly = new PageData(); if(!Tools.isEmpty(pd.get("USER_ID"))){ varList = hotworkapplicationService.getCountByMyApproval(pd.getString("USER_ID")); + PageData delayedCount = hotworkapplicationService.getCountByMyApprovalForDelayedHotWork(pd.getString("USER_ID")); + if (varList.size() > 0) { + boolean isDelayedExist = false; + for (PageData data : varList) { + if (StringUtils.equals(data.getString("STATE"),"10")) isDelayedExist = true; + } + if (isDelayedExist) { + for (PageData pageData : varList){ + if (StringUtils.equals(pageData.getString("STATE"),"10")) { + pageData.put("count",delayedCount.getString("count")); + } + } + } else { + varList.add(delayedCount); + } + } else { + varList.add(delayedCount); + } myGasAnaly = hotworkapplicationService.getCountByMyGasAnaly(pd.getString("USER_ID")); } @@ -142,7 +179,7 @@ public class AppHomeController extends BaseController { //统计消防总数 List dataList = fireCheckListService.getFireCheckListCountByApp(pd); - + map.put("result", errInfo); map.put("blindboardCount", blindboardCount); map.put("breakGroundCount", breakGroundCount); diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java index 3f88b6e5..ced46e97 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java @@ -17,6 +17,7 @@ import com.zcloud.service.system.FHlogService; import com.zcloud.util.*; import com.zcloud.util.message.MessageService; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.crypto.hash.SimpleHash; import org.apache.xpath.SourceTree; @@ -806,11 +807,30 @@ public class AppHotWorkApplicationController extends BaseController { hotUserPd.put("STATE",pd.get("STATE").toString()); // 哪一步 hotUserPd.put("USER_ID",pd.getString("loginUserId"));// 登录人 - List hotUserList = hotWorkApplicationUserService.listAll(hotUserPd); // 找到这一笔的审批人 - if(hotUserList.size() != 1){ - map.put("result", "error"); - map.put("msg", "获取审批人意见失败！请联系管理员"); - return map; + if ("10".equals(pd.get("STATE").toString())) { + PageData hotWorkApplication = hotworkapplicationService.findById(pd); + if(!Tools.isEmpty(hotWorkApplication) && hotWorkApplication.getString("STATE").equals("11")){ // 判断此作业是否已归档 + map.put("result", "error"); + map.put("msg", "此作业已归档，请勿重复操作！"); + return map; + } + } + + List hotUserList = new ArrayList<>(); + if (!pd.getString("STATE").equals("10")) { + hotUserList = hotWorkApplicationUserService.listAll(hotUserPd); // 找到这一笔的审批人 + if (hotUserList.size() != 1) { + map.put("result", "error"); + map.put("msg", "获取审批人意见失败！请联系管理员"); + return map; + } + } else { + hotUserList = hotWorkApplicationUserService.listByDepartment(hotUserPd); // 找到这一笔的审批人们 + if (hotUserList.size() < 1) { + map.put("result", "error"); + map.put("msg", "获取审批人意见失败！请联系管理员"); + return map; + } } @@ -953,7 +973,8 @@ public class AppHotWorkApplicationController extends BaseController { }else if("9".equals(pd.getString("STATE"))){ // 添加 临时监火 PageData leaderUser = new PageData(); leaderUser.put("HOTWORKAPPLICATIONUSER_ID", UuidUtil.get32UUID()); - leaderUser.put("USER_ID",pd.get("TIME_LAPSE_FIREMAN_ID")); +// leaderUser.put("USER_ID",pd.get("TIME_LAPSE_FIREMAN_ID")); + leaderUser.put("USER_ID",pd.get("TIME_LAPSE_FIREMAN_DEPARTMENT_ID")); leaderUser.put("STATE","10"); leaderUser.put("TYPE","-1"); leaderUser.put("ISDELETE","0"); @@ -1339,6 +1360,24 @@ public class AppHotWorkApplicationController extends BaseController { PageData myGasAnaly = new PageData(); if(!Tools.isEmpty(pd.get("USER_ID"))){ varList = hotworkapplicationService.getCountByMyApproval(pd.getString("USER_ID")); + PageData delayedCount = hotworkapplicationService.getCountByMyApprovalForDelayedHotWork(pd.getString("USER_ID")); + if (varList.size() > 0) { + boolean isDelayedExist = false; + for (PageData data : varList) { + if (StringUtils.equals(data.getString("STATE"),"10")) isDelayedExist = true; + } + if (isDelayedExist) { + for (PageData pageData : varList){ + if (StringUtils.equals(pageData.getString("STATE"),"10")) { + pageData.put("count",delayedCount.getString("count")); + } + } + } else { + varList.add(delayedCount); + } + } else { + varList.add(delayedCount); + } myGasAnaly = hotworkapplicationService.getCountByMyGasAnaly(pd.getString("USER_ID")); } map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java index 7ddb9cc4..548935fb 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationDelayedController.java @@ -1,5 +1,10 @@ package com.zcloud.controller.app.highriskwork; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileOutputStream; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -22,6 +27,8 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.highriskwork.HotWorkApplicationDelayedService; +import javax.imageio.ImageIO; + /** * 说明：延时监火 * 作者：luoxiaobao @@ -62,9 +69,38 @@ public class AppHotWorkApplicationDelayedController extends BaseController { map.put("msg", "文件格式不正确！"); return map; } + Image srcImg = ImageIO.read(file.getInputStream()); + //获取图片的宽 + int srcImgWidth = srcImg.getWidth(null); + //获取图片的高 + int srcImgHeight = srcImg.getHeight(null); + + BufferedImage bufImg = new BufferedImage(srcImgWidth, srcImgHeight, BufferedImage.TYPE_INT_RGB); + // 加水印 + //创建画笔 + Graphics2D g = bufImg.createGraphics(); + //srcImg 为上面获取到的原始图片的图片对象 + g.drawImage(srcImg, 0, 0, srcImgWidth, srcImgHeight, null); + //根据图片的背景设置水印颜色 + g.setColor(new Color(255,255,255,128)); + //设置字体 画笔字体样式为微软雅黑，加粗，文字大小为60pt + g.setFont(new Font("微软雅黑", Font.BOLD, 20)); + //设置水印的坐标 + int x=(srcImgWidth - WaterMarkUtil.getWatermarkLength(DateUtil.date2Str(new Date()), g)) / 2; + int y=srcImgHeight / 2; + //画出水印 第一个参数是水印内容，第二个参数是x轴坐标，第三个参数是y轴坐标 + g.drawString(DateUtil.date2Str(new Date()), x, y); + g.dispose(); + //将加完水印的图片暂存到内存中 + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + ImageIO.write(bufImg, suffixName, bos); + ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray()); + String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + corpInfoId + "/" + ffile); +// Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + corpInfoId + "/" + ffile); + //通过流的方式上传文件 + Smb.sshSftpForInput(bis, fileName, Const.FILEPATHYHTP + corpInfoId + "/" + ffile); pd.put("FILEPATH",Const.FILEPATHYHTP + corpInfoId + "/" + ffile + "/" + fileName); } hotworkapplicationdelayedService.save(pd); diff --git a/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationMapper.java b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationMapper.java index f00f1ba5..eaa1c75b 100644 --- a/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationMapper.java @@ -91,5 +91,7 @@ public interface HotWorkApplicationMapper{ * @throws Exception */ void updateState4ids(PageData pageData); + + PageData getCountByMyApprovalForDelayedHotWork(PageData pageData); } diff --git a/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationUserMapper.java index 88dd120e..3d9b3fe2 100644 --- a/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationUserMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/highriskwork/HotWorkApplicationUserMapper.java @@ -89,5 +89,7 @@ public interface HotWorkApplicationUserMapper{ List getHotdelayed (PageData pd) throws Exception; List getHotGasanalysis (PageData pd) throws Exception; + + List listByDepartment(PageData hotUserPd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationService.java b/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationService.java index ec26febd..872f7d61 100644 --- a/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationService.java +++ b/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationService.java @@ -110,6 +110,8 @@ public interface HotWorkApplicationService{ public List archivelist(Page page) throws Exception; public void updateState4ids(PageData pageData); + + PageData getCountByMyApprovalForDelayedHotWork(String user_id) throws Exception; } diff --git a/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationUserService.java b/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationUserService.java index e6c8bb32..d5ac1286 100644 --- a/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationUserService.java +++ b/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationUserService.java @@ -112,5 +112,7 @@ public interface HotWorkApplicationUserService{ public List getHotdelayed (PageData pd) throws Exception; public List getHotGasanalysis (PageData pd) throws Exception; + + List listByDepartment(PageData hotUserPd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationServiceImpl.java index 268f42d9..128ee401 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationServiceImpl.java @@ -105,6 +105,14 @@ public class HotWorkApplicationServiceImpl implements HotWorkApplicationService{ public void updateState4ids(PageData pageData){ hotworkapplicationMapper.updateState4ids(pageData); } + + @Override + public PageData getCountByMyApprovalForDelayedHotWork(String user_id) throws Exception { + PageData pd = new PageData(); + pd.put("USER_ID",user_id); + return hotworkapplicationMapper.getCountByMyApprovalForDelayedHotWork(pd); + } + /**修改 动火状态 * 1.如果是打回。state =0 * @throws Exception diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationUserServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationUserServiceImpl.java index 388b8f6f..0a931c53 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationUserServiceImpl.java @@ -370,5 +370,10 @@ public class HotWorkApplicationUserServiceImpl implements HotWorkApplicationUser public List getHotGasanalysis (PageData pd) throws Exception{ return hotworkapplicationuserMapper.getHotGasanalysis(pd); } + + @Override + public List listByDepartment(PageData hotUserPd) throws Exception { + return hotworkapplicationuserMapper.listByDepartment(hotUserPd); + } } diff --git a/src/main/java/com/zcloud/util/WaterMarkUtil.java b/src/main/java/com/zcloud/util/WaterMarkUtil.java new file mode 100644 index 00000000..d9c601e2 --- /dev/null +++ b/src/main/java/com/zcloud/util/WaterMarkUtil.java @@ -0,0 +1,15 @@ +package com.zcloud.util; + +import java.awt.*; + +public class WaterMarkUtil { + /** + * 获取水印文字的长度 + * @param waterMarkContent + * @param g + * @return + */ + public static int getWatermarkLength(String waterMarkContent, Graphics2D g) { + return g.getFontMetrics(g.getFont()).charsWidth(waterMarkContent.toCharArray(), 0, waterMarkContent.length()); + } +} diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index 13026235..8d8cc1c0 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -70,3 +70,26 @@ smb.port=22 smb.user=root smb.password=Zcloud@zcloud88888 smb.basePath=/mnt/qgfile/file/ + +#Mq\u914D\u7F6E +rocketmq.consumer.group2=edu-admin-edit +rocketmq.consumer.group1=edu-admin-add +#rocketmq.name-server=10.0.140.141:9876 +#rocketmq.name-server=192.168.0.70:9876 +rocketmq.name-server=192.168.151.57:9876 +rocketmq.producer.group=libmiddle +rocketmq.producer.send-message-timeout=3000 +rocketmq.producer.compress-message-body-threshold=4096 +rocketmq.producer.max-message-size=4194304 +rocketmq.producer.retry-times-when-send-failed=3 +rocketmq.producer.retry-next-server=true +rocketmq.producer.retry-times-when-send-async-failed=3 +## topic \u524D\u7F00 + +mq.topic.info=info +mq.topic.eightWork=eightWork +mq.group.info=scheduled_tasks +mq.group.eightWork=scheduled_tasks_eightWork + +corp.default.pic-path=https://qgqy.qhdsafety.com/file/ +corp.default.back-end-path=http://192.168.151.57:8092/ 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 + + From e0d63a1bcb5cd5b0519aceac6c6d3eec8b7412fc Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Tue, 12 Dec 2023 10:23:44 +0800 Subject: [PATCH 13/22] =?UTF-8?q?=E9=83=A8=E7=BD=B231=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index cd3b02af..c8ee675a 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -75,7 +75,7 @@ rocketmq.consumer.group2=edu-admin-edit rocketmq.consumer.group1=edu-admin-add #rocketmq.name-server=10.0.140.141:9876 #rocketmq.name-server=192.168.0.70:9876 -rocketmq.name-server=192.168.151.57:9876 +rocketmq.name-server=192.168.0.31:9876 rocketmq.producer.group=libmiddle rocketmq.producer.send-message-timeout=3000 rocketmq.producer.compress-message-body-threshold=4096 From 2521ccf7372fc9bef4a010bea6746f40b9bb3a9f Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Tue, 12 Dec 2023 10:24:05 +0800 Subject: [PATCH 14/22] =?UTF-8?q?=E9=83=A8=E7=BD=B231=E4=B8=93=E7=94=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index a93edfdf..a48eb064 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,7 +3,7 @@ server.port=8091 #?? #spring.profiles.active=local -#?? +#31ʱʹ spring.profiles.active=dev #?? #spring.profiles.active=master From c998e2ebb036d86ca593e15a60cbaa578fcb890e Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 12 Dec 2023 19:16:04 +0800 Subject: [PATCH 15/22] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/bus/CorpInfoController.java | 20 +++ .../system/DepartmentController.java | 1 + .../datasource/system/DepartmentMapper.java | 2 + .../dsno2/system/Department2Mapper.java | 117 ++++++++++++++++++ .../service/system/DepartmentService.java | 2 + .../system/impl/DepartmentServiceImpl.java | 5 + .../datasource/system/DepartmentMapper.xml | 26 ++++ 7 files changed, 173 insertions(+) create mode 100644 src/main/java/com/zcloud/mapper/dsno2/system/Department2Mapper.java diff --git a/src/main/java/com/zcloud/controller/bus/CorpInfoController.java b/src/main/java/com/zcloud/controller/bus/CorpInfoController.java index 9c96a3ea..a66edc34 100644 --- a/src/main/java/com/zcloud/controller/bus/CorpInfoController.java +++ b/src/main/java/com/zcloud/controller/bus/CorpInfoController.java @@ -10,6 +10,7 @@ import java.util.Map; import com.zcloud.service.bus.CorpInfoRelatedService; import com.zcloud.service.system.DictionariesService; import com.zcloud.util.*; +import net.sf.json.JSONArray; import org.apache.commons.io.FileUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -583,4 +584,23 @@ public class CorpInfoController extends BaseController { map.put("result", errInfo); return map; } + + /** + * 显示列表ztree(只查企业端部门) 有排序 + * + * @return + */ + @RequestMapping(value = "/listTreeManageAndCorpHasOrder") + @ResponseBody + public Object listTreeManageAndCorpHasOrder() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd.put("DEPARTMENT_ID", "0"); //查询父节点为0的根节点数据 + List rootList = departmentService.listTreeManageAndCorpHasOrder(pd); + JSONArray arr = JSONArray.fromObject(rootList); + map.put("zTreeNodes", arr.toString()); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/system/DepartmentController.java b/src/main/java/com/zcloud/controller/system/DepartmentController.java index c749fdbe..9cd23a10 100644 --- a/src/main/java/com/zcloud/controller/system/DepartmentController.java +++ b/src/main/java/com/zcloud/controller/system/DepartmentController.java @@ -11,6 +11,7 @@ import com.zcloud.util.ObjectExcelView; import net.sf.json.JSONArray; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java index c35c14e6..5b9f4d3d 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/DepartmentMapper.java @@ -175,5 +175,7 @@ public interface DepartmentMapper{ List listTreeManageAndCorpForPcPunishThePerson(PageData pd); PageData getInfo(PageData pd) throws Exception; + + List listTreeManageAndCorpHasOrder(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/Department2Mapper.java b/src/main/java/com/zcloud/mapper/dsno2/system/Department2Mapper.java new file mode 100644 index 00000000..8bc15d35 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/dsno2/system/Department2Mapper.java @@ -0,0 +1,117 @@ +package com.zcloud.mapper.dsno2.system; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.entity.system.Department; + +import java.util.List; + +/** + * 说明： 组织机构接Mapper + * 作者：luoxiaobao + * 官网：www.qdkjchina.com + */ +public interface Department2Mapper { + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List datalistPage(Page page)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**通过编码获取数据 + * @param pd + * @throws Exception + */ + public PageData findByBianma(PageData pd)throws Exception; + + /** + * 通过ID获取其子级列表 + * @param parentId + * @return + * @throws Exception + */ + public List listSubDepartmentByParentId(String parentId) throws Exception; + + /** + * 通过ID获取其子级列表 + * @param parentId + * @return + * @throws Exception + */ + public List listByCorpInfoId(String parentId,String CORPINFO_ID) throws Exception; + List deptinformation(PageData pageData) throws Exception; + + /** + * 获取所有数据并填充每条数据的子级列表(递归处理) + * @param MENU_ID + * @return + * @throws Exception + */ + public List listAllDepartment(String parentId) throws Exception; + + /** + * 获取所有数据并填充每条数据的子级列表(递归处理)下拉ztree用 + * @param MENU_ID + * @return + * @throws Exception + */ + public List listAllDepartmentToSelect(String parentId, List zdepartmentPdList) throws Exception; + + /**获取某个部门所有下级部门ID(返回拼接字符串 in的形式) + * @param DEPARTMENT_ID + * @return + * @throws Exception + */ + public String getDEPARTMENT_IDS(String DEPARTMENT_ID) throws Exception; + + public List listAll(PageData pd); + + public List listAllMent (PageData pd); + + public List listAllDepartmentByType(PageData pd) throws Exception; + + void saveCorpdept(PageData pd); + + List saftpersonlist(PageData pd) throws Exception; + + List saftmanagelist(PageData pd); + + List findbyCorpIdtoDeptlistPage(Page page); + + List findByDeptIdlistPage(Page page); + + public PageData findCorpDeptDetail(PageData pd); + + void editNameBDId(PageData deptPageData); + + //从管理端修改部门 新 + void editCorpdeptNew(PageData pd); + + List listTreeCorpDept(PageData pd); +} + diff --git a/src/main/java/com/zcloud/service/system/DepartmentService.java b/src/main/java/com/zcloud/service/system/DepartmentService.java index b863fdab..a79792c5 100644 --- a/src/main/java/com/zcloud/service/system/DepartmentService.java +++ b/src/main/java/com/zcloud/service/system/DepartmentService.java @@ -225,5 +225,7 @@ public interface DepartmentService{ List listTreeManageAndCorpForPcPunishThePerson(PageData pd) throws Exception; PageData getDepartmentInfo(PageData pd) throws Exception; + + List listTreeManageAndCorpHasOrder(PageData pd); } diff --git a/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java index 7ed7767a..13c86e06 100644 --- a/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java @@ -414,5 +414,10 @@ public class DepartmentServiceImpl implements DepartmentService{ public PageData getDepartmentInfo(PageData pd) throws Exception { return departmentMapper.getInfo(pd); } + + @Override + public List listTreeManageAndCorpHasOrder(PageData pd) { + return departmentMapper.listTreeManageAndCorpHasOrder(pd); + } } diff --git a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml index f4ffc72b..2215e418 100644 --- a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml +++ b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml @@ -553,4 +553,30 @@ + From cfc13f4ae0d8d4091d12b57ae8e8d9b7793ce39b Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Wed, 13 Dec 2023 14:45:11 +0800 Subject: [PATCH 16/22] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E7=BC=BA?= =?UTF-8?q?=E5=A4=B1=E5=8A=9F=E8=83=BD=E8=A1=A5=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../keyProjects/OutSourcedController.java | 19 +++++++++++++++++++ .../dsno2/keyProjects/OutSourcedMapper.java | 2 ++ .../keyProjects/OutSourcedService.java | 2 ++ .../impl/OutSourcedServiceImpl.java | 8 ++++++++ .../dsno2/keyProjects/OutSourcedMapper.xml | 12 ++++++++++++ 5 files changed, 43 insertions(+) diff --git a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java index dd972b2c..28789e86 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java @@ -761,4 +761,23 @@ public class OutSourcedController extends BaseController { return map; } + + /** + * 批量删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/updateState") + @ResponseBody + public Object updateState() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + outsourcedService.updateState(pd); + map.put("result", errInfo); //返回结果 + return map; + } + } diff --git a/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java b/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java index c63201ea..569023c7 100644 --- a/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java +++ b/src/main/java/com/zcloud/mapper/dsno2/keyProjects/OutSourcedMapper.java @@ -73,5 +73,7 @@ public interface OutSourcedMapper{ //校验结束重点工程是否有为完成的内容 PageData jieshuOutSourced(PageData pd); + + void updateState(PageData pd); } diff --git a/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java b/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java index f6e1474a..bf05b77d 100644 --- a/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java +++ b/src/main/java/com/zcloud/service/keyProjects/OutSourcedService.java @@ -74,5 +74,7 @@ public interface OutSourcedService{ //校验结束重点工程是否有为完成的内容 PageData jieshuOutSourced(PageData pd); + + void updateState(PageData pd); } diff --git a/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java b/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java index db3f5b50..af090e91 100644 --- a/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java +++ b/src/main/java/com/zcloud/service/keyProjects/impl/OutSourcedServiceImpl.java @@ -4,10 +4,12 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.dsno2.keyProjects.OutSourcedMapper; import com.zcloud.service.keyProjects.OutSourcedService; +import com.zcloud.util.DateUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; /** @@ -98,5 +100,11 @@ public class OutSourcedServiceImpl implements OutSourcedService { public PageData jieshuOutSourced(PageData pd) { return outsourcedMapper.jieshuOutSourced(pd); } + + @Override + public void updateState(PageData pd) { + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); + outsourcedMapper.updateState(pd); + } } diff --git a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml index 3fbb08db..8b4c1a84 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml +++ b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml @@ -683,4 +683,16 @@ ) AI ON AI.OUTSOURCED_ID = o.OUTSOURCED_ID WHERE o.OUTSOURCED_ID=#{OUTSOURCED_ID} + + + + update + + set + STATE = #{STATE}, + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME} + where + OUTSOURCED_ID = #{OUTSOURCED_ID} + From 253f559ba5da375508240a76ed5c6091ffc50859 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Thu, 14 Dec 2023 09:52:05 +0800 Subject: [PATCH 17/22] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=91=E9=80=81?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/dsno2/keyProjects/OutSourcedMapper.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml index 8b4c1a84..7f2e8852 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml +++ b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml @@ -106,7 +106,8 @@ COMPETENT_DEPT_ID, GROUP_UNIT, MANAGER_DEPARTMENT_ID, - JURISDICTION_UNIT + JURISDICTION_UNIT, + IS_SMS @@ -154,7 +155,8 @@ #{COMPETENT_DEPT_ID}, #{GROUP_UNIT}, #{MANAGER_DEPARTMENT_ID}, - #{JURISDICTION_UNIT} + #{JURISDICTION_UNIT}, + #{IS_SMS} From 71e3449f48fb86b9e026b9904ff82a4fe3e9f6f2 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 14 Dec 2023 16:50:11 +0800 Subject: [PATCH 18/22] =?UTF-8?q?12618=20=E7=BC=96=E8=BE=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=20=E5=88=A4=E7=A9=BA=E6=8F=90=E7=A4=BA=E8=AF=AD?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/controller/xgf/FlowTrainController.java | 1 - .../mybatis/datasource/system/UsersMapper.xml | 13 +++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java b/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java index 2a561de1..d3c4f6e1 100644 --- a/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java +++ b/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java @@ -31,7 +31,6 @@ public class FlowTrainController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("MAndTUserId",Jurisdiction.getUSER_ID()); -// pd.put("TRAIN_CORP_LEADER", Jurisdiction.getUSER_ID()); Map result = HttpClientService.doPost(xgfUrl + "/openApi/trainingbatch/list" +getPageUrl(page), pd); return result; } diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index effedd65..59ce3768 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -1317,6 +1317,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + select * from vi_user_all + + where USER_ID = #{USER_ID} + + + where USER_ID in + + #{item} + + + From 8446811b6fa2fcdf7acef66caf6b9ef04a72ab8b Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Thu, 14 Dec 2023 17:23:42 +0800 Subject: [PATCH 19/22] =?UTF-8?q?=E6=90=9C=E7=B4=A2bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/bus/ShiftWorkRulesMapper.xml | 109 +++++++++--------- 1 file changed, 55 insertions(+), 54 deletions(-) diff --git a/src/main/resources/mybatis/datasource/bus/ShiftWorkRulesMapper.xml b/src/main/resources/mybatis/datasource/bus/ShiftWorkRulesMapper.xml index 282cf422..37acd5f1 100644 --- a/src/main/resources/mybatis/datasource/bus/ShiftWorkRulesMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/ShiftWorkRulesMapper.xml @@ -1,65 +1,65 @@ - + BUS_SHIFTWORKRULES - + SYS_DICTIONARIES - + - f.NAME, - f.CORPINFO_ID, - f.CREATOR, - f.CREATTIME, - f.OPERATOR, - f.OPERATTIME, - f.ISDELETE, + f.NAME, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE, f.PARENTID, f.LEVEL, f.ISCUSTOM, f.SHIFTWORKRULES_ID - + - NAME, - CORPINFO_ID, - CREATOR, - CREATTIME, - OPERATOR, - OPERATTIME, - ISDELETE, + NAME, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE, PARENTID, LEVEL, ISCUSTOM, SHIFTWORKRULES_ID - + - #{NAME}, - #{CORPINFO_ID}, - #{CREATOR}, - #{CREATTIME}, - #{OPERATOR}, - #{OPERATTIME}, - #{ISDELETE}, + #{NAME}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE}, #{PARENTID}, #{LEVEL}, #{ISCUSTOM}, #{SHIFTWORKRULES_ID} - + - insert into + insert into ( @@ -67,7 +67,7 @@ ) - + update @@ -76,10 +76,10 @@ ISDELETE = '1', OPERATOR = #{OPERATOR}, OPERATTIME = #{OPERATTIME} - where + where SHIFTWORKRULES_ID = #{SHIFTWORKRULES_ID} - + update @@ -88,15 +88,15 @@ ISDELETE = '1', OPERATOR = #{OPERATOR}, OPERATTIME = #{OPERATTIME} - where + where PARENTID = #{PARENTID} - + update - set + set NAME = #{NAME}, @@ -109,56 +109,57 @@ OPERATTIME = #{OPERATTIME}, - + SHIFTWORKRULES_ID = SHIFTWORKRULES_ID - where + where SHIFTWORKRULES_ID = #{SHIFTWORKRULES_ID} - + - + - + - + update set ISDELETE = '1' - where + where SHIFTWORKRULES_ID in #{item} - +