diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 8bc06d6..d9aefee 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -30,6 +30,7 @@ + - - - - - - - + - - - - - - - - - - - - - - - - - - { - "keyToString": { - "Maven.HnRealNameBmw [clean].executor": "Run", - "Maven.HnRealNameBmw [install].executor": "Run", - "Maven.HnRealNameMmw [clean].executor": "Run", - "Maven.HnRealNameMmw [install].executor": "Run", - "Maven.hn-czl-service [clean].executor": "Run", - "Maven.hn-czl-service [install].executor": "Run", - "Maven.hn-gateway [clean].executor": "Run", - "Maven.hn-gateway [install].executor": "Run", - "Maven.hn_czl_screen [clean].executor": "Run", - "Maven.hn_czl_screen [install].executor": "Run", - "Maven.ldlz [clean].executor": "Run", - "Maven.ldlz [install].executor": "Run", - "Maven.realname-app [clean].executor": "Run", - "Maven.realname-app [install].executor": "Run", - "RequestMappingsPanelOrder0": "0", - "RequestMappingsPanelOrder1": "1", - "RequestMappingsPanelWidth0": "75", - "RequestMappingsPanelWidth1": "75", - "RunOnceActivity.ShowReadmeOnStart": "true", - "RunOnceActivity.git.unshallow": "true", - "SONARLINT_PRECOMMIT_ANALYSIS": "true", - "Spring Boot.BonusGatewayApplication.executor": "Debug", - "Spring Boot.CzlScreenApplication.executor": "Debug", - "Spring Boot.CzlServiceApplication.executor": "Debug", - "Spring Boot.HnRealNameBmwApplication.executor": "Run", - "Spring Boot.LdlzApplication.executor": "Run", - "Spring Boot.RealNameAppApplication.executor": "Debug", - "Spring Boot.RnamaApplication.executor": "Run", - "Spring Boot.RnmwApplication.executor": "Debug", - "kotlin-language-version-configured": "true", - "last_opened_file_path": "F:/workspace/idea/hn_cloud_service/realname-app", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "project.structure.last.edited": "Project", - "project.structure.proportion": "0.0", - "project.structure.side.proportion": "0.43843496", - "run.configurations.included.in.services": "true", - "settings.editor.selected.configurable": "MavenSettings", - "vue.rearranger.settings.migration": "true" + +}]]> @@ -266,6 +244,7 @@ + - diff --git a/HnRealNameBmw/src/main/resources/mappers/basic/TeamMangerMapper.xml b/HnRealNameBmw/src/main/resources/mappers/basic/TeamMangerMapper.xml index 9de9260..9fb533b 100644 --- a/HnRealNameBmw/src/main/resources/mappers/basic/TeamMangerMapper.xml +++ b/HnRealNameBmw/src/main/resources/mappers/basic/TeamMangerMapper.xml @@ -69,11 +69,11 @@ where NOT EXISTS (SELECT name FROM bns_smz_bm_sub_team WHERE name = #{name} and sub_id = #{subId} and is_active = 1) - + update bns_smz_bm_sub_team set IS_ACTIVE = 0 WHERE ID = #{id} - + UPDATE bns_smz_bm_sub_team SET `NAME` = #{name}, `team_id` = #{teamId}, `SUB_ID` = #{subId}, `team_type_id` = #{teamType}, `EIN_TIME` = #{einTime}, `EXIT_TIME` = #{exitTime} ,UPDATE_TIME = now() WHERE `ID` = #{id} diff --git a/HnRealNameBmw/src/main/resources/mappers/basic/UserRelationMapper.xml b/HnRealNameBmw/src/main/resources/mappers/basic/UserRelationMapper.xml index 2fc34ba..7be8d04 100644 --- a/HnRealNameBmw/src/main/resources/mappers/basic/UserRelationMapper.xml +++ b/HnRealNameBmw/src/main/resources/mappers/basic/UserRelationMapper.xml @@ -111,13 +111,13 @@ DELETE FROM bns_smz_bm_sub_pro_relation WHERE pro_id=#{proId} - + update bns_smz_bm_subcontractor set update_time = #{updateTime} where ID = #{subId} - + update bns_smz_bm_project set update_time = #{updateTime} where ID = #{proId} diff --git a/HnRealNameBmw/src/main/resources/mappers/manager/OrgMapper.xml b/HnRealNameBmw/src/main/resources/mappers/manager/OrgMapper.xml index 5156107..855cd81 100644 --- a/HnRealNameBmw/src/main/resources/mappers/manager/OrgMapper.xml +++ b/HnRealNameBmw/src/main/resources/mappers/manager/OrgMapper.xml @@ -108,7 +108,7 @@ values ( #{name},#{parentId},'0',#{type},now(),#{companyId}) - + update bns_smz_pm_organization @@ -118,15 +118,15 @@ where ID = #{id} - + update bns_smz_pm_organization set IS_ACTIVE = 0 WHERE ID = #{id} - + update bns_smz_pm_organization_year set IS_ACTIVE = 0 WHERE ID = #{id} - + update bns_smz_bm_sub_team_type @@ -136,7 +136,7 @@ where ID = #{id} - + update bns_smz_pm_organization_year diff --git a/HnRealNameBmw/src/main/resources/mappers/migrant/MigrantMapper.xml b/HnRealNameBmw/src/main/resources/mappers/migrant/MigrantMapper.xml index 6d101fd..fccc02c 100644 --- a/HnRealNameBmw/src/main/resources/mappers/migrant/MigrantMapper.xml +++ b/HnRealNameBmw/src/main/resources/mappers/migrant/MigrantMapper.xml @@ -307,16 +307,16 @@ insert into bns_smz_rl_migrant_soninfo (true_name,sex,old,team_work,holder,work_ - + update bns_smz_rl_idcard_check set name=#{trueName},idcard=#{idCard},people_date=#{date} where user_id=#{userId} - + update bns_smz_rl_migrant_release set is_online = '0' where id = #{id} - + update bns_smz_rl_migrant_release set is_active = '0' where id = #{id} - + update bns_smz_rl_migrant_release set audit_result = #{auditResult}, audit_time = now(),is_online= #{isOnline} where id = #{id} diff --git a/HnRealNameBmw/src/main/resources/mappers/person/SalaryWitnessMapper.xml b/HnRealNameBmw/src/main/resources/mappers/person/SalaryWitnessMapper.xml index d31d476..454e684 100644 --- a/HnRealNameBmw/src/main/resources/mappers/person/SalaryWitnessMapper.xml +++ b/HnRealNameBmw/src/main/resources/mappers/person/SalaryWitnessMapper.xml @@ -112,7 +112,7 @@ select ID_NUMBER as idNumber, ROLL_BANK_NAME as rollBankName from bns_smz_bm_worker_payroll where ID_NUMBER =#{idNumber} - + update bns_smz_bm_worker_payroll set BANK_CARD = #{bankCard},ROLL_BANK_NAME = #{rollBankName},BANK_ID = #{bankName} where ID_NUMBER = #{idNumber} ; @@ -263,7 +263,7 @@ )a - + update bns_smz_bm_worker_payroll set IS_ACTIVE = '0' where ID_NUMBER = #{idNumber}; update bns_smz_bm_worker_witness set IS_ACTIVE = '0' where witness_type = '2' and ID_NUMBER = #{idNumber}; @@ -290,7 +290,7 @@ values (#{idNumber},#{bankCard},#{bankName},#{rollBankName},#{uploadTime},#{userId},'1') - + update bns_smz_bm_worker_witness set is_active = '0' where witness_path = #{deletePath} \ No newline at end of file diff --git a/HnRealNameBmw/src/main/resources/mappers/person/TaskMapper.xml b/HnRealNameBmw/src/main/resources/mappers/person/TaskMapper.xml index 6b39b10..d97b1e8 100644 --- a/HnRealNameBmw/src/main/resources/mappers/person/TaskMapper.xml +++ b/HnRealNameBmw/src/main/resources/mappers/person/TaskMapper.xml @@ -2,20 +2,20 @@ - - + UPDATE bns_smz_xbg_user_attendance SET audit_status = 1,audit_time = NOW(),audit_remark = '自动审核',audti_user = '自动审核' WHERE audit_status = 0 AND data_type IN (1,2,3,4) AND DATE_FORMAT(NOW(), '%Y-%m-%d')>=DATE_FORMAT(create_date,'%Y-%m-%d') AND DATE_FORMAT(NOW(), '%H') = 23 - + update bns_smz_bm_worker_provide_salary_info set balanceDate = #{payDate},payMonth = #{payMonth} where idCard = #{idCard} and submitBatchNo = #{submitBatchNo} @@ -190,10 +190,10 @@ HAVING COUNT(*) > 1 - - + update bns_smz_fc_face_contrast set is_active = '0' where ID_NUMBER = #{idNumber} and CURRENT_DAY = #{currentDay} and USER_ID = 1 diff --git a/HnRealNameBmw/src/main/resources/mappers/person/WagesGranMapper.xml b/HnRealNameBmw/src/main/resources/mappers/person/WagesGranMapper.xml index 3e058f3..b6da4f8 100644 --- a/HnRealNameBmw/src/main/resources/mappers/person/WagesGranMapper.xml +++ b/HnRealNameBmw/src/main/resources/mappers/person/WagesGranMapper.xml @@ -346,7 +346,7 @@ #{month} ) - + update bns_smz_bm_worker_pay_person set overtime_pay=#{unitOvertimePay}, @@ -363,17 +363,17 @@ is_active='1' where id_number=#{idNumber} and month=#{month} and year=#{year} and start_time=#{startTime} and end_time=#{endTime} and is_active!='0' - + update bns_smz_bm_worker_pay_team set pay_flage='1' where id=#{id} - + update bns_smz_bm_worker_pay_team set is_active='0' where id=#{id} - + update bns_smz_bm_worker_pay_person set is_active='0' where year=(SELECT DISTINCT YEAR FROM bns_smz_bm_worker_pay_team WHERE id=#{id}) and month=(SELECT DISTINCT MONTH FROM bns_smz_bm_worker_pay_team WHERE id=#{id}) diff --git a/HnRealNameBmw/src/main/resources/mappers/push/AttendanceMapper.xml b/HnRealNameBmw/src/main/resources/mappers/push/AttendanceMapper.xml index 0330aeb..9812389 100644 --- a/HnRealNameBmw/src/main/resources/mappers/push/AttendanceMapper.xml +++ b/HnRealNameBmw/src/main/resources/mappers/push/AttendanceMapper.xml @@ -44,7 +44,7 @@ ) a GROUP BY a.idCard - + update bns_smz_fc_face_contrast set is_push = #{status},push_time = #{nowTime} where id = #{id} diff --git a/HnRealNameBmw/src/main/resources/mappers/push/ContractMapper.xml b/HnRealNameBmw/src/main/resources/mappers/push/ContractMapper.xml index a7ec064..c873c2b 100644 --- a/HnRealNameBmw/src/main/resources/mappers/push/ContractMapper.xml +++ b/HnRealNameBmw/src/main/resources/mappers/push/ContractMapper.xml @@ -63,7 +63,7 @@ GROUP BY bwci.idCard - + update bns_smz_bm_worker_contract set is_push = #{status},push_time = #{nowTime} where idCard = #{id} diff --git a/HnRealNameBmw/src/main/resources/mappers/push/PersonMapper.xml b/HnRealNameBmw/src/main/resources/mappers/push/PersonMapper.xml index a3379ad..2406a62 100644 --- a/HnRealNameBmw/src/main/resources/mappers/push/PersonMapper.xml +++ b/HnRealNameBmw/src/main/resources/mappers/push/PersonMapper.xml @@ -305,15 +305,15 @@ a.idCard - + update bns_smz_bm_push_exit_worker set is_push = 0 where ID_NUMBER = #{idNumber} - + update bns_smz_bm_worker_record set is_ein_push = #{status},ein_push_time = #{nowTime} where ID_NUMBER = #{id} - + update bns_smz_bm_worker_record set is_exit_push = #{status},exit_push_time = #{nowTime} where ID_NUMBER = #{id} diff --git a/HnRealNameBmw/src/main/resources/mappers/user/DictMapper.xml b/HnRealNameBmw/src/main/resources/mappers/user/DictMapper.xml index bbcbe54..c6cf809 100644 --- a/HnRealNameBmw/src/main/resources/mappers/user/DictMapper.xml +++ b/HnRealNameBmw/src/main/resources/mappers/user/DictMapper.xml @@ -33,7 +33,7 @@ limit #{offset}, #{limit} - + update bns_smz_t_dict t diff --git a/HnRealNameBmw/src/main/resources/mappers/user/UserMapper.xml b/HnRealNameBmw/src/main/resources/mappers/user/UserMapper.xml index cd8223e..ca0f093 100644 --- a/HnRealNameBmw/src/main/resources/mappers/user/UserMapper.xml +++ b/HnRealNameBmw/src/main/resources/mappers/user/UserMapper.xml @@ -14,15 +14,15 @@ - + UPDATE bns_smz_own_worker SET `is_active` = '0' WHERE lxdh = #{phone} - + UPDATE bns_smz_sys_announcement SET is_active = '0' WHERE id = #{id} - + UPDATE bns_smz_own_sys_announcement SET is_active = '0' WHERE id = #{id} @@ -387,7 +387,7 @@ where t.id = #{userId} - + update bns_smz_sys_user t @@ -603,11 +603,11 @@ VALUES (#{version}, #{content}, now()) - + UPDATE bns_smz_sys_announcement SET `version` = #{version}, `content` = #{content}, `update_time` = now() WHERE `id` = #{id} - + UPDATE bns_smz_own_sys_announcement SET `version` = #{version}, `content` = #{content}, `update_time` = now() WHERE `id` = #{id} diff --git a/HnRealNameMw/src/main/resources/mappers/person/CompanyMapper.xml b/HnRealNameMw/src/main/resources/mappers/person/CompanyMapper.xml index a3be276..0bf54ff 100644 --- a/HnRealNameMw/src/main/resources/mappers/person/CompanyMapper.xml +++ b/HnRealNameMw/src/main/resources/mappers/person/CompanyMapper.xml @@ -124,7 +124,7 @@ VALUES (#{roleId}, #{id}); - + UPDATE bns_smz_sys_user SET `password`=#{password} WHERE phone=#{phone} and IS_ACTIVE='1' diff --git a/realname-app/src/main/resources/mappers/core/UserMapper.xml b/realname-app/src/main/resources/mappers/core/UserMapper.xml index 3c3abff..9d13b7a 100644 --- a/realname-app/src/main/resources/mappers/core/UserMapper.xml +++ b/realname-app/src/main/resources/mappers/core/UserMapper.xml @@ -103,7 +103,7 @@ values(#{userId},#{deviceId},#{deviceModel},#{androidVersion},#{appVersion},#{loginDate},#{loginTime},#{loginType}) - + update bns_smz_sys_user set face_photo = #{facePhoto},face_feature = #{faceFeature},updateTime = #{faceTime}, collection_face_time = #{faceTime} where id = #{id} and is_active = 1 @@ -575,12 +575,12 @@ and is_active = '1') AS isContract - + update bns_smz_sys_user set password = #{password} where id = #{id} - + update bns_smz_sys_user set SUB_ID=#{subId},team_id=#{teamId},updateTime=NOW() where id=#{id} diff --git a/realname-app/src/main/resources/mappers/offline/OffLineMapper.xml b/realname-app/src/main/resources/mappers/offline/OffLineMapper.xml index 43694e5..c525b7d 100644 --- a/realname-app/src/main/resources/mappers/offline/OffLineMapper.xml +++ b/realname-app/src/main/resources/mappers/offline/OffLineMapper.xml @@ -196,7 +196,7 @@ and IS_ACTIVE=1 - + UPDATE bns_smz_sys_user SET SUB_ID=#{subId}, ORG_ID=#{orgId}, diff --git a/realname-app/src/main/resources/mappers/own/CertificateMapper.xml b/realname-app/src/main/resources/mappers/own/CertificateMapper.xml index 76eaa3a..8a547b0 100644 --- a/realname-app/src/main/resources/mappers/own/CertificateMapper.xml +++ b/realname-app/src/main/resources/mappers/own/CertificateMapper.xml @@ -49,7 +49,7 @@ '1' ) - + update bns_smz_own_worker_certificate set name =#{name}, level=#{level}, @@ -59,7 +59,7 @@ where id = #{id} - + update bns_smz_own_worker_certificate set is_active='0' where id = #{id} diff --git a/realname-app/src/main/resources/mappers/own/ContractMapper.xml b/realname-app/src/main/resources/mappers/own/ContractMapper.xml index 02608ca..238b115 100644 --- a/realname-app/src/main/resources/mappers/own/ContractMapper.xml +++ b/realname-app/src/main/resources/mappers/own/ContractMapper.xml @@ -1,7 +1,7 @@ - + update bns_smz_own_contract set state='1', path=#{path}, @@ -11,14 +11,14 @@ and work_id = #{workerId} - + UPDATE bns_smz_own_worker_off SET off_book = #{path},off_state='1' WHERE is_active = '1' AND worker_id = #{workerId}; - + UPDATE bns_smz_own_worker_off SET diff --git a/realname-app/src/main/resources/mappers/own/NotifyMapper.xml b/realname-app/src/main/resources/mappers/own/NotifyMapper.xml index 0737f7b..95ed7e1 100644 --- a/realname-app/src/main/resources/mappers/own/NotifyMapper.xml +++ b/realname-app/src/main/resources/mappers/own/NotifyMapper.xml @@ -9,7 +9,7 @@ insert into bns_smz_own_read(worker_id, ann_id, is_read, create_time, update_time, is_active) VALUES (#{workerId}, #{notifyId}, '1', NOW(), NOW(), '1') - + UPDATE bns_smz_own_read set is_active='0', update_time=NOW() diff --git a/realname-app/src/main/resources/mappers/own/OwnFirstMapper.xml b/realname-app/src/main/resources/mappers/own/OwnFirstMapper.xml index e57612f..967c643 100644 --- a/realname-app/src/main/resources/mappers/own/OwnFirstMapper.xml +++ b/realname-app/src/main/resources/mappers/own/OwnFirstMapper.xml @@ -102,7 +102,7 @@ where id = #{workerId} and is_active = '1' - + update bns_smz_sys_user set PRO_ID=#{proId}, face_photo=#{facePath}, @@ -111,14 +111,14 @@ and is_active = '1' - + update bns_smz_own_worker set pro_id=#{proId} where id = #{workerId} and is_active = '1' - + update bns_smz_sys_user set PRO_ID=#{proId} where id = #{id} diff --git a/realname-app/src/main/resources/mappers/own/RegistrationMapper.xml b/realname-app/src/main/resources/mappers/own/RegistrationMapper.xml index d71d954..2ceb7c1 100644 --- a/realname-app/src/main/resources/mappers/own/RegistrationMapper.xml +++ b/realname-app/src/main/resources/mappers/own/RegistrationMapper.xml @@ -185,7 +185,7 @@ NOW() ) - + update bns_smz_own_worker set mail=#{mail}, diff --git a/realname-app/src/main/resources/mappers/person/PersonAttMapper.xml b/realname-app/src/main/resources/mappers/person/PersonAttMapper.xml index 2f7a94b..3665a89 100644 --- a/realname-app/src/main/resources/mappers/person/PersonAttMapper.xml +++ b/realname-app/src/main/resources/mappers/person/PersonAttMapper.xml @@ -421,7 +421,7 @@ - + UPDATE bns_smz_bm_worker_contract SET auditor = #{auditor},audit_time = #{auditTime},is_audit = #{isAudit},remark = #{remarks} @@ -429,7 +429,7 @@ idCard = #{partBIdCard} and id = #{id} - + UPDATE bns_smz_bm_worker_contract_details SET legal_seal = #{legalSeal}, @@ -995,7 +995,7 @@ -- AND bwc.contractType = '电子合同' - + update bns_smz_bm_worker_contract set contractCode = #{code},person_contract_url = #{personPdfUrl} where idCard = #{partBIdCard} @@ -1389,23 +1389,23 @@ - + update bns_smz_bm_worker_contract set is_active = 0 where idCard = #{idNumber}; update bns_smz_bm_worker_contract_details set is_active = 0 where part_b_idCard = #{idNumber}; update bns_smz_bm_worker_witness set is_active = 0 where id_number = #{idNumber} and witness_type = 1; - + update bns_smz_bm_worker_attend_history set is_active = '0' where ID_NUMBER = #{idNumber} and is_active='1' and EXIT_TIME is null - + update bns_smz_bm_worker_witness set is_active = 0 where id_number = #{idNumber} and witness_type = 2; - + UPDATE bns_smz_fc_face_contrast SET AUDITOR = '自动审核', AUDIT_STATUS = '1', @@ -1418,7 +1418,7 @@ and is_active = 1 - + update bns_smz_bm_worker_photo set PHOTO_PATH =#{facePhoto} @@ -1429,7 +1429,7 @@ and IS_ACTIVE='1' - + update bns_smz_bm_worker_record set EXIT_DATE=null,EXIT_TIME=null,ein_status='1', @@ -1451,7 +1451,7 @@ and TEAM_ID = #{teamId} - + UPDATE bns_smz_sys_user SET SUB_ID=#{subId}, ORG_ID=#{orgId}, @@ -1460,7 +1460,7 @@ WHERE ID_NUMBER = #{idNumber} and IS_ACTIVE = 1 - + insert into bns_smz_fc_face_contrast ( @@ -1557,7 +1557,7 @@ ) - + update bns_smz_fc_face_contrast set AUDIT_STATUS='4' where ID_NUMBER = #{idNumber} @@ -1568,20 +1568,20 @@ and TEAM_ID = #{teamId} and is_active = 1 - + update bns_smz_bm_worker set NAME=#{name}, phone=#{phone} where ID_NUMBER=#{idNumber} - + update bns_smz_fc_face_contrast_state set st=CURDATE(),et=CURDATE(),state='1' where flage='1' or flage='3' - + UPDATE bns_smz_xbg_user_attendance SET user_id = #{userId}, @@ -1613,7 +1613,7 @@ id = #{id} - + update bns_smz_xbg_user_attendance set audit_status = #{auditStatus}, audti_user = #{auditUser}, @@ -1622,14 +1622,14 @@ WHERE id = #{id} - + update bns_smz_xbg_sign set sign_path = #{value1} where uuid = #{key} - + update bns_smz_xbg_contract_gx set clock_status = '1'