diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4acfb17..4d2fbfd 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -97,7 +97,7 @@ "Spring Boot.RnmwApplication.executor": "Debug", "git-widget-placeholder": "main", "kotlin-language-version-configured": "true", - "last_opened_file_path": "F:/workspace/idea/hn_cloud_service/HnRealNameBmw", + "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)", diff --git a/HnRealNameMw/src/main/resources/mappers/core/UserMapper.xml b/HnRealNameMw/src/main/resources/mappers/core/UserMapper.xml index 3e8c97d..30993b7 100644 --- a/HnRealNameMw/src/main/resources/mappers/core/UserMapper.xml +++ b/HnRealNameMw/src/main/resources/mappers/core/UserMapper.xml @@ -5,8 +5,8 @@ @@ -18,8 +18,8 @@ WHEN sr.type like concat('%','3','%') THEN '3' WHEN sr.type like concat('%','4','%') THEN '4' ELSE '' END as type - from sys_user t - LEFT JOIN sys_role sr ON sr.id=t.ROLE_ID + from bns_smz_sys_user t + LEFT JOIN bns_smz_sys_role sr ON sr.id=t.ROLE_ID where t.id = #{id} diff --git a/HnRealNameMw/src/main/resources/mappers/person/AttendanceMapper.xml b/HnRealNameMw/src/main/resources/mappers/person/AttendanceMapper.xml index 6311be8..b453b37 100644 --- a/HnRealNameMw/src/main/resources/mappers/person/AttendanceMapper.xml +++ b/HnRealNameMw/src/main/resources/mappers/person/AttendanceMapper.xml @@ -7,9 +7,9 @@ SELECT a.* FROM ( SELECT su.USERNAME as userName,ffc.`NAME`,ffc.PHOTO_PATH as photoPath, ffc.ID_NUMBER as idNumber,ffc.ADD_TIME as addTime - FROM fc_face_contrast ffc - LEFT JOIN bm_worker_record bwr ON bwr.ID_NUMBER=ffc.ID_NUMBER - LEFT JOIN sys_user su ON su.id=ffc.USER_ID + FROM bns_smz_fc_face_contrast ffc + LEFT JOIN bns_smz_bm_worker_record bwr ON bwr.ID_NUMBER=ffc.ID_NUMBER + LEFT JOIN bns_smz_sys_user su ON su.id=ffc.USER_ID WHERE ffc.is_active='1' AND ffc.AUDIT_STATUS='1' AND bwr.IS_ACTIVE='1' AND bwr.examine_status='1' and ffc.CURRENT_DAY=#{currentDay} and( @@ -32,16 +32,16 @@ bwr.PE_STATUS as peStatus,ffc.PHOTO_PATH as photoPath,bwah.EIN_TIME as addTime, ((substring(now(),1,4)-substring(bwr.ID_NUMBER,7,4))-(substring(bwr.ID_NUMBER,11,4)-date_format(now(),'%m%d')>0)) as age ,bwp.PHOTO_PATH as rlPhotoPath - FROM bm_worker_record bwr - LEFT JOIN fc_face_contrast ffc ON ffc.ID_NUMBER=bwr.ID_NUMBER - LEFT JOIN bm_worker_attend_history bwah ON bwah.ID_NUMBER = ffc.ID_NUMBER - LEFT JOIN bm_worker bw ON bw.ID_NUMBER=bwr.ID_NUMBER - LEFT JOIN pm_organization o ON o.id=bwr.ORG_ID - LEFT JOIN pm_company pc ON pc.id=o.COMPANY_ID - LEFT JOIN bm_project bp ON bp.id=bwr.PROJECT_ID - LEFT JOIN sys_dic_detail sdd ON sdd.id=bwr.POST_ID - LEFT JOIN bm_subcontractor bs ON bs.id=bwr.SUB_ID - LEFT JOIN bm_worker_photo bwp ON bwr.ID_NUMBER=bwp.ID_NUMBER AND bwp.PHOTO_TYPE='3' + FROM bns_smz_bm_worker_record bwr + LEFT JOIN bns_smz_fc_face_contrast ffc ON ffc.ID_NUMBER=bwr.ID_NUMBER + LEFT JOIN bns_smz_bm_worker_attend_history bwah ON bwah.ID_NUMBER = ffc.ID_NUMBER + LEFT JOIN bns_smz_bm_worker bw ON bw.ID_NUMBER=bwr.ID_NUMBER + LEFT JOIN bns_smz_pm_organization o ON o.id=bwr.ORG_ID + LEFT JOIN bns_smz_pm_company pc ON pc.id=o.COMPANY_ID + LEFT JOIN bns_smz_bm_project bp ON bp.id=bwr.PROJECT_ID + LEFT JOIN bns_smz_sys_dic_detail sdd ON sdd.id=bwr.POST_ID + LEFT JOIN bns_smz_bm_subcontractor bs ON bs.id=bwr.SUB_ID + LEFT JOIN bns_smz_bm_worker_photo bwp ON bwr.ID_NUMBER=bwp.ID_NUMBER AND bwp.PHOTO_TYPE='3' WHERE ffc.is_active='1' AND ffc.AUDIT_STATUS='1' AND bwr.IS_ACTIVE='1' AND bwr.examine_status='1' and ffc.ID_NUMBER=#{idNumber} and ffc.CURRENT_DAY=#{currentDay} GROUP BY ffc.ID_NUMBER diff --git a/HnRealNameMw/src/main/resources/mappers/person/CompanyMapper.xml b/HnRealNameMw/src/main/resources/mappers/person/CompanyMapper.xml index 92f1fa3..a3be276 100644 --- a/HnRealNameMw/src/main/resources/mappers/person/CompanyMapper.xml +++ b/HnRealNameMw/src/main/resources/mappers/person/CompanyMapper.xml @@ -4,12 +4,12 @@ - INSERT INTO pm_company( + INSERT INTO bns_smz_pm_company( org_name, org_credit_code, legal_person_name, @@ -55,22 +55,22 @@ @@ -103,7 +103,7 @@ @@ -116,7 +116,7 @@ - insert into sys_role_user(roleId,userId) + insert into bns_smz_sys_role_user(roleId,userId) values(#{roleId},#{userId}) @@ -124,20 +124,20 @@ VALUES (#{roleId}, #{id}); - - UPDATE sys_user SET `password`=#{password} WHERE phone=#{phone} and IS_ACTIVE='1' + + UPDATE bns_smz_sys_user SET `password`=#{password} WHERE phone=#{phone} and IS_ACTIVE='1' \ No newline at end of file diff --git a/HnRealNameMw/src/main/resources/mappers/person/ContractMapper.xml b/HnRealNameMw/src/main/resources/mappers/person/ContractMapper.xml index 6b6f92c..3a2479c 100644 --- a/HnRealNameMw/src/main/resources/mappers/person/ContractMapper.xml +++ b/HnRealNameMw/src/main/resources/mappers/person/ContractMapper.xml @@ -10,13 +10,13 @@ bwc.contractType as miurInsurance, if(bwc.sub_contract_url is null,bwc.person_contract_url,bwc.sub_contract_url) as url, if(bwc.contractType = '纸质合同','已签订',if((bwc.is_audit = 0 or bwc.is_audit = 2),'待签署',if(bwc.is_audit = 1,if((bwcd.is_sign != 0 AND bwcd.is_sign != 1),'待签署',if((bwcd.is_sign = 0),'未签订',if((bwcd.is_sign = 1),'已签订','未签订'))),'未签订'))) as stauts - FROM bm_worker_record bwr - LEFT JOIN bm_worker_attend_history bwah ON bwah.ID_NUMBER = bwr.ID_NUMBER - LEFT JOIN bm_worker_contract bwc ON bwc.idCard=bwr.ID_NUMBER - LEFT JOIN bm_worker_contract_details bwcd ON bwc.id = bwcd.contract_id - LEFT JOIN bm_worker bw ON bw.ID_NUMBER=bwr.ID_NUMBER - LEFT JOIN sys_dic_detail sdd ON sdd.id=bwr.POST_ID - LEFT JOIN bm_project bp ON bp.id = bwr.PROJECT_ID + FROM bns_smz_bm_worker_record bwr + LEFT JOIN bns_smz_bm_worker_attend_history bwah ON bwah.ID_NUMBER = bwr.ID_NUMBER + LEFT JOIN bns_smz_bm_worker_contract bwc ON bwc.idCard=bwr.ID_NUMBER + LEFT JOIN bns_smz_bm_worker_contract_details bwcd ON bwc.id = bwcd.contract_id + LEFT JOIN bns_smz_bm_worker bw ON bw.ID_NUMBER=bwr.ID_NUMBER + LEFT JOIN bns_smz_sys_dic_detail sdd ON sdd.id=bwr.POST_ID + LEFT JOIN bns_smz_bm_project bp ON bp.id = bwr.PROJECT_ID where bwr.IS_ACTIVE = '1' AND bw.IS_ACTIVE ='1' AND bwah.is_active = '1' AND bp.IS_ACTIVE = '1' and bp.id=#{proId} @@ -42,11 +42,11 @@ if(bwc.contractType="纸质合同","纸质合同","电子合同") as miurInsurance, if(bwc.sub_contract_url is null,bwc.person_contract_url,bwc.sub_contract_url) as url, if((bwc.is_audit = 0 or bwc.is_audit = 2),'待签署',if(bwc.is_audit = 1,if((bwcd.is_sign != 0 AND bwcd.is_sign != 1),'待签署',if((bwcd.is_sign = 0),'未签订',if((bwcd.is_sign = 1),'已签订','无数据'))),'无数据')) as stauts - FROM bm_worker_contract bwc - LEFT JOIN bm_worker_contract_details bwcd ON bwcd.part_b_idCard - LEFT JOIN bm_worker_record bwr ON bwr.ID_NUMBER=bwc.idCard - LEFT JOIN bm_worker bw ON bw.ID_NUMBER=bwr.ID_NUMBER - LEFT JOIN sys_dic_detail sdd ON sdd.id=bwr.POST_ID + FROM bns_smz_bm_worker_contract bwc + LEFT JOIN bns_smz_bm_worker_contract_details bwcd ON bwcd.part_b_idCard + LEFT JOIN bns_smz_bm_worker_record bwr ON bwr.ID_NUMBER=bwc.idCard + LEFT JOIN bns_smz_bm_worker bw ON bw.ID_NUMBER=bwr.ID_NUMBER + LEFT JOIN bns_smz_sys_dic_detail sdd ON sdd.id=bwr.POST_ID where bwc.is_audit='1' AND bwr.examine_status='1' and( @@ -66,8 +66,8 @@ SELECT u.USERNAME as uploadName, bww.upload_time as uploadTime, bww.witness_path as witnessPath - from bm_worker_witness bww - LEFT JOIN sys_user u ON u.id=bww.upload_id + from bns_smz_bm_worker_witness bww + LEFT JOIN bns_smz_sys_user u ON u.id=bww.upload_id WHERE bww.is_active='1' and bww.witness_type='1' AND bww.ID_NUMBER=#{idNumber} @@ -77,8 +77,8 @@ short_message as shortMessage, message,message_time as messageTime, video_url as videoUrl - FROM bm_worker_contract_details bwcd - LEFT JOIN bm_worker bw ON bw.ID_NUMBER=bwcd.part_b_idCard + FROM bns_smz_bm_worker_contract_details bwcd + LEFT JOIN bns_smz_bm_worker bw ON bw.ID_NUMBER=bwcd.part_b_idCard WHERE bwcd.part_b_idCard=#{idNumber} \ No newline at end of file diff --git a/HnRealNameMw/src/main/resources/mappers/person/HomeMapper.xml b/HnRealNameMw/src/main/resources/mappers/person/HomeMapper.xml index fb5925c..95447f1 100644 --- a/HnRealNameMw/src/main/resources/mappers/person/HomeMapper.xml +++ b/HnRealNameMw/src/main/resources/mappers/person/HomeMapper.xml @@ -9,7 +9,7 @@ c.counts as countsB,if((c.counts/a.counts) is null,0,truncate(c.counts/a.counts,2)) as agvB FROM( SELECT 1 as id,COUNT(1) as counts - FROM bm_project bp + FROM bns_smz_bm_project bp WHERE bp.is_active='1' AND bp.`status` is not null AND bp.company_id=#{companyId} @@ -17,7 +17,7 @@ )a LEFT JOIN( SELECT 1 as id,COUNT(1) as counts - FROM bm_project bp + FROM bns_smz_bm_project bp WHERE bp.is_active='1' AND bp.`status` !="完工" AND bp.company_id=#{companyId} @@ -25,7 +25,7 @@ )b ON b.id=a.id LEFT JOIN( SELECT 1 as id,COUNT(1) as counts - FROM bm_project bp + FROM bns_smz_bm_project bp WHERE bp.is_active='1' AND bp.`status`="完工" AND bp.company_id=#{companyId} @@ -39,10 +39,10 @@ select concat(name,'') as name,COUNT(id_number) as value from ( SELECT bw.id_number,sdd.name - FROM bm_worker bw - left join bm_worker_record bwr on bw.id_number=bwr.id_number - LEFT JOIN bm_project bp on bp.id=bwr.PROJECT_ID - LEFT JOIN sys_dic_detail sdd ON bwr.POST_ID=sdd.id + FROM bns_smz_bm_worker bw + left join bns_smz_bm_worker_record bwr on bw.id_number=bwr.id_number + LEFT JOIN bns_smz_bm_project bp on bp.id=bwr.PROJECT_ID + LEFT JOIN bns_smz_sys_dic_detail sdd ON bwr.POST_ID=sdd.id WHERE bwr.IS_ACTIVE = 1 and bw.IS_ACTIVE=1 and bwr.ein_status=1 and bwr.examine_status=1 AND bp.IS_ACTIVE='1' @@ -55,15 +55,14 @@ SELECT bwc.ID_NUMBER as idNumber, bct.name AS name - FROM - bm_worker_certificate bwc - LEFT JOIN bm_certificate_type bct ON bct.id = bwc.certificate_id AND bct.is_active = '1' - LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bwc.ID_NUMBER AND bw.is_active = '1' - LEFT JOIN bm_worker_record bwr ON bwr.ID_NUMBER = bw.ID_NUMBER - LEFT JOIN sys_dic_detail sdd ON sdd.id = bwr.POST_ID AND sdd.dic_type = 3 - LEFT JOIN bm_project bp ON bp.ID = bwr.PROJECT_ID - LEFT JOIN bm_subcontractor bs on bwr.SUB_ID = bs.ID - LEFT JOIN bm_sub_team bst ON bwr.TEAM_ID = bst.ID + FROM bns_smz_bm_worker_certificate bwc + LEFT JOIN bns_smz_bm_certificate_type bct ON bct.id = bwc.certificate_id AND bct.is_active = '1' + LEFT JOIN bns_smz_bm_worker bw ON bw.ID_NUMBER = bwc.ID_NUMBER AND bw.is_active = '1' + LEFT JOIN bns_smz_bm_worker_record bwr ON bwr.ID_NUMBER = bw.ID_NUMBER + LEFT JOIN bns_smz_sys_dic_detail sdd ON sdd.id = bwr.POST_ID AND sdd.dic_type = 3 + LEFT JOIN bns_smz_bm_project bp ON bp.ID = bwr.PROJECT_ID + LEFT JOIN bns_smz_bm_subcontractor bs on bwr.SUB_ID = bs.ID + LEFT JOIN bns_smz_bm_sub_team bst ON bwr.TEAM_ID = bst.ID WHERE bwc.is_active = '1' ) a group by name ) a order by value desc*/ @@ -72,15 +71,14 @@ SELECT bwc.ID_NUMBER as idNumber, bct.name AS name - FROM - bm_worker_certificate bwc - LEFT JOIN bm_certificate_type bct ON bct.id = bwc.certificate_id AND bct.is_active = '1' - LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bwc.ID_NUMBER AND bw.is_active = '1' - LEFT JOIN bm_worker_record bwr ON bwr.ID_NUMBER = bw.ID_NUMBER - LEFT JOIN sys_dic_detail sdd ON sdd.id = bwr.POST_ID AND sdd.dic_type = 3 - LEFT JOIN bm_project bp ON bp.ID = bwr.PROJECT_ID - LEFT JOIN bm_subcontractor bs on bwr.SUB_ID = bs.ID - LEFT JOIN bm_sub_team bst ON bwr.TEAM_ID = bst.ID + FROM bns_smz_bm_worker_certificate bwc + LEFT JOIN bns_smz_bm_certificate_type bct ON bct.id = bwc.certificate_id AND bct.is_active = '1' + LEFT JOIN bns_smz_bm_worker bw ON bw.ID_NUMBER = bwc.ID_NUMBER AND bw.is_active = '1' + LEFT JOIN bns_smz_bm_worker_record bwr ON bwr.ID_NUMBER = bw.ID_NUMBER + LEFT JOIN bns_smz_sys_dic_detail sdd ON sdd.id = bwr.POST_ID AND sdd.dic_type = 3 + LEFT JOIN bns_smz_bm_project bp ON bp.ID = bwr.PROJECT_ID + LEFT JOIN bns_smz_bm_subcontractor bs on bwr.SUB_ID = bs.ID + LEFT JOIN bns_smz_bm_sub_team bst ON bwr.TEAM_ID = bst.ID WHERE bwc.is_active = '1' ) a group by name ) a order by value desc @@ -89,9 +87,9 @@ @@ -153,18 +151,17 @@ select pro.orgname,pro.proid,pro.proname,pro.time, ( - SELECT count(1) FROM - bm_worker_attend_history bwah - LEFT JOIN bm_project bp ON bp.ID = bwah.PROJECT_ID - LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bwah.ID_NUMBER - LEFT JOIN sys_dic_detail sdd ON sdd.ID = bwah.POST_ID - LEFT JOIN bm_subcontractor bs ON bs.ID = bwah.SUB_ID - LEFT JOIN pm_organization po1 ON po1.ID = bwah.ORG_ID - LEFT JOIN bm_worker_record bwr ON bwah.ID_NUMBER = bwr.ID_NUMBER - LEFT JOIN bm_sub_team bst ON bst.ID = bwr.TEAM_ID - LEFT JOIN pm_organization po2 ON po2.ID = bwr.ORG_ID and po1.COMPANY_ID = po2.COMPANY_ID - LEFT JOIN sys_user su ON su.id = bwr.examine_user_id - left join pm_company pc on pc.id = po1.company_id + SELECT count(1) FROM bns_smz_bm_worker_attend_history bwah + LEFT JOIN bns_smz_bm_project bp ON bp.ID = bwah.PROJECT_ID + LEFT JOIN bns_smz_bm_worker bw ON bw.ID_NUMBER = bwah.ID_NUMBER + LEFT JOIN bns_smz_sys_dic_detail sdd ON sdd.ID = bwah.POST_ID + LEFT JOIN bns_smz_bm_subcontractor bs ON bs.ID = bwah.SUB_ID + LEFT JOIN bns_smz_pm_organization po1 ON po1.ID = bwah.ORG_ID + LEFT JOIN bns_smz_bm_worker_record bwr ON bwah.ID_NUMBER = bwr.ID_NUMBER + LEFT JOIN bns_smz_bm_sub_team bst ON bst.ID = bwr.TEAM_ID + LEFT JOIN bns_smz_pm_organization po2 ON po2.ID = bwr.ORG_ID and po1.COMPANY_ID = po2.COMPANY_ID + LEFT JOIN bns_smz_sys_user su ON su.id = bwr.examine_user_id + left join bns_smz_pm_company pc on pc.id = po1.company_id WHERE bwah.is_active = '1' and bw.is_active = '1' and bp.IS_ACTIVE = '1' and bwr.IS_ACTIVE = '1' and bwah.PROJECT_ID=pro.proid @@ -175,36 +172,35 @@ select count(*) from ( select distinct * from ( select distinct CURRENT_DAY,id_number,PRO_ID from - (select * from fc_face_contrast where is_active='1' and CURRENT_DAY>=DATE_FORMAT(SYSDATE(), '%Y-%m-%d') and DATE_FORMAT(SYSDATE(), '%Y-%m-%d')>=CURRENT_DAY) aa + (select * from bns_smz_fc_face_contrast where is_active='1' and CURRENT_DAY>=DATE_FORMAT(SYSDATE(), '%Y-%m-%d') and DATE_FORMAT(SYSDATE(), '%Y-%m-%d')>=CURRENT_DAY) aa where is_active='1' and is_success='1' and AUDIT_STATUS in ('0','1') GROUP BY CURRENT_DAY,id_number union select distinct fta.attendance_date as CURRENT_DAY,ffc.id_number,ffc.project_id as PRO_ID - FROM fc_team_attendance fta - LEFT JOIN fc_team_attendance_content ftac ON ftac.team_attendance_id = fta.id - LEFT JOIN bm_worker_record ffc ON ffc.ID_NUMBER = ftac.id_number + FROM bns_smz_fc_team_attendance fta + LEFT JOIN bns_smz_fc_team_attendance_content ftac ON ftac.team_attendance_id = fta.id + LEFT JOIN bns_smz_bm_worker_record ffc ON ffc.ID_NUMBER = ftac.id_number ) aa ) bb where bb.PRO_ID=pro.proid and bb.CURRENT_DAY=pro.time ) as worknum, ( select count(*) from ( select distinct * from ( select distinct CURRENT_DAY,id_number,PRO_ID from - (select * from fc_face_contrast where is_active='1' and CURRENT_DAY>=DATE_FORMAT(SYSDATE(), '%Y-%m-%d') and DATE_FORMAT(SYSDATE(), '%Y-%m-%d')>=CURRENT_DAY) aa + (select * from bns_smz_fc_face_contrast where is_active='1' and CURRENT_DAY>=DATE_FORMAT(SYSDATE(), '%Y-%m-%d') and DATE_FORMAT(SYSDATE(), '%Y-%m-%d')>=CURRENT_DAY) aa where is_active='1' and AUDIT_STATUS='3' GROUP BY CURRENT_DAY,id_number ) aa ) bb where bb.PRO_ID=pro.proid and bb.CURRENT_DAY=pro.time ) as restnum, ( - SELECT count(1) FROM - bm_worker_attend_history bwah - LEFT JOIN bm_project bp ON bp.ID = bwah.PROJECT_ID - LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bwah.ID_NUMBER - LEFT JOIN sys_dic_detail sdd ON sdd.ID = bwah.POST_ID - LEFT JOIN bm_subcontractor bs ON bs.ID = bwah.SUB_ID - LEFT JOIN pm_organization po1 ON po1.ID = bwah.ORG_ID - LEFT JOIN bm_worker_record bwr ON bwah.ID_NUMBER = bwr.ID_NUMBER - LEFT JOIN bm_sub_team bst ON bst.ID = bwr.TEAM_ID - LEFT JOIN pm_organization po2 ON po2.ID = bwr.ORG_ID and po1.COMPANY_ID = po2.COMPANY_ID - LEFT JOIN sys_user su ON su.id = bwr.examine_user_id - left join pm_company pc on pc.id = po1.company_id + SELECT count(1) FROM bns_smz_bm_worker_attend_history bwah + LEFT JOIN bns_smz_bm_project bp ON bp.ID = bwah.PROJECT_ID + LEFT JOIN bns_smz_bm_worker bw ON bw.ID_NUMBER = bwah.ID_NUMBER + LEFT JOIN bns_smz_sys_dic_detail sdd ON sdd.ID = bwah.POST_ID + LEFT JOIN bns_smz_bm_subcontractor bs ON bs.ID = bwah.SUB_ID + LEFT JOIN bns_smz_pm_organization po1 ON po1.ID = bwah.ORG_ID + LEFT JOIN bns_smz_bm_worker_record bwr ON bwah.ID_NUMBER = bwr.ID_NUMBER + LEFT JOIN bns_smz_bm_sub_team bst ON bst.ID = bwr.TEAM_ID + LEFT JOIN bns_smz_pm_organization po2 ON po2.ID = bwr.ORG_ID and po1.COMPANY_ID = po2.COMPANY_ID + LEFT JOIN bns_smz_sys_user su ON su.id = bwr.examine_user_id + left join bns_smz_pm_company pc on pc.id = po1.company_id WHERE bwah.is_active = '1' and bw.is_active = '1' and bp.IS_ACTIVE = '1' and bwr.IS_ACTIVE = '1' and bwah.PROJECT_ID=pro.proid @@ -212,18 +208,17 @@ else bwah.EXIT_TIME is not null and pro.time=DATE_FORMAT(bwah.EIN_TIME, '%Y-%m-%d') and DATE_FORMAT(bwah.EXIT_TIME, '%Y-%m-%d')>=pro.time end ) AS einNum, ( - SELECT count(1) FROM - bm_worker_attend_history bwah - LEFT JOIN bm_project bp ON bp.ID = bwah.PROJECT_ID - LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bwah.ID_NUMBER - LEFT JOIN sys_dic_detail sdd ON sdd.ID = bwah.POST_ID - LEFT JOIN bm_subcontractor bs ON bs.ID = bwah.SUB_ID - LEFT JOIN pm_organization po1 ON po1.ID = bwah.ORG_ID - LEFT JOIN bm_worker_record bwr ON bwah.ID_NUMBER = bwr.ID_NUMBER - LEFT JOIN bm_sub_team bst ON bst.ID = bwr.TEAM_ID - LEFT JOIN pm_organization po2 ON po2.ID = bwr.ORG_ID and po1.COMPANY_ID = po2.COMPANY_ID - LEFT JOIN sys_user su ON su.id = bwr.examine_user_id - left join pm_company pc on pc.id = po1.company_id + SELECT count(1) FROM bns_smz_bm_worker_attend_history bwah + LEFT JOIN bns_smz_bm_project bp ON bp.ID = bwah.PROJECT_ID + LEFT JOIN bns_smz_bm_worker bw ON bw.ID_NUMBER = bwah.ID_NUMBER + LEFT JOIN bns_smz_sys_dic_detail sdd ON sdd.ID = bwah.POST_ID + LEFT JOIN bns_smz_bm_subcontractor bs ON bs.ID = bwah.SUB_ID + LEFT JOIN bns_smz_pm_organization po1 ON po1.ID = bwah.ORG_ID + LEFT JOIN bns_smz_bm_worker_record bwr ON bwah.ID_NUMBER = bwr.ID_NUMBER + LEFT JOIN bns_smz_bm_sub_team bst ON bst.ID = bwr.TEAM_ID + LEFT JOIN bns_smz_pm_organization po2 ON po2.ID = bwr.ORG_ID and po1.COMPANY_ID = po2.COMPANY_ID + LEFT JOIN bns_smz_sys_user su ON su.id = bwr.examine_user_id + left join bns_smz_pm_company pc on pc.id = po1.company_id WHERE bwah.is_active = '1' and bw.is_active = '1' and bp.IS_ACTIVE = '1' and bwr.IS_ACTIVE = '1' and bwah.PROJECT_ID=pro.proid @@ -234,15 +229,15 @@ orgname,proid,proname,time from ( SELECT DATE_FORMAT( DATE_ADD(CONCAT(DATE_FORMAT(SYSDATE(), '%Y-%m-%d')), INTERVAL(help_topic_id) DAY),'%Y-%m-%d') time ,'1' as idd - FROM mysql.help_topic + FROM bns_smz_mysql.help_topic WHERE help_topic_id <= TIMESTAMPDIFF(DAY,CONCAT(DATE_FORMAT(SYSDATE(), '%Y-%m-%d')),CONCAT(DATE_FORMAT(SYSDATE(), '%Y-%m-%d'))) ORDER BY time ) times left join ( - select bp.id as proid,bp.name as proname,'1' as idd,CONCAT(org3.`NAME`,'/',org2.`NAME`,case when org.type='3' then '' else '/' end,case when org.type='3' then '' else org.`NAME` end) as orgname,bp.company_id from bm_project bp - left join pm_organization org on bp.company_id=org.id - left join pm_organization org2 on org.PARENT_ID=org2.id - left join pm_organization org3 on org2.PARENT_ID=org3.id + select bp.id as proid,bp.name as proname,'1' as idd,CONCAT(org3.`NAME`,'/',org2.`NAME`,case when org.type='3' then '' else '/' end,case when org.type='3' then '' else org.`NAME` end) as orgname,bp.company_id from bns_smz_bm_project bp + left join bns_smz_pm_organization org on bp.company_id=org.id + left join bns_smz_pm_organization org2 on org.PARENT_ID=org2.id + left join bns_smz_pm_organization org3 on org2.PARENT_ID=org3.id where bp.is_active='1' AND bp.status = '在建' ) bp on times.idd=bp.idd @@ -258,7 +253,7 @@ SELECT a.id,a.name,if(b.counts is null,0,b.counts) as countsA,if(c.counts is null,0,c.counts) as countsB FROM ( SELECT bp.id,bp.`name` - FROM bm_project bp + FROM bns_smz_bm_project bp where bp.is_active='1' AND bp.company_id=#{companyId} @@ -266,7 +261,7 @@ )a LEFT JOIN( SELECT sb.project_id as proId,COUNT(1) as counts - FROM salary_book_upload sb + FROM bns_smz_salary_book_upload sb WHERE sb.is_push='1' AND sb.company_id=#{companyId} @@ -275,8 +270,8 @@ )b ON a.id=b.proId LEFT JOIN( SELECT sb.project_id as proId,COUNT(sbd.salary_id) as counts - FROM salary_book_upload sb - LEFT JOIN salary_book_upload_details sbd ON sb.id=sbd.salary_id + FROM bns_smz_salary_book_upload sb + LEFT JOIN bns_smz_salary_book_upload_details sbd ON sb.id=sbd.salary_id WHERE sb.is_push='0' AND sb.company_id=#{companyId} @@ -290,9 +285,9 @@ SELECT bws.name,bws.LON,bws.LAT,pc.org_name as companyName,bp.`name` as proName,sdd.`name` as vol - FROM bm_work_scene bws - LEFT JOIN bm_project bp ON bp.id=bws.pro_id - LEFT JOIN pm_company pc ON pc.id=bp.company_id - LEFT JOIN sys_dic_detail sdd ON sdd.id=bp.voltage_level + FROM bns_smz_bm_work_scene bws + LEFT JOIN bns_smz_bm_project bp ON bp.id=bws.pro_id + LEFT JOIN bns_smz_pm_company pc ON pc.id=bp.company_id + LEFT JOIN bns_smz_sys_dic_detail sdd ON sdd.id=bp.voltage_level WHERE bws.IS_ACTIVE='1' AND sdd.dic_type='5' AND pc.id=#{companyId} @@ -329,7 +324,7 @@ if(b.yqdAudit is null,0,b.yqdAudit) as countsA, if(b.dshAudit is null,0,b.dshAudit) as countsB, if(b.wqdAudit is null,0,b.wqdAudit) as countsC - FROM bm_project bp + FROM bns_smz_bm_project bp LEFT JOIN( SELECT a.id,a.proName, COUNT(if(a.isAudit='待审核',a.isAudit,null)) as dshAudit, @@ -337,13 +332,13 @@ COUNT(if(a.isAudit='未签订',a.isAudit,null)) as wqdAudit FROM( SELECT bp.ID as id,bp.`name` AS proName, if(bwc.contractType = '纸质合同','已签订',if((bwc.is_audit = 0 or bwc.is_audit = 2),'待签署',if(bwc.is_audit = 1,if((bwcd.is_sign != 0 AND bwcd.is_sign != 1),'待签署',if((bwcd.is_sign = 0),'未签订',if((bwcd.is_sign = 1),'已签订','未签订'))),'未签订'))) as isAudit - FROM bm_worker_record bwr - LEFT JOIN bm_worker_attend_history bwah ON bwah.ID_NUMBER = bwr.ID_NUMBER - LEFT JOIN bm_worker_contract bwc ON bwc.idCard=bwr.ID_NUMBER - LEFT JOIN bm_worker_contract_details bwcd ON bwc.id = bwcd.contract_id - LEFT JOIN bm_worker bw ON bw.ID_NUMBER=bwr.ID_NUMBER - LEFT JOIN sys_dic_detail sdd ON sdd.id=bwr.POST_ID - LEFT JOIN bm_project bp ON bp.id = bwr.PROJECT_ID + FROM bns_smz_bm_worker_record bwr + LEFT JOIN bns_smz_bm_worker_attend_history bwah ON bwah.ID_NUMBER = bwr.ID_NUMBER + LEFT JOIN bns_smz_bm_worker_contract bwc ON bwc.idCard=bwr.ID_NUMBER + LEFT JOIN bns_smz_bm_worker_contract_details bwcd ON bwc.id = bwcd.contract_id + LEFT JOIN bns_smz_bm_worker bw ON bw.ID_NUMBER=bwr.ID_NUMBER + LEFT JOIN bns_smz_sys_dic_detail sdd ON sdd.id=bwr.POST_ID + LEFT JOIN bns_smz_bm_project bp ON bp.id = bwr.PROJECT_ID where bwr.IS_ACTIVE = '1' AND bw.IS_ACTIVE ='1' AND bwah.is_active = '1' AND bp.IS_ACTIVE = '1' @@ -383,11 +378,11 @@ FROM( SELECT '年龄结构' as orgName, ((substring(now(),1,4)-substring(bwr.ID_NUMBER,7,4))-(substring(bwr.ID_NUMBER,11,4)-date_format(now(),'%m%d')>0)) as age - FROM bm_worker_record bwr - LEFT JOIN pm_organization o on o.id=bwr.org_id - LEFT JOIN bm_project bp on bp.id=bwr.PROJECT_ID - LEFT JOIN bm_worker bw on bwr.ID_NUMBER=bw.ID_NUMBER - LEFT JOIN bm_worker_attend_history bwah on bwah.ID_NUMBER=bwr.ID_NUMBER + FROM bns_smz_bm_worker_record bwr + LEFT JOIN bns_smz_pm_organization o on o.id=bwr.org_id + LEFT JOIN bns_smz_bm_project bp on bp.id=bwr.PROJECT_ID + LEFT JOIN bns_smz_bm_worker bw on bwr.ID_NUMBER=bw.ID_NUMBER + LEFT JOIN bns_smz_bm_worker_attend_history bwah on bwah.ID_NUMBER=bwr.ID_NUMBER WHERE bwr.IS_ACTIVE='1' and bp.IS_ACTIVE='1' and bw.IS_ACTIVE='1' and bwah.is_active='1' GROUP BY bwr.ID_NUMBER )a diff --git a/HnRealNameMw/src/main/resources/mappers/person/MapMapper.xml b/HnRealNameMw/src/main/resources/mappers/person/MapMapper.xml index cc32f59..b354e9a 100644 --- a/HnRealNameMw/src/main/resources/mappers/person/MapMapper.xml +++ b/HnRealNameMw/src/main/resources/mappers/person/MapMapper.xml @@ -6,7 +6,7 @@ SELECT bp.id,bp.name,bp.abbreviation - FROM bm_project bp - -- LEFT JOIN pm_company pc ON pc.id=bp.company_id + FROM bns_smz_bm_project bp + -- LEFT JOIN bns_smz_pm_company pc ON pc.id=bp.company_id WHERE bp.is_active='1' - AND bp.company_id in(SELECT id FROM pm_organization WHERE company_id = #{key}) + AND bp.company_id in(SELECT id FROM bns_smz_pm_organization WHERE company_id = #{key}) select po.id,po.`NAME` - FROM pm_organization po + FROM bns_smz_pm_organization po WHERE po.IS_ACTIVE='1' AND po.type='3' and po.COMPANY_ID=#{key} @@ -44,13 +44,13 @@ \ No newline at end of file diff --git a/HnRealNameMw/src/main/resources/mappers/person/ProInfoMapper.xml b/HnRealNameMw/src/main/resources/mappers/person/ProInfoMapper.xml index 429ee29..86d01ab 100644 --- a/HnRealNameMw/src/main/resources/mappers/person/ProInfoMapper.xml +++ b/HnRealNameMw/src/main/resources/mappers/person/ProInfoMapper.xml @@ -8,9 +8,9 @@ SELECT bp.id,bp.`name`,pc.org_name as orgName,bp.pro_type as proType, sdd.`name` as voltageLevel,bp.origin,bp.power_grid as powerGrid, bp.`status`,bp.is_push as isPush - FROM bm_project bp - LEFT JOIN pm_company pc ON pc.id=bp.company_id - LEFT JOIN sys_dic_detail sdd ON sdd.id=bp.voltage_level + FROM bns_smz_bm_project bp + LEFT JOIN bns_smz_pm_company pc ON pc.id=bp.company_id + LEFT JOIN bns_smz_sys_dic_detail sdd ON sdd.id=bp.voltage_level WHERE bp.is_active='1' AND sdd.dic_type='5' AND bp.company_id=#{bean.orgId} @@ -42,7 +42,7 @@ SELECT name,id_number as idNumber, dept as orgName,event,'' as postName - FROM bm_blacklist_worker bbw + FROM bns_smz_bm_blacklist_worker bbw WHERE bbw.`status`='1' and is_free='0' @@ -47,7 +47,7 @@ vww.sub_id AS subId,vww.SUB_NAME AS subName, vww.pro_id AS proId,vww.pro_name AS proName, vww.is_red_or_white AS isRed - FROM v_white_worker vww + FROM bns_smz_v_white_worker vww WHERE 1=1 and( diff --git a/HnRealNameMw/src/main/resources/mappers/person/SalaryMapper.xml b/HnRealNameMw/src/main/resources/mappers/person/SalaryMapper.xml index 00a2c13..c284c4e 100644 --- a/HnRealNameMw/src/main/resources/mappers/person/SalaryMapper.xml +++ b/HnRealNameMw/src/main/resources/mappers/person/SalaryMapper.xml @@ -30,10 +30,10 @@ WHEN '8' THEN '异常数据' WHEN '9' THEN '异常，未知状态' ELSE '未提交' end as isPay, sbu.name as salaryName,sbu.remark - FROM salary_book_upload sbu - LEFT JOIN salary_book_upload_details sbd ON sbu.id=sbd.salary_id - LEFT JOIN bm_project bp ON bp.id=sbu.project_id - LEFT JOIN pm_company pc ON pc.id=sbu.company_id + FROM bns_smz_salary_book_upload sbu + LEFT JOIN bns_smz_salary_book_upload_details sbd ON sbu.id=sbd.salary_id + LEFT JOIN bns_smz_bm_project bp ON bp.id=sbu.project_id + LEFT JOIN bns_smz_pm_company pc ON pc.id=sbu.company_id where 1=1 and sbu.is_push=#{isPay} diff --git a/HnRealNameMw/src/main/resources/mappers/person/WorkerAttendanceMapper.xml b/HnRealNameMw/src/main/resources/mappers/person/WorkerAttendanceMapper.xml index baf2409..7e7a912 100644 --- a/HnRealNameMw/src/main/resources/mappers/person/WorkerAttendanceMapper.xml +++ b/HnRealNameMw/src/main/resources/mappers/person/WorkerAttendanceMapper.xml @@ -10,14 +10,14 @@ if(bwah.`NAME` is null,'',bwah.`NAME`) as name,bwah.ID_NUMBER as idNumber, sdd.`name` as postName,pc.org_name as orgName,bp.name as proName,bp.status, bs.SUB_NAME as subName,bst.`NAME` as teamName,pc.id as orgId,bwah.PROJECT_ID as proId,bwah.EIN_TIME - FROM bm_worker_attend_history bwah - left join bm_worker bw on bw.id_number = bwah.id_number - LEFT JOIN sys_dic_detail sdd ON sdd.id=bwah.POST_ID - LEFT JOIN bm_subcontractor bs ON bs.id=bwah.SUB_ID - LEFT JOIN bm_sub_team bst ON bst.id=bwah.TEAM_ID - LEFT JOIN bm_project bp ON bp.id=bwah.PROJECT_ID - LEFT JOIN pm_organization org ON org.ID=bp.company_id - LEFT JOIN pm_company pc ON pc.id=org.company_id + FROM bns_smz_bm_worker_attend_history bwah + left join bns_smz_bm_worker bw on bw.id_number = bwah.id_number + LEFT JOIN bns_smz_sys_dic_detail sdd ON sdd.id=bwah.POST_ID + LEFT JOIN bns_smz_bm_subcontractor bs ON bs.id=bwah.SUB_ID + LEFT JOIN bns_smz_bm_sub_team bst ON bst.id=bwah.TEAM_ID + LEFT JOIN bns_smz_bm_project bp ON bp.id=bwah.PROJECT_ID + LEFT JOIN bns_smz_pm_organization org ON org.ID=bp.company_id + LEFT JOIN bns_smz_pm_company pc ON pc.id=org.company_id WHERE bwah.IS_ACTIVE='1' and bw.IS_ACTIVE='1' and bp.IS_ACTIVE = '1' and IF(bwah.EXIT_TIME IS NOT NULL AND bwah.EXIT_TIME != '',(LEFT(bwah.EIN_TIME,10) <= #{bean.endTime} and LEFT(bwah.EIN_TIME,10) >= #{bean.startTime} or LEFT(bwah.EIN_TIME,10) <= #{bean.startTime} and LEFT(bwah.EXIT_TIME,10) >=#{bean.startTime} and LEFT(bwah.EXIT_TIME,10) <= #{bean.endTime} @@ -42,15 +42,15 @@ if(bwah.`NAME` is null,'',bwah.`NAME`) as name,bwah.ID_NUMBER as idNumber, sdd.`name` as postName,pc.org_name as orgName,bp.name as proName,bp.status, bs.SUB_NAME as subName,bst.`NAME` as teamName,pc.id as orgId,bwah.PROJECT_ID as proId,bwah.EIN_TIME - FROM bm_worker_attend_history bwah - left join bm_worker bw on bw.id_number = bwah.id_number - LEFT JOIN sys_dic_detail sdd ON sdd.id=bwah.POST_ID - LEFT JOIN bm_subcontractor bs ON bs.id=bwah.SUB_ID - LEFT JOIN bm_sub_team bst ON bst.id=bwah.TEAM_ID - left join fc_face_contrast ffc on ffc.ID_NUMBER = bwah.ID_NUMBER AND bwah.PROJECT_ID = ffc.PRO_ID - LEFT JOIN bm_project bp ON bp.id=bwah.PROJECT_ID - LEFT JOIN pm_organization org ON org.ID=bp.company_id - LEFT JOIN pm_company pc ON pc.id=org.company_id + FROM bns_smz_bm_worker_attend_history bwah + left join bns_smz_bm_worker bw on bw.id_number = bwah.id_number + LEFT JOIN bns_smz_sys_dic_detail sdd ON sdd.id=bwah.POST_ID + LEFT JOIN bns_smz_bm_subcontractor bs ON bs.id=bwah.SUB_ID + LEFT JOIN bns_smz_bm_sub_team bst ON bst.id=bwah.TEAM_ID + left join bns_smz_fc_face_contrast ffc on ffc.ID_NUMBER = bwah.ID_NUMBER AND bwah.PROJECT_ID = ffc.PRO_ID + LEFT JOIN bns_smz_bm_project bp ON bp.id=bwah.PROJECT_ID + LEFT JOIN bns_smz_pm_organization org ON org.ID=bp.company_id + LEFT JOIN bns_smz_pm_company pc ON pc.id=org.company_id WHERE bwah.IS_ACTIVE='1' and bw.IS_ACTIVE='1' and bp.IS_ACTIVE = '1' and ffc.CURRENT_DAY BETWEEN #{bean.startTime} AND #{bean.endTime} and IF(bwah.EXIT_TIME IS NOT NULL AND bwah.EXIT_TIME != '',(LEFT(bwah.EIN_TIME,10) <= #{bean.endTime} and LEFT(bwah.EIN_TIME,10) >= #{bean.startTime} @@ -82,8 +82,8 @@ ffc.WORK_HOURS as kqCounts, ffc.OVER_HOURS as jbCounts, bwr.PROJECT_ID as proId - from bm_worker_record bwr - LEFT JOIN fc_face_contrast ffc ON ffc.ID_NUMBER = bwr.ID_NUMBER + from bns_smz_bm_worker_record bwr + LEFT JOIN bns_smz_fc_face_contrast ffc ON ffc.ID_NUMBER = bwr.ID_NUMBER where ffc.PRO_ID = #{proId} and bwr.ID_NUMBER = #{idNumber} and ffc.CURRENT_DAY = #{time} @@ -94,7 +94,7 @@ @@ -110,14 +110,14 @@ SELECT if(bw.name is null,'',bw.name) as name,bwr.ID_NUMBER as idNumber, sdd.`name` as postName,pc.org_name as orgName,bp.name as proName, bs.SUB_NAME as subName,bst.`NAME` as teamName,pc.id as orgId,bp.id as proId - FROM bm_worker_record bwr - LEFT JOIN bm_worker bw ON bw.ID_NUMBER=bwr.ID_NUMBER - LEFT JOIN pm_organization o ON o.id=bwr.ORG_ID - LEFT JOIN pm_company pc ON pc.id=o.COMPANY_ID - LEFT JOIN bm_project bp ON bp.id=bwr.PROJECT_ID - LEFT JOIN sys_dic_detail sdd ON sdd.id=bwr.POST_ID - LEFT JOIN bm_subcontractor bs ON bs.id=bwr.SUB_ID - LEFT JOIN bm_sub_team bst ON bst.id=bwr.TEAM_ID + FROM bns_smz_bm_worker_record bwr + LEFT JOIN bns_smz_bm_worker bw ON bw.ID_NUMBER=bwr.ID_NUMBER + LEFT JOIN bns_smz_pm_organization o ON o.id=bwr.ORG_ID + LEFT JOIN bns_smz_pm_company pc ON pc.id=o.COMPANY_ID + LEFT JOIN bns_smz_bm_project bp ON bp.id=bwr.PROJECT_ID + LEFT JOIN bns_smz_sys_dic_detail sdd ON sdd.id=bwr.POST_ID + LEFT JOIN bns_smz_bm_subcontractor bs ON bs.id=bwr.SUB_ID + LEFT JOIN bns_smz_bm_sub_team bst ON bst.id=bwr.TEAM_ID WHERE bwr.IS_ACTIVE='1' AND bwr.examine_status='1' )a LEFT JOIN( @@ -126,8 +126,8 @@ SUM(ffc.WORK_HOURS) as kqCounts, SUM(ffc.OVER_HOURS) as jbCounts, (DATEDIFF(#{endTime},#{startTime})-COUNT(ffc.ID_NUMBER)+1) as qqCounts - FROM bm_worker_record bwr - LEFT JOIN fc_face_contrast ffc ON ffc.ID_NUMBER=bwr.ID_NUMBER + FROM bns_smz_bm_worker_record bwr + LEFT JOIN bns_smz_fc_face_contrast ffc ON ffc.ID_NUMBER=bwr.ID_NUMBER WHERE bwr.IS_ACTIVE='1' AND bwr.examine_status='1' AND ffc.AUDIT_STATUS='1' AND ffc.is_active='1' AND ffc.CURRENT_DAY BETWEEN #{startTime} AND #{endTime} GROUP BY bwr.ID_NUMBER @@ -169,9 +169,9 @@ ffc.lon, ffc.lat, ffc.ADD_TIME as addTime - FROM fc_face_contrast ffc - LEFT JOIN bm_project bp ON bp.id=ffc.PRO_ID - LEFT JOIN sys_user u ON u.id=ffc.AUDITOR + FROM bns_smz_fc_face_contrast ffc + LEFT JOIN bns_smz_bm_project bp ON bp.id=ffc.PRO_ID + LEFT JOIN bns_smz_sys_user u ON u.id=ffc.AUDITOR WHERE ffc.is_active='1' AND ffc.CURRENT_DAY = #{bean.currentDay} AND ffc.PRO_ID=#{bean.proId} @@ -190,9 +190,9 @@ ffc.WORK_HOURS as workHours,ffc.OVER_HOURS as overHours, CASE ffc.AUDIT_STATUS WHEN '0' THEN '待审核' WHEN '1' THEN '有效' WHEN '2' THEN'无效' END as auditStatus, u.USERNAME as AUDITOR,ffc.AUDIT_TIME as auditTime,ffc.AUDIT_REMARK as auditRemark,ffc.lon,ffc.lat,ffc.ADD_TIME as addTime - FROM fc_face_contrast ffc - LEFT JOIN bm_project bp ON bp.id=ffc.PRO_ID - LEFT JOIN sys_user u ON u.id=ffc.AUDITOR + FROM bns_smz_fc_face_contrast ffc + LEFT JOIN bns_smz_bm_project bp ON bp.id=ffc.PRO_ID + LEFT JOIN bns_smz_sys_user u ON u.id=ffc.AUDITOR WHERE ffc.is_active='1' AND ffc.CURRENT_DAY = #{bean.currentDay} AND ffc.PRO_ID=#{bean.proId} and ffc.ID_NUMBER=#{bean.idNumber} @@ -207,7 +207,7 @@ SELECT a.* FROM ( SELECT ffc.CURRENT_DAY as currentDay, CASE ffc.AUDIT_STATUS WHEN '0' THEN '待审核' WHEN '1' THEN '有效' WHEN '2' THEN'无效' END as auditStatus - FROM fc_face_contrast ffc + FROM bns_smz_fc_face_contrast ffc WHERE ffc.is_active='1' AND ffc.CURRENT_DAY BETWEEN #{startTime} AND #{endTime} AND ffc.PRO_ID=#{proId} @@ -220,7 +220,7 @@ select AUDIT_STATUS as auditStatus - from fc_face_contrast + from bns_smz_fc_face_contrast where CURRENT_DAY = #{currentDay} and ID_NUMBER = #{idNumber} and PRO_ID = #{proId} @@ -239,15 +239,15 @@ SELECT ffc.ID_NUMBER as idNumber,ffc.CURRENT_DAY as currentDay,bp.ID as proId - FROM fc_face_contrast ffc - LEFT JOIN bm_project bp ON bp.id=ffc.PRO_ID - LEFT JOIN bm_worker_record bwr ON bwr.ID_NUMBER=ffc.ID_NUMBER - LEFT JOIN bm_worker bw ON bw.ID_NUMBER= bwr.ID_NUMBER + FROM bns_smz_fc_face_contrast ffc + LEFT JOIN bns_smz_bm_project bp ON bp.id=ffc.PRO_ID + LEFT JOIN bns_smz_bm_worker_record bwr ON bwr.ID_NUMBER=ffc.ID_NUMBER + LEFT JOIN bns_smz_bm_worker bw ON bw.ID_NUMBER= bwr.ID_NUMBER WHERE ffc.is_active='1' AND ffc.AUDIT_STATUS='1' AND bwr.IS_ACTIVE='1' AND bwr.examine_status='1' AND ffc.CURRENT_DAY BETWEEN #{startTime} AND #{endTime} @@ -312,8 +312,7 @@ left(bwah.EIN_TIME,10) AS einTime, left(bwah.EXIT_TIME,10) AS exitTime, bwah.ID_NUMBER AS idNumber - FROM - bm_worker_attend_history bwah + FROM bns_smz_bm_worker_attend_history bwah WHERE bwah.PROJECT_ID = #{proId} AND bwah.ID_NUMBER = #{idNumber} ORDER BY bwah.EIN_TIME asc @@ -322,8 +321,7 @@ SELECT bwp.PHOTO_PATH as photoPath,bwp.PHOTO_TYPE as photoType - FROM bm_worker_photo bwp + FROM bns_smz_bm_worker_photo bwp WHERE bwp.ID_NUMBER=#{idNumber} AND bwp.IS_ACTIVE='1' \ No newline at end of file diff --git a/HnRealNameMw/src/main/resources/mappers/person/WorkerPostMapper.xml b/HnRealNameMw/src/main/resources/mappers/person/WorkerPostMapper.xml index b6401d6..c76c4ed 100644 --- a/HnRealNameMw/src/main/resources/mappers/person/WorkerPostMapper.xml +++ b/HnRealNameMw/src/main/resources/mappers/person/WorkerPostMapper.xml @@ -8,11 +8,11 @@ SELECT pc.id as orgId,pc.org_name as orgName, sdd.id as postId,sdd.`name` as postName, COUNT(DISTINCT bwr.ID_NUMBER) as counts - FROM bm_worker_record bwr - LEFT JOIN sys_dic_detail sdd ON bwr.POST_ID=sdd.id - LEFT JOIN pm_organization o ON o.id=bwr.ORG_ID - LEFT JOIN pm_company pc ON pc.id=o.COMPANY_ID - LEFT JOIN bm_project bp ON bp.id=bwr.PROJECT_ID + FROM bns_smz_bm_worker_record bwr + LEFT JOIN bns_smz_sys_dic_detail sdd ON bwr.POST_ID=sdd.id + LEFT JOIN bns_smz_pm_organization o ON o.id=bwr.ORG_ID + LEFT JOIN bns_smz_pm_company pc ON pc.id=o.COMPANY_ID + LEFT JOIN bns_smz_bm_project bp ON bp.id=bwr.PROJECT_ID WHERE bwr.IS_ACTIVE='1' AND bwr.examine_status='1' AND pc.id=#{bean.companyId} @@ -86,20 +86,19 @@ ELSE '健康' END as peStatus, bw.phone - FROM - bm_worker_record bwr - LEFT JOIN bm_worker bw on bw.ID_NUMBER=bwr.ID_NUMBER - LEFT JOIN pm_organization po ON po.id=bwr.ORG_ID - LEFT JOIN pm_company pc ON pc.id=po.company_id - LEFT JOIN bm_project bp ON bp.id=bwr.PROJECT_ID - LEFT JOIN bm_subcontractor bs ON bs.id=bwr.SUB_ID - LEFT JOIN sys_dic_detail sdd ON sdd.id=bwr.POST_ID - LEFT JOIN bm_worker_attend_history bwah on bwah.ID_NUMBER=bwr.ID_NUMBER - LEFT JOIN bm_worker_certificate bwc ON bwc.id_number=bwr.id_number AND bwc.is_active='1' - LEFT JOIN bm_certificate_type bct ON bwc.certificate_id = bct.id - LEFT JOIN (SELECT ID_NUMBER,SUM(WORK_HOURS) as WORK_HOURS FROM fc_face_contrast WHERE IS_ACTIVE='1' and + FROM bns_smz_bm_worker_record bwr + LEFT JOIN bns_smz_bm_worker bw on bw.ID_NUMBER=bwr.ID_NUMBER + LEFT JOIN bns_smz_pm_organization po ON po.id=bwr.ORG_ID + LEFT JOIN bns_smz_pm_company pc ON pc.id=po.company_id + LEFT JOIN bns_smz_bm_project bp ON bp.id=bwr.PROJECT_ID + LEFT JOIN bns_smz_bm_subcontractor bs ON bs.id=bwr.SUB_ID + LEFT JOIN bns_smz_sys_dic_detail sdd ON sdd.id=bwr.POST_ID + LEFT JOIN bns_smz_bm_worker_attend_history bwah on bwah.ID_NUMBER=bwr.ID_NUMBER + LEFT JOIN bns_smz_bm_worker_certificate bwc ON bwc.id_number=bwr.id_number AND bwc.is_active='1' + LEFT JOIN bns_smz_bm_certificate_type bct ON bwc.certificate_id = bct.id + LEFT JOIN (SELECT ID_NUMBER,SUM(WORK_HOURS) as WORK_HOURS FROM bns_smz_fc_face_contrast WHERE IS_ACTIVE='1' and (AUDIT_STATUS='0' or AUDIT_STATUS='1') GROUP BY ID_NUMBER) ffc on ffc.ID_NUMBER=bwr.ID_NUMBER - LEFT JOIN bm_worker_contract bwct ON bwct.idCard=bwr.id_number + LEFT JOIN bns_smz_bm_worker_contract bwct ON bwct.idCard=bwr.id_number WHERE bwr.IS_ACTIVE='1' and bp.IS_ACTIVE='1' and bw.IS_ACTIVE='1' and bwah.is_active='1' @@ -198,20 +197,19 @@ ELSE '健康' END as peStatus, bw.phone - FROM - bm_worker_record bwr - LEFT JOIN bm_worker bw on bw.ID_NUMBER=bwr.ID_NUMBER - LEFT JOIN pm_organization po ON po.id=bwr.ORG_ID - LEFT JOIN pm_company pc ON pc.id=po.company_id - LEFT JOIN bm_project bp ON bp.id=bwr.PROJECT_ID - LEFT JOIN bm_subcontractor bs ON bs.id=bwr.SUB_ID - LEFT JOIN sys_dic_detail sdd ON sdd.id=bwr.POST_ID - LEFT JOIN bm_worker_attend_history bwah on bwah.ID_NUMBER=bwr.ID_NUMBER - LEFT JOIN bm_worker_certificate bwc ON bwc.id_number=bwr.id_number AND bwc.is_active='1' - LEFT JOIN bm_certificate_type bct ON bwc.certificate_id = bct.id - LEFT JOIN (SELECT ID_NUMBER,SUM(WORK_HOURS) as WORK_HOURS FROM fc_face_contrast WHERE IS_ACTIVE='1' and + FROM bns_smz_bm_worker_record bwr + LEFT JOIN bns_smz_bm_worker bw on bw.ID_NUMBER=bwr.ID_NUMBER + LEFT JOIN bns_smz_pm_organization po ON po.id=bwr.ORG_ID + LEFT JOIN bns_smz_pm_company pc ON pc.id=po.company_id + LEFT JOIN bns_smz_bm_project bp ON bp.id=bwr.PROJECT_ID + LEFT JOIN bns_smz_bm_subcontractor bs ON bs.id=bwr.SUB_ID + LEFT JOIN bns_smz_sys_dic_detail sdd ON sdd.id=bwr.POST_ID + LEFT JOIN bns_smz_bm_worker_attend_history bwah on bwah.ID_NUMBER=bwr.ID_NUMBER + LEFT JOIN bns_smz_bm_worker_certificate bwc ON bwc.id_number=bwr.id_number AND bwc.is_active='1' + LEFT JOIN bns_smz_bm_certificate_type bct ON bwc.certificate_id = bct.id + LEFT JOIN (SELECT ID_NUMBER,SUM(WORK_HOURS) as WORK_HOURS FROM bns_smz_fc_face_contrast WHERE IS_ACTIVE='1' and (AUDIT_STATUS='0' or AUDIT_STATUS='1') GROUP BY ID_NUMBER) ffc on ffc.ID_NUMBER=bwr.ID_NUMBER - LEFT JOIN bm_worker_contract bwct ON bwct.idCard=bwr.id_number + LEFT JOIN bns_smz_bm_worker_contract bwct ON bwct.idCard=bwr.id_number WHERE bwr.IS_ACTIVE='1' and bp.IS_ACTIVE='1' and bw.IS_ACTIVE='1' and bwah.is_active='1' @@ -234,10 +232,10 @@ SELECT sdd.name as registerAddressCodeName - FROM sys_dic_type sdt - LEFT JOIN sys_dic_detail sdd ON sdt.id=sdd.dic_type + FROM bns_smz_sys_dic_type sdt + LEFT JOIN bns_smz_sys_dic_detail sdd ON sdt.id=sdd.dic_type WHERE sdt.is_active='1' AND sdt.id='2' @@ -951,13 +940,13 @@ count( t.ID_NUMBER ) as kqCounts,tt.t as address FROM ( select distinct bwr.id_number - FROM bm_worker_record bwr - LEFT JOIN bm_project bp on bp.id=bwr.PROJECT_ID - left join bm_worker_attend_history bwah on bwah.id_number=bwr.id_number - LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bwah.ID_NUMBER + FROM bns_smz_bm_worker_record bwr + LEFT JOIN bns_smz_bm_project bp on bp.id=bwr.PROJECT_ID + left join bns_smz_bm_worker_attend_history bwah on bwah.id_number=bwr.id_number + LEFT JOIN bns_smz_bm_worker bw ON bw.ID_NUMBER = bwah.ID_NUMBER WHERE bwr.IS_ACTIVE = 1 AND bp.IS_ACTIVE='1' and bwah.is_active ='1' and bw.IS_ACTIVE='1' ) t - LEFT JOIN t_area tt ON concat( SUBSTR( t.ID_NUMBER, 1, 2 )) = tt.`code` + LEFT JOIN bns_smz_t_area tt ON concat( SUBSTR( t.ID_NUMBER, 1, 2 )) = tt.`code` GROUP BY tt.t @@ -966,11 +955,11 @@ bwr.PROJECT_ID as `id`,bp.name as projectName,bwt.name as `userName`,bwt.id_number as `userId`,sdd.name as postId, bwt.trainStatus as trainStatus,bwt.trainType as trainType,bwt.totalStudytime as `totalStudytime`,bwt.trainStudytime as `trainStudytime`, case when (bwt.examscore+0)>=60 then 2 else 1 end as `examStatus`,bwt.examScore as `examScore` - FROM bm_worker_train bwt - LEFT JOIN bm_worker_record bwr ON bwr.ID_NUMBER = bwt.id_number - LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bwt.id_number - LEFT JOIN bm_project bp ON bp.ID = bwr.PROJECT_ID - LEFT JOIN sys_dic_detail sdd ON sdd.id = bwr.post_id + FROM bns_smz_bm_worker_train bwt + LEFT JOIN bns_smz_bm_worker_record bwr ON bwr.ID_NUMBER = bwt.id_number + LEFT JOIN bns_smz_bm_worker bw ON bw.ID_NUMBER = bwt.id_number + LEFT JOIN bns_smz_bm_project bp ON bp.ID = bwr.PROJECT_ID + LEFT JOIN bns_smz_sys_dic_detail sdd ON sdd.id = bwr.post_id WHERE 1 = 1 @@ -996,7 +985,7 @@ @@ -1005,10 +994,10 @@ COUNT( 1 ) from ( select distinct bwr.id_number - FROM bm_worker_record bwr - LEFT JOIN bm_project bp on bp.id=bwr.PROJECT_ID - left join bm_worker_attend_history bwah on bwah.id_number=bwr.id_number - LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bwah.ID_NUMBER + FROM bns_smz_bm_worker_record bwr + LEFT JOIN bns_smz_bm_project bp on bp.id=bwr.PROJECT_ID + left join bns_smz_bm_worker_attend_history bwah on bwah.id_number=bwr.id_number + LEFT JOIN bns_smz_bm_worker bw ON bw.ID_NUMBER = bwah.ID_NUMBER WHERE bwr.IS_ACTIVE = 1 AND bp.IS_ACTIVE='1' and bwah.is_active ='1' and bw.IS_ACTIVE='1' ) aa @@ -1024,8 +1013,7 @@ WHEN bwt.trainStatus = '2' THEN '已培训' END AS postName, count(bwt.trainStatus) as counts - FROM - bm_worker_train bwt + FROM bns_smz_bm_worker_train bwt WHERE bwt.is_active = 1 GROUP BY @@ -1033,8 +1021,7 @@ SELECT '安全培训' as orgName, '已培训' AS postName, count(bwt.id) as counts - FROM - bm_worker_train bwt + FROM bns_smz_bm_worker_train bwt WHERE bwt.is_active = 1 GROUP BY @@ -1048,15 +1035,14 @@ SELECT bwc.ID_NUMBER as idNumber, bct.name AS name - FROM - bm_worker_certificate bwc - LEFT JOIN bm_certificate_type bct ON bct.id = bwc.certificate_id AND bct.is_active = '1' - LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bwc.ID_NUMBER AND bw.is_active = '1' - LEFT JOIN bm_worker_record bwr ON bwr.ID_NUMBER = bw.ID_NUMBER - LEFT JOIN sys_dic_detail sdd ON sdd.id = bwr.POST_ID AND sdd.dic_type = 3 - LEFT JOIN bm_project bp ON bp.ID = bwr.PROJECT_ID - LEFT JOIN bm_subcontractor bs on bwr.SUB_ID = bs.ID - LEFT JOIN bm_sub_team bst ON bwr.TEAM_ID = bst.ID + FROM bns_smz_bm_worker_certificate bwc + LEFT JOIN bns_smz_bm_certificate_type bct ON bct.id = bwc.certificate_id AND bct.is_active = '1' + LEFT JOIN bns_smz_bm_worker bw ON bw.ID_NUMBER = bwc.ID_NUMBER AND bw.is_active = '1' + LEFT JOIN bns_smz_bm_worker_record bwr ON bwr.ID_NUMBER = bw.ID_NUMBER + LEFT JOIN bns_smz_sys_dic_detail sdd ON sdd.id = bwr.POST_ID AND sdd.dic_type = 3 + LEFT JOIN bns_smz_bm_project bp ON bp.ID = bwr.PROJECT_ID + LEFT JOIN bns_smz_bm_subcontractor bs on bwr.SUB_ID = bs.ID + LEFT JOIN bns_smz_bm_sub_team bst ON bwr.TEAM_ID = bst.ID WHERE bwc.is_active = '1' ) aa diff --git a/HnRealNameMw/src/main/resources/mappers/person/WorkerRecordMapper.xml b/HnRealNameMw/src/main/resources/mappers/person/WorkerRecordMapper.xml index daa4363..7ba7baa 100644 --- a/HnRealNameMw/src/main/resources/mappers/person/WorkerRecordMapper.xml +++ b/HnRealNameMw/src/main/resources/mappers/person/WorkerRecordMapper.xml @@ -16,15 +16,15 @@ u.USERNAME as examineUserName, bwr.examine_time as examineTime, bwr.examine_remark as examineRemark - FROM bm_worker_record bwr - LEFT JOIN bm_worker bw ON bw.ID_NUMBER=bwr.ID_NUMBER - LEFT JOIN sys_dic_detail sdd ON sdd.id=bwr.POST_ID - LEFT JOIN pm_organization o ON o.id=bwr.ORG_ID - LEFT JOIN pm_company pc ON pc.id=o.COMPANY_ID - LEFT JOIN bm_project bp ON bp.id=bwr.PROJECT_ID - LEFT JOIN bm_subcontractor bs ON bs.id=bwr.SUB_ID - LEFT JOIN bm_sub_team bst ON bst.id=bwr.TEAM_ID - LEFT JOIN sys_user u ON u.id=bwr.examine_user_id + FROM bns_smz_bm_worker_record bwr + LEFT JOIN bns_smz_bm_worker bw ON bw.ID_NUMBER=bwr.ID_NUMBER + LEFT JOIN bns_smz_sys_dic_detail sdd ON sdd.id=bwr.POST_ID + LEFT JOIN bns_smz_pm_organization o ON o.id=bwr.ORG_ID + LEFT JOIN bns_smz_pm_company pc ON pc.id=o.COMPANY_ID + LEFT JOIN bns_smz_bm_project bp ON bp.id=bwr.PROJECT_ID + LEFT JOIN bns_smz_bm_subcontractor bs ON bs.id=bwr.SUB_ID + LEFT JOIN bns_smz_bm_sub_team bst ON bst.id=bwr.TEAM_ID + LEFT JOIN bns_smz_sys_user u ON u.id=bwr.examine_user_id WHERE bwr.IS_ACTIVE='1' AND bp.IS_ACTIVE='1' and pc.id=#{orgId}