diff --git a/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml b/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml index 5b4bef11..e1e5af46 100644 --- a/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml @@ -439,14 +439,14 @@ - update `qa-gwj-prevention`.oa_department + update `qa-czks-prevention`.oa_department set NAME = #{NAME} where DEPARTMENT_ID = #{DEPARTMENT_ID} - update `qa-gwj-prevention`.SYS_USER + update `qa-czks-prevention`.SYS_USER set USERNAME = #{USERNAME}, NAME = #{NAME}, PASSWORD = #{PASSWORD} diff --git a/src/main/resources/mybatis/datasource/bus/CorpPromiseDetailsMapper.xml b/src/main/resources/mybatis/datasource/bus/CorpPromiseDetailsMapper.xml index 9ea86c9f..40ff8864 100644 --- a/src/main/resources/mybatis/datasource/bus/CorpPromiseDetailsMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/CorpPromiseDetailsMapper.xml @@ -9,7 +9,7 @@ - `qa-gwj-prevention`.sys_dictionaries + `qa-czks-prevention`.sys_dictionaries diff --git a/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml b/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml index 039a12bc..ba06f27f 100644 --- a/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml @@ -9,7 +9,7 @@ - `qa-gwj-prevention`.sys_dictionaries + `qa-czks-prevention`.sys_dictionaries @@ -186,7 +186,7 @@ select f.PROMISE_ID,f.PROMISE_NAME,f.TEXT,f.TYPE from - `qa-gwj-regulatory`.BUS_PROMISE f + `qa-czks-regulatory`.BUS_PROMISE f where 1=1 and f.ISDELETE = 0 and f.PROMISE_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') @@ -204,7 +204,7 @@ f.PROMISE_ID, f.COLLATERAL from - `qa-gwj-regulatory`.BUS_PROMISE_DETAILS f + `qa-czks-regulatory`.BUS_PROMISE_DETAILS f where f.PROMISE_ID = #{PROMISE_ID} diff --git a/src/main/resources/mybatis/datasource/bus/CorpPromisePeopleMapper.xml b/src/main/resources/mybatis/datasource/bus/CorpPromisePeopleMapper.xml index 7f80accf..9253defc 100644 --- a/src/main/resources/mybatis/datasource/bus/CorpPromisePeopleMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/CorpPromisePeopleMapper.xml @@ -9,7 +9,7 @@ - `qa-gwj-prevention`.sys_dictionaries + `qa-czks-prevention`.sys_dictionaries diff --git a/src/main/resources/mybatis/datasource/bus/ImgFilesMapper.xml b/src/main/resources/mybatis/datasource/bus/ImgFilesMapper.xml index ebbab79a..23094ed1 100644 --- a/src/main/resources/mybatis/datasource/bus/ImgFilesMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/ImgFilesMapper.xml @@ -9,7 +9,7 @@ - `qa-gwj-prevention`.sys_dictionaries + `qa-czks-prevention`.sys_dictionaries diff --git a/src/main/resources/mybatis/datasource/bus/PromiseDetailsMapper.xml b/src/main/resources/mybatis/datasource/bus/PromiseDetailsMapper.xml index d81a6983..b703f6cf 100644 --- a/src/main/resources/mybatis/datasource/bus/PromiseDetailsMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/PromiseDetailsMapper.xml @@ -4,12 +4,12 @@ - `qa-gwj-regulatory`.BUS_PROMISE_DETAILS + `qa-czks-regulatory`.BUS_PROMISE_DETAILS - `qa-gwj-prevention`.sys_dictionaries + `qa-czks-prevention`.sys_dictionaries diff --git a/src/main/resources/mybatis/datasource/bus/PromiseMapper.xml b/src/main/resources/mybatis/datasource/bus/PromiseMapper.xml index f70f1413..84ab140f 100644 --- a/src/main/resources/mybatis/datasource/bus/PromiseMapper.xml +++ b/src/main/resources/mybatis/datasource/bus/PromiseMapper.xml @@ -4,12 +4,12 @@ - `qa-gwj-regulatory`.BUS_PROMISE + `qa-czks-regulatory`.BUS_PROMISE - `qa-gwj-prevention`.sys_dictionaries + `qa-czks-prevention`.sys_dictionaries diff --git a/src/main/resources/mybatis/datasource/corpsystem/CorpUsersMapper.xml b/src/main/resources/mybatis/datasource/corpsystem/CorpUsersMapper.xml index 63d5f9de..d51ce451 100644 --- a/src/main/resources/mybatis/datasource/corpsystem/CorpUsersMapper.xml +++ b/src/main/resources/mybatis/datasource/corpsystem/CorpUsersMapper.xml @@ -248,7 +248,7 @@ from u left join SYS_ROLE r on u.ROLE_ID = r.ROLE_ID left join SYS_DEPARTMENT d on d.DEPARTMENT_ID=u.DEPARTMENT_ID - left join `qa-gwj-prevention`.sys_dictionaries deptLeven on deptLeven.DICTIONARIES_ID=u.JOB_LEVEL + left join `qa-czks-prevention`.sys_dictionaries deptLeven on deptLeven.DICTIONARIES_ID=u.JOB_LEVEL where u.USERNAME != 'admin' and r.PARENT_ID = '1' diff --git a/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml index 9f679748..95967497 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FirePonitMapper.xml @@ -216,11 +216,11 @@ frp.FIRE_RECORD_ID, frp.CREATTIME FROM - `qa-gwj-prevention`.bus_fire_checklist cl - LEFT JOIN `qa-gwj-prevention`.bus_fire_record_point frp ON frp.fire_check_id = cl.fire_check_id + `qa-czks-prevention`.bus_fire_checklist cl + LEFT JOIN `qa-czks-prevention`.bus_fire_record_point frp ON frp.fire_check_id = cl.fire_check_id AND cl.ISDELETE = 0 - LEFT JOIN `qa-gwj-prevention`.bus_imgfiles img ON frp.EQUIPMENT_POINT_ID = img.FOREIGN_KEY - LEFT JOIN `qa-gwj-prevention`.sys_user u on frp.CREATOR = u.USER_ID + LEFT JOIN `qa-czks-prevention`.bus_imgfiles img ON frp.EQUIPMENT_POINT_ID = img.FOREIGN_KEY + LEFT JOIN `qa-czks-prevention`.sys_user u on frp.CREATOR = u.USER_ID WHERE frp.ISDELETE = 0 AND frp.FIRE_POINT_ID = #{FIRE_POINT_ID} diff --git a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml index 911b6cf5..14247484 100644 --- a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml +++ b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml @@ -52,7 +52,7 @@ - INSERT INTO `qa-gwj-prevention`.`bus_fire_record` + INSERT INTO `qa-czks-prevention`.`bus_fire_record` (`FIRE_RECORD_ID`, `FIRE_CHECK_ID`, `CORPINFO_ID`, `CREATOR`, `CREATTIME`,REPEATCHECK, `OPERATOR`, `OPERATTIME`, `PERIODSTART`, `PERIODEND`) VALUES @@ -344,14 +344,14 @@ - UPDATE `qa-gwj-prevention`.`bus_fire_record_device` + UPDATE `qa-czks-prevention`.`bus_fire_record_device` SET `HIDDEN_ID` = null, `ISCHECKED` = 1, `ISNORMAL` = 2 WHERE FIRE_RECORD_ID = #{FIRE_RECORD_ID} and FIRE_DEVICE_ID = #{FIRE_DEVICE_ID} and FIRE_POINT_ID = #{FIRE_POINT_ID} - UPDATE `qa-gwj-prevention`.`bus_fire_record_point` + UPDATE `qa-czks-prevention`.`bus_fire_record_point` SET `P_ISCHECKED` = 1 WHERE FIRE_RECORD_ID = #{FIRE_RECORD_ID} and FIRE_CHECK_ID = #{FIRE_CHECK_ID} diff --git a/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml index 6af6dad9..bc39013d 100644 --- a/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml @@ -510,10 +510,10 @@ bus_hidden f left join bus_hidden_user bhu on bhu.HIDDEN_ID = f.HIDDEN_ID - left join `qa-gwj-prevention`.vi_user_all zgUser on zgUser.user_id = f.RECTIFICATIONOR - LEFT JOIN `qa-gwj-prevention`.vi_user_all confirmUser on confirmUser.USER_ID = f.CONFIRM_USER - left join `qa-gwj-prevention`.vi_user_all bhuUser on bhuUser.user_id = bhu.user_id - left join `qa-gwj-prevention`.vi_department_all bhuUserDept on bhuUser.DEPARTMENT_ID = bhuUserDept.DEPARTMENT_ID + left join `qa-czks-prevention`.vi_user_all zgUser on zgUser.user_id = f.RECTIFICATIONOR + LEFT JOIN `qa-czks-prevention`.vi_user_all confirmUser on confirmUser.USER_ID = f.CONFIRM_USER + left join `qa-czks-prevention`.vi_user_all bhuUser on bhuUser.user_id = bhu.user_id + left join `qa-czks-prevention`.vi_department_all bhuUserDept on bhuUser.DEPARTMENT_ID = bhuUserDept.DEPARTMENT_ID LEFT JOIN bus_hiddencheck hch on hch.HIDDEN_ID = f.HIDDEN_ID left join sys_dictionaries type1 on type1.bianma = f.HIDDENTYPE diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml index c717f435..630bf63a 100644 --- a/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml +++ b/src/main/resources/mybatis/datasource/highriskwork/HotWorkApplicationUserMapper.xml @@ -147,8 +147,8 @@ left join SYS_USER u on u.USER_ID = f.USER_ID left join bus_specialuser su on su.SPECIALUSER_ID = f.USER_ID left join oa_department dept on dept.DEPARTMENT_ID = u.DEPARTMENT_ID - left join `qa-gwj-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin' - left join `qa-gwj-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID + left join `qa-czks-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin' + left join `qa-czks-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID where f.ISDELETE = '0' and(f.FOREIGN_KEY in @@ -185,8 +185,8 @@ left join SYS_USER u on u.USER_ID = f.USER_ID left join bus_specialuser su on su.SPECIALUSER_ID = f.USER_ID left join oa_department dept on dept.DEPARTMENT_ID = u.DEPARTMENT_ID - left join `qa-gwj-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin' - left join `qa-gwj-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID + left join `qa-czks-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin' + left join `qa-czks-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID where f.ISDELETE = '0' and(f.FOREIGN_KEY in @@ -224,7 +224,7 @@ left join bus_hotworkapplicationstate s on s.STATE = f.STATE left join SYS_USER u on u.USER_ID = f.USER_ID left join bus_specialuser su on su.SPECIALUSER_ID = f.USER_ID - left join `qa-gwj-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin' + left join `qa-czks-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin' WHERE f.FOREIGN_KEY = #{FOREIGN_KEY} AND f.ISDELETE = '0' @@ -336,8 +336,8 @@ left join SYS_USER u on u.DEPARTMENT_ID = f.USER_ID left join bus_specialuser su on su.SPECIALUSER_ID = f.USER_ID left join oa_department dept on dept.DEPARTMENT_ID = u.DEPARTMENT_ID - left join `qa-gwj-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin' - left join `qa-gwj-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID + left join `qa-czks-regulatory`.SYS_USER reuser on reuser.USER_ID = f.USER_ID and reuser.USERNAME != 'admin' + left join `qa-czks-regulatory`.SYS_DEPARTMENT redept on redept.DEPARTMENT_ID = reuser.DEPARTMENT_ID where f.ISDELETE = '0' and(f.FOREIGN_KEY in diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckMapper.xml index 8d22d594..4ca71298 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckMapper.xml @@ -144,9 +144,9 @@ d.NAME as INSPECTION_TYPE_NAME from f - left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = f.OUTSOURCED_ID - left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.UNITS_ID - left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID + left join `qa-czks-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = f.OUTSOURCED_ID + left join `qa-czks-regulatory`.BUS_UNITS u on u.UNITS_ID = f.UNITS_ID + left join `qa-czks-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID LEFT JOIN SYS_DICTIONARIES d on d.BIANMA = f.INSPECTION_TYPE where f.KEYPROJECTCHECK_ID = #{KEYPROJECTCHECK_ID} @@ -163,9 +163,9 @@ (select count(1) from BUS_KEYPROJECT_HIDDEN h where h.FOREIGN_ID = f.KEYPROJECTCHECK_ID) as HIDDEN_COUNT from f - left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = f.OUTSOURCED_ID - left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.UNITS_ID - left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID + left join `qa-czks-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = f.OUTSOURCED_ID + left join `qa-czks-regulatory`.BUS_UNITS u on u.UNITS_ID = f.UNITS_ID + left join `qa-czks-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID left join SYS_DICTIONARIES d on d.BIANMA = f.INSPECTION_TYPE where f.ISDELETE = '0' diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml index 5030e522..be56f0d6 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml @@ -9,7 +9,7 @@ - `qa-gwj-prevention`.sys_dictionaries + `qa-czks-prevention`.sys_dictionaries @@ -295,14 +295,14 @@ p.NAME as RECTIFICATIONOR_NAME from f - left join `qa-gwj-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART + left join `qa-czks-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART left join lv on f.HIDDENLEVEL = lv.BIANMA left join ht on f.HIDDENTYPE = ht.BIANMA left join ht2 on f.HIDDENTYPE2 = ht2.BIANMA and ht2.PARENT_ID = '18c0a9aea6e54feab9f4ab3f46e0bc86' - left join `qa-gwj-prevention`.oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT - left join `qa-gwj-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR - left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT - left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR + left join `qa-czks-prevention`.oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT + left join `qa-czks-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR + left join `qa-czks-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT + left join `qa-czks-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR where f.HIDDEN_ID = #{HIDDEN_ID} @@ -326,28 +326,28 @@ from f LEFT JOIN BUS_KEYPROJECTCHECK ch ON ch.OUTSOURCED_ID = f.FOREIGN_ID or f.FOREIGN_ID = ch.KEYPROJECTCHECK_ID - LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON bo.OUTSOURCED_ID = ch.OUTSOURCED_ID - left join `qa-gwj-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART + LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED bo ON bo.OUTSOURCED_ID = ch.OUTSOURCED_ID + left join `qa-czks-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART left join lv on f.HIDDENLEVEL = lv.BIANMA left join ht on f.HIDDENTYPE = ht.BIANMA left join ht2 on f.HIDDENTYPE2 = ht2.BIANMA and ht2.PARENT_ID = '18c0a9aea6e54feab9f4ab3f46e0bc86' - left join `qa-gwj-prevention`.oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT - left join `qa-gwj-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR - left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT - left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on o.UNITS_ID = u.UNITS_ID - LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bod ON bod.OUTSOURCED_ID = f.FOREIGN_ID - left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR + left join `qa-czks-prevention`.oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT + left join `qa-czks-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR + left join `qa-czks-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT + left join `qa-czks-regulatory`.BUS_OUTSOURCED o on o.UNITS_ID = u.UNITS_ID + LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED bod ON bod.OUTSOURCED_ID = f.FOREIGN_ID + left join `qa-czks-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR left join BUS_KEYPROJECTPUNISH pu on pu.HIDDEN_ID = f.HIDDEN_ID left join ( SELECT f.HIDDEN_ID FROM - `qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f - LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID - LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID - LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID - LEFT JOIN `qa-gwj-prevention`.BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID + `qa-czks-prevention`.BUS_KEYPROJECT_HIDDEN f + LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID + LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID + LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID + LEFT JOIN `qa-czks-prevention`.BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID WHERE f.ISDELETE = '0' AND f.SOURCE IN ( '4', '5', '1' ) @@ -417,10 +417,10 @@ from f left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID - left join `qa-gwj-regulatory`.BUS_CORPTYPE type on type.CORPTYPE_ID = c.CORP_OF_TYPE - left join `qa-gwj-prevention`.sys_dictionaries city on city.BIANMA = c.CITY - left join `qa-gwj-prevention`.sys_dictionaries country on country.BIANMA = c.COUNTRY - left join `qa-gwj-prevention`.sys_dictionaries village on village.BIANMA = c.VILLAGE + left join `qa-czks-regulatory`.BUS_CORPTYPE type on type.CORPTYPE_ID = c.CORP_OF_TYPE + left join `qa-czks-prevention`.sys_dictionaries city on city.BIANMA = c.CITY + left join `qa-czks-prevention`.sys_dictionaries country on country.BIANMA = c.COUNTRY + left join `qa-czks-prevention`.sys_dictionaries village on village.BIANMA = c.VILLAGE left join sys_user cr on cr.USER_ID = f.CREATOR left join sys_user re on re.USER_ID = f.RECTIFICATIONOR @@ -466,10 +466,10 @@ from f left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID - left join `qa-gwj-regulatory`.BUS_CORPTYPE type on type.CORPTYPE_ID = c.CORP_OF_TYPE - left join `qa-gwj-prevention`.sys_dictionaries city on city.BIANMA = c.CITY - left join `qa-gwj-prevention`.sys_dictionaries country on country.BIANMA = c.COUNTRY - left join `qa-gwj-prevention`.sys_dictionaries village on village.BIANMA = c.VILLAGE + left join `qa-czks-regulatory`.BUS_CORPTYPE type on type.CORPTYPE_ID = c.CORP_OF_TYPE + left join `qa-czks-prevention`.sys_dictionaries city on city.BIANMA = c.CITY + left join `qa-czks-prevention`.sys_dictionaries country on country.BIANMA = c.COUNTRY + left join `qa-czks-prevention`.sys_dictionaries village on village.BIANMA = c.VILLAGE left join sys_user cr on cr.USER_ID = f.CREATOR left join sys_user re on re.USER_ID = f.RECTIFICATIONOR @@ -602,7 +602,7 @@ IFNULL( h.NUM1, 0 ) NUM1, IFNULL( h.NUM2, 0 ) NUM2 FROM - `qa-gwj-prevention`.sys_dictionaries d + `qa-czks-prevention`.sys_dictionaries d LEFT JOIN ( SELECT COUNT( f.STATE = 4 OR NULL ) AS NUM1, @@ -646,10 +646,10 @@ from f left join BUS_CORP_INFO c on c.CORPINFO_ID = f.CORPINFO_ID - left join `qa-gwj-regulatory`.BUS_CORPTYPE type on type.CORPTYPE_ID = c.CORP_OF_TYPE - left join `qa-gwj-prevention`.sys_dictionaries city on city.BIANMA = c.CITY - left join `qa-gwj-prevention`.sys_dictionaries country on country.BIANMA = c.COUNTRY - left join `qa-gwj-prevention`.sys_dictionaries village on village.BIANMA = c.VILLAGE + left join `qa-czks-regulatory`.BUS_CORPTYPE type on type.CORPTYPE_ID = c.CORP_OF_TYPE + left join `qa-czks-prevention`.sys_dictionaries city on city.BIANMA = c.CITY + left join `qa-czks-prevention`.sys_dictionaries country on country.BIANMA = c.COUNTRY + left join `qa-czks-prevention`.sys_dictionaries village on village.BIANMA = c.VILLAGE left join sys_user cr on cr.USER_ID = f.CREATOR left join sys_user re on re.USER_ID = f.RECTIFICATIONOR @@ -967,11 +967,11 @@ count(CASE WHEN h.HIDDEN_ID != '' THEN 1 ELSE NULL END) as SBHD_NUM, count(case when h.STATE=4 then 1 else null end) as ZGHD_NUM - from `qa-gwj-prevention`.sys_dictionaries country + from `qa-czks-prevention`.sys_dictionaries country LEFT join bus_corp_info f on country.BIANMA = f.COUNTRY and f.ISDELETE='0' - from `qa-gwj-prevention`.sys_dictionaries village + from `qa-czks-prevention`.sys_dictionaries village LEFT join bus_corp_info f on village.BIANMA = f.VILLAGE and f.ISDELETE='0' @@ -987,7 +987,7 @@ and f.VILLAGE = #{DEPT_VILLAGE} - and f.CORP_OF_TYPE in (select CORPTYPE_ID from `qa-gwj-regulatory`.BUS_CORPTYPETODEPT ctod where ctod.DEPARTMENT_ID=#{DEPARTMENT_ID}) + and f.CORP_OF_TYPE in (select CORPTYPE_ID from `qa-czks-regulatory`.BUS_CORPTYPETODEPT ctod where ctod.DEPARTMENT_ID=#{DEPARTMENT_ID}) left join BUS_HIDDEN h on f.CORPINFO_ID=h.CORPINFO_ID and h.ISDELETE='0' @@ -997,7 +997,7 @@ and country.PARENT_ID = #{CITY_CODE} - and village.PARENT_ID in (select DICTIONARIES_ID from `qa-gwj-prevention`.sys_dictionaries dic where dic.BIANMA=#{DEPT_COUNTRY}) + and village.PARENT_ID in (select DICTIONARIES_ID from `qa-czks-prevention`.sys_dictionaries dic where dic.BIANMA=#{DEPT_COUNTRY}) @@ -1132,15 +1132,15 @@ p.NAME as RECTIFICATIONOR_NAME from f - left join `qa-gwj-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART + left join `qa-czks-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART left join lv on f.HIDDENLEVEL = lv.BIANMA left join ht on f.HIDDENTYPE = ht.BIANMA left join ht2 on f.HIDDENTYPE2 = ht2.BIANMA and ht2.PARENT_ID = '18c0a9aea6e54feab9f4ab3f46e0bc86' - left join `qa-gwj-prevention`.oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT - left join `qa-gwj-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR - left join `qa-gwj-regulatory`.sys_user cre on cre.USER_ID = f.CREATOR - left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT - left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR + left join `qa-czks-prevention`.oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT + left join `qa-czks-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR + left join `qa-czks-regulatory`.sys_user cre on cre.USER_ID = f.CREATOR + left join `qa-czks-regulatory`.BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT + left join `qa-czks-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR where f.ISDELETE = '0' and f.FOREIGN_ID = #{FOREIGN_ID} @@ -1525,10 +1525,10 @@ SELECT f.HIDDEN_ID,ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) OUTSOURCED_ID FROM - `qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f - LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID - LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID - LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID + `qa-czks-prevention`.BUS_KEYPROJECT_HIDDEN f + LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID + LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID + LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID WHERE f.ISDELETE = '0' AND f.SOURCE IN ( '4', '5', '1' ) @@ -1544,9 +1544,9 @@ f.HIDDEN_ID FROM BUS_KEYPROJECT_HIDDEN f - LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID - LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID - LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID + LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID + LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID + LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID LEFT JOIN BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID WHERE f.ISDELETE = '0' @@ -1555,13 +1555,13 @@ AND f.CREATOR = #{loginUserId} AND ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) IS NOT NULL ) t)CF_COUNT - from `qa-gwj-regulatory`.bus_aiwarning f + from `qa-czks-regulatory`.bus_aiwarning f where f.ISDELETE = '0' and f.STATUS = 0 and VIDEOMANAGER_ID in ( select vi.VIDEOMANAGER_ID - from `qa-gwj-regulatory`.bus_aiwarning_people aip - left join `qa-gwj-regulatory`. bus_videomanager vi on vi.OUTSOURCED_ID = aip.OUTSOURCED_ID + from `qa-czks-regulatory`.bus_aiwarning_people aip + left join `qa-czks-regulatory`. bus_videomanager vi on vi.OUTSOURCED_ID = aip.OUTSOURCED_ID where aip.AIWARNING_PEOPLE = #{loginUserId} and aip.ISDELETE = 0 ) @@ -1579,14 +1579,14 @@ vi.`NAME` as RECTIFICATIONOR_NAME, h.* FROM - `qa-gwj-prevention`.bus_keyproject_hidden h - LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck c ON h.FOREIGN_ID = c.KEYPROJECTCHECK_ID - LEFT JOIN `qa-gwj-prevention`.bus_keyprojectpunish p ON p.HIDDEN_ID = h.HIDDEN_ID - LEFT JOIN `qa-gwj-regulatory`.bus_units u ON h.RECTIFICATIONDEPT = u.UNITS_ID - LEFT JOIN `qa-gwj-regulatory`.bus_personnelmanagement per on per.PERSONNELMANAGEMENT_ID = p.PERSONNELMANAGEMENT_ID - LEFT JOIN `qa-gwj-prevention`.vi_user_all v ON v.USER_ID = p.CREATOR - LEFT JOIN `qa-gwj-prevention`.vi_user_all vv ON vv.USER_ID = h.PUNISH_PERSON - LEFT JOIN `qa-gwj-regulatory`.bus_personnelmanagement vi ON vi.PERSONNELMANAGEMENT_ID = h.RECTIFICATIONOR + `qa-czks-prevention`.bus_keyproject_hidden h + LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck c ON h.FOREIGN_ID = c.KEYPROJECTCHECK_ID + LEFT JOIN `qa-czks-prevention`.bus_keyprojectpunish p ON p.HIDDEN_ID = h.HIDDEN_ID + LEFT JOIN `qa-czks-regulatory`.bus_units u ON h.RECTIFICATIONDEPT = u.UNITS_ID + LEFT JOIN `qa-czks-regulatory`.bus_personnelmanagement per on per.PERSONNELMANAGEMENT_ID = p.PERSONNELMANAGEMENT_ID + LEFT JOIN `qa-czks-prevention`.vi_user_all v ON v.USER_ID = p.CREATOR + LEFT JOIN `qa-czks-prevention`.vi_user_all vv ON vv.USER_ID = h.PUNISH_PERSON + LEFT JOIN `qa-czks-regulatory`.bus_personnelmanagement vi ON vi.PERSONNELMANAGEMENT_ID = h.RECTIFICATIONOR WHERE h.ISDELETE = '0' @@ -1608,7 +1608,7 @@ diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml index 86f09deb..1dc303c2 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml @@ -142,11 +142,11 @@ p.NAME AS PERSON_NAME from f - left join `qa-gwj-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR - left join `qa-gwj-regulatory`.sys_user cre on cre.USER_ID = f.CREATOR - left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.UNITS_ID - left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on o.UNITS_ID = u.UNITS_ID - left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID + left join `qa-czks-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR + left join `qa-czks-regulatory`.sys_user cre on cre.USER_ID = f.CREATOR + left join `qa-czks-regulatory`.BUS_UNITS u on u.UNITS_ID = f.UNITS_ID + left join `qa-czks-regulatory`.BUS_OUTSOURCED o on o.UNITS_ID = u.UNITS_ID + left join `qa-czks-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID where f.KEYPROJECTPUNISH_ID = #{KEYPROJECTPUNISH_ID} @@ -169,12 +169,12 @@ p.NAME AS PERSON_NAME from BUS_KEYPROJECTPUNISH f - LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck k ON f.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID - left join `qa-gwj-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR - left join `qa-gwj-regulatory`.sys_user cre on cre.USER_ID = f.CREATOR - left join `qa-gwj-regulatory`.BUS_UNITS u on u.UNITS_ID = f.UNITS_ID - left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = k.OUTSOURCED_ID - left join `qa-gwj-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID + LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck k ON f.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID + left join `qa-czks-prevention`.vi_user_all cr on cr.USER_ID = f.CREATOR + left join `qa-czks-regulatory`.sys_user cre on cre.USER_ID = f.CREATOR + left join `qa-czks-regulatory`.BUS_UNITS u on u.UNITS_ID = f.UNITS_ID + left join `qa-czks-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = k.OUTSOURCED_ID + left join `qa-czks-regulatory`.BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID where f.ISDELETE = '0' and diff --git a/src/main/resources/mybatis/datasource/keyProjects/PlatformvideomanagementMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/PlatformvideomanagementMapper.xml index 983d13db..f6accf8c 100644 --- a/src/main/resources/mybatis/datasource/keyProjects/PlatformvideomanagementMapper.xml +++ b/src/main/resources/mybatis/datasource/keyProjects/PlatformvideomanagementMapper.xml @@ -4,7 +4,7 @@ - `qa-gwj-regulatory`.BUS_PLATFORMVIDEOMANAGEMENT + `qa-czks-regulatory`.BUS_PLATFORMVIDEOMANAGEMENT diff --git a/src/main/resources/mybatis/datasource/mysql1.sql b/src/main/resources/mybatis/datasource/mysql1.sql index eb73ca38..34907f11 100644 --- a/src/main/resources/mybatis/datasource/mysql1.sql +++ b/src/main/resources/mybatis/datasource/mysql1.sql @@ -59,17 +59,17 @@ CREATE TABLE `BUS_MAJORDANGERSOURCELOG` ( # wangpeng 2022-04-01 ## 重大危险源增加重大危险源状态 -ALTER TABLE `qa-gwj-prevention`.`bus_majordangersource` +ALTER TABLE `qa-czks-prevention`.`bus_majordangersource` ADD COLUMN `MAJORDANGERSOURCE_STATUS` varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '重大危险源状态（1.正常、2.停用、3.检修）' AFTER `MAJORDANGERSOURCE_NUMBER`; ## 重大危险源变更记录增加重大危险源状态 -ALTER TABLE `qa-gwj-prevention`.`bus_majordangersourcelog` +ALTER TABLE `qa-czks-prevention`.`bus_majordangersourcelog` ADD COLUMN `MAJORDANGERSOURCE_STATUS` varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '重大危险源状态（1.正常、2.停用、3.检修）' AFTER `MAJORDANGERSOURCE_NUMBER`; ## 阈值设定增加重大危险源ID -ALTER TABLE `qa-gwj-prevention`.`bus_monitoringdevicesensor` +ALTER TABLE `qa-czks-prevention`.`bus_monitoringdevicesensor` ADD COLUMN `MAJORDANGERSOURCE_ID` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '重大危险源ID' AFTER `MONITORINGDEVICESENSOR_ID`; ## 重大危险源停用记录增加重大危险源ID -ALTER TABLE `qa-gwj-prevention`.`bus_monitoringdevicedisable` -ADD COLUMN `MAJORDANGERSOURCE_ID` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '重大危险源ID' AFTER `MONITORINGDEVICEDISABLE_ID`; \ No newline at end of file +ALTER TABLE `qa-czks-prevention`.`bus_monitoringdevicedisable` +ADD COLUMN `MAJORDANGERSOURCE_ID` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '重大危险源ID' AFTER `MONITORINGDEVICEDISABLE_ID`; diff --git a/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml b/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml index 23c4ba79..bb49a683 100644 --- a/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml +++ b/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml @@ -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-gwj-regulatory`.bus_units r on r.UNITS_ID = f.UNITS_ID + left join `qa-czks-regulatory`.bus_units r on r.UNITS_ID = f.UNITS_ID where f.ISDELETE = '0' and diff --git a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml index 2215e418..6823bd7e 100644 --- a/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml +++ b/src/main/resources/mybatis/datasource/system/DepartmentMapper.xml @@ -420,7 +420,7 @@ select * from - `qa-gwj-regulatory`.SYS_DEPARTMENT + `qa-czks-regulatory`.SYS_DEPARTMENT where 1=1 and STATE = '0' @@ -523,8 +523,8 @@ DEPARTMENT_ID id, NAME name, PARENT_ID pId - FROM `qa-gwj-regulatory`.sys_department f - WHERE FIND_IN_SET(DEPARTMENT_ID,`qa-gwj-regulatory`.queryRecursiveDeptDown(#{DEPARTMENT_ID})) + FROM `qa-czks-regulatory`.sys_department f + WHERE FIND_IN_SET(DEPARTMENT_ID,`qa-czks-regulatory`.queryRecursiveDeptDown(#{DEPARTMENT_ID})) @@ -534,8 +534,8 @@ DEPARTMENT_ID id, NAME name, PARENT_ID pId - FROM `qa-gwj-regulatory`.sys_department f - WHERE FIND_IN_SET(DEPARTMENT_ID,`qa-gwj-regulatory`.queryRecursiveDeptDown(#{DEPARTMENT_ID})) + FROM `qa-czks-regulatory`.sys_department f + WHERE FIND_IN_SET(DEPARTMENT_ID,`qa-czks-regulatory`.queryRecursiveDeptDown(#{DEPARTMENT_ID})) UNION ALL SELECT DEPARTMENT_ID id, diff --git a/src/main/resources/mybatis/datasource/system/PoliceMapper.xml b/src/main/resources/mybatis/datasource/system/PoliceMapper.xml index dda28f53..5a1bf0bf 100644 --- a/src/main/resources/mybatis/datasource/system/PoliceMapper.xml +++ b/src/main/resources/mybatis/datasource/system/PoliceMapper.xml @@ -4,12 +4,12 @@ - `qa-gwj-regulatory`.BUS_POLICE + `qa-czks-regulatory`.BUS_POLICE - `qa-gwj-prevention`.sys_dictionaries + `qa-czks-prevention`.sys_dictionaries @@ -120,9 +120,9 @@ select f.*,a.name as names from - `qa-gwj-regulatory`.bus_reporting f - left join`qa-gwj-regulatory`.bus_police p on p.police_id = f.police_id - LEFT JOIN `qa-gwj-regulatory`.sys_user a ON a.user_id = f.REPORTING_NAME + `qa-czks-regulatory`.bus_reporting f + left join`qa-czks-regulatory`.bus_police p on p.police_id = f.police_id + LEFT JOIN `qa-czks-regulatory`.sys_user a ON a.user_id = f.REPORTING_NAME where f.POLICE_ID = #{pd.POLICE_ID} @@ -152,8 +152,8 @@ f.*, dept.NAME AS deptName FROM - `qa-gwj-regulatory`.sys_user f - LEFT JOIN `qa-gwj-regulatory`.sys_department dept ON dept.DEPARTMENT_ID = f.DEPARTMENT_ID + `qa-czks-regulatory`.sys_user f + LEFT JOIN `qa-czks-regulatory`.sys_department dept ON dept.DEPARTMENT_ID = f.DEPARTMENT_ID WHERE f.USER_ID = '1' @@ -188,7 +188,7 @@ insert into - `qa-gwj-regulatory`.bus_reporting + `qa-czks-regulatory`.bus_reporting ( REPORTING_NAME,ISDELETE,REPORTING_ID,POLICE_ID,CREATTIME,CREATOR,OPERATOR,OPERATTIME ) values ( diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 8c829612..d7dd2502 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -346,8 +346,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select oa.NAME as DEPTNAME,f.NAME,f.CORPINFO_ID from - `qa-gwj-prevention`.sys_user f - left join `qa-gwj-prevention`.oa_department oa on oa.DEPARTMENT_ID = f.DEPARTMENT_ID + `qa-czks-prevention`.sys_user f + left join `qa-czks-prevention`.oa_department oa on oa.DEPARTMENT_ID = f.DEPARTMENT_ID where USER_ID = #{USER_ID} @@ -1127,7 +1127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select * from - `qa-gwj-regulatory`.SYS_USER + `qa-czks-regulatory`.SYS_USER where USER_ID = #{USER_ID} - select f.*,cr.NAME from `qa-gwj-regulatory`.bus_aiwarning_people f - left join `qa-gwj-prevention`.vi_user_all cr on cr.USER_ID = f.AIWARNING_PEOPLE + select f.*,cr.NAME from `qa-czks-regulatory`.bus_aiwarning_people f + left join `qa-czks-prevention`.vi_user_all cr on cr.USER_ID = f.AIWARNING_PEOPLE where 1=1 and ISDELETE = 0 and f.OUTSOURCED_ID in @@ -161,10 +161,10 @@ vid.VIDEONAME, o.OUTSOURCED_NAME from - `qa-gwj-regulatory`.BUS_AIWARNING f - left join `qa-gwj-regulatory`.bus_device v on v.VIDEOMANAGER_ID = f.VIDEOMANAGER_ID - left join `qa-gwj-regulatory`.bus_videomanager vid on vid.VIDEOMANAGER_ID = f.VIDEOMANAGER_ID - left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = vid.OUTSOURCED_ID + `qa-czks-regulatory`.BUS_AIWARNING f + left join `qa-czks-regulatory`.bus_device v on v.VIDEOMANAGER_ID = f.VIDEOMANAGER_ID + left join `qa-czks-regulatory`.bus_videomanager vid on vid.VIDEOMANAGER_ID = f.VIDEOMANAGER_ID + left join `qa-czks-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = vid.OUTSOURCED_ID where f.ISDELETE = '0' and vid.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} @@ -175,7 +175,7 @@ and f.STATUS = 1 - and vid.OUTSOURCED_ID in (select aip.OUTSOURCED_ID from `qa-gwj-regulatory`.bus_aiwarning_people aip where aip.AIWARNING_PEOPLE = #{pd.loginUserId} and aip.ISDELETE = 0) + and vid.OUTSOURCED_ID in (select aip.OUTSOURCED_ID from `qa-czks-regulatory`.bus_aiwarning_people aip where aip.AIWARNING_PEOPLE = #{pd.loginUserId} and aip.ISDELETE = 0) order by f.CREATTIME desc @@ -186,10 +186,10 @@ vid.VIDEONAME, o.OUTSOURCED_NAME from - `qa-gwj-regulatory`.BUS_AIWARNING f - left join `qa-gwj-regulatory`.bus_device v on v.VIDEOMANAGER_ID = f.VIDEOMANAGER_ID - left join `qa-gwj-regulatory`.bus_videomanager vid on vid.VIDEOMANAGER_ID = f.VIDEOMANAGER_ID - left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = vid.OUTSOURCED_ID + `qa-czks-regulatory`.BUS_AIWARNING f + left join `qa-czks-regulatory`.bus_device v on v.VIDEOMANAGER_ID = f.VIDEOMANAGER_ID + left join `qa-czks-regulatory`.bus_videomanager vid on vid.VIDEOMANAGER_ID = f.VIDEOMANAGER_ID + left join `qa-czks-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = vid.OUTSOURCED_ID where f.ISDELETE = '0' @@ -203,7 +203,7 @@ and f.STATUS = 1 - and vid.OUTSOURCED_ID in (select aip.OUTSOURCED_ID from `qa-gwj-regulatory`.bus_aiwarning_people aip where aip.AIWARNING_PEOPLE = #{pd.loginUserId} and aip.ISDELETE = 0) + and vid.OUTSOURCED_ID in (select aip.OUTSOURCED_ID from `qa-czks-regulatory`.bus_aiwarning_people aip where aip.AIWARNING_PEOPLE = #{pd.loginUserId} and aip.ISDELETE = 0) order by f.CREATTIME desc @@ -216,12 +216,12 @@ diff --git a/src/main/resources/mybatis/dsno2/keyProjects/DeviceMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/DeviceMapper.xml index 72fbad1e..9a65e984 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/DeviceMapper.xml +++ b/src/main/resources/mybatis/dsno2/keyProjects/DeviceMapper.xml @@ -126,7 +126,7 @@ , ot.OUTSOURCED_NAME from f - LEFT JOIN `qa-gwj-regulatory`.bus_outsourced ot on ot.OUTSOURCED_ID = f.OUTSOURCED_ID + LEFT JOIN `qa-czks-regulatory`.bus_outsourced ot on ot.OUTSOURCED_ID = f.OUTSOURCED_ID where f.ISDELETE = '0' and f.DEVICE LIKE CONCAT(CONCAT('%', #{pd.DEVICE}),'%') @@ -141,7 +141,7 @@ , o.OUTSOURCED_NAME from f - left join `qa-gwj-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = f.OUTSOURCED_ID + left join `qa-czks-regulatory`.BUS_OUTSOURCED o on o.OUTSOURCED_ID = f.OUTSOURCED_ID where f.ISDELETE = '0' diff --git a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml index 7f2e8852..c374de2f 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml +++ b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml @@ -4,7 +4,7 @@ - `qa-gwj-regulatory`.BUS_OUTSOURCED + `qa-czks-regulatory`.BUS_OUTSOURCED @@ -237,17 +237,17 @@ select f.*, - (select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.INVOLVING_CORPS)) as INVOLVING_CORPS_NAME, - (select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME, - ( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME, - (select GROUP_CONCAT(t.CORP_NAME) from `qa-gwj-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.GROUP_UNIT)) as GROUP_UNIT_NAME, - ( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-gwj-prevention`.vi_department_all t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME, + (select GROUP_CONCAT(t.CORP_NAME) from `qa-czks-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.INVOLVING_CORPS)) as INVOLVING_CORPS_NAME, + (select GROUP_CONCAT(t.CORP_NAME) from `qa-czks-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME, + ( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-czks-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME, + (select GROUP_CONCAT(t.CORP_NAME) from `qa-czks-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.GROUP_UNIT)) as GROUP_UNIT_NAME, + ( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-czks-prevention`.vi_department_all t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME, (select GROUP_CONCAT(t.NAME) from ( SELECT CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME ,t.DEPARTMENT_ID FROM - `qa-gwj-prevention`.OA_DEPARTMENT t - LEFT JOIN `qa-gwj-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID + `qa-czks-prevention`.OA_DEPARTMENT t + LEFT JOIN `qa-czks-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID ) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME, isdd.NAME MANAGER_DEPARTMENT_NAME, isu.NAME USER_NAME, b.UNITS_NAME as UNITS_NAME, isu.NAME as AIWARNING_PEOPLE, pci.NAME Q_COMPETENT_DEPT_NAME, - (select count(1) from `qa-gwj-prevention`.BUS_KEYPROJECTCHECK c where c.OUTSOURCED_ID = f.OUTSOURCED_ID) as CHECK_COUNT, - (select count(1) from `qa-gwj-regulatory`.BUS_AIWARNING a left join bus_videomanager avid on avid.VIDEOMANAGER_ID = a.VIDEOMANAGER_ID where avid.OUTSOURCED_ID= f.OUTSOURCED_ID and a.ISDELETE = '0') as AI_COUNT, - (select count(1) from `qa-gwj-regulatory`.BUS_VIDEOMANAGER v where v.OUTSOURCED_ID = f.OUTSOURCED_ID and v.ISDELETE = '0') as VIDEO_COUNT, - (SELECT count( 1 ) FROM `qa-gwj-prevention`.BUS_KEYPROJECTPUNISH k left join `qa-gwj-prevention`.bus_keyprojectcheck kjc on kjc.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID WHERE kjc.OUTSOURCED_ID =f.OUTSOURCED_ID AND k.ISDELETE = '0' ) as KEY_COUNT, + (select count(1) from `qa-czks-prevention`.BUS_KEYPROJECTCHECK c where c.OUTSOURCED_ID = f.OUTSOURCED_ID) as CHECK_COUNT, + (select count(1) from `qa-czks-regulatory`.BUS_AIWARNING a left join bus_videomanager avid on avid.VIDEOMANAGER_ID = a.VIDEOMANAGER_ID where avid.OUTSOURCED_ID= f.OUTSOURCED_ID and a.ISDELETE = '0') as AI_COUNT, + (select count(1) from `qa-czks-regulatory`.BUS_VIDEOMANAGER v where v.OUTSOURCED_ID = f.OUTSOURCED_ID and v.ISDELETE = '0') as VIDEO_COUNT, + (SELECT count( 1 ) FROM `qa-czks-prevention`.BUS_KEYPROJECTPUNISH k left join `qa-czks-prevention`.bus_keyprojectcheck kjc on kjc.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID WHERE kjc.OUTSOURCED_ID =f.OUTSOURCED_ID AND k.ISDELETE = '0' ) as KEY_COUNT, vua.NAME OUTSOURCED_CREATOR_NAME, ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME, p.`NAME` as UNITS_PIC_NAME @@ -308,24 +308,24 @@ from f left join bus_units b using (UNITS_ID) - LEFT JOIN `qa-gwj-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID - LEFT JOIN `qa-gwj-regulatory`.SYS_USER isu ON isu.USER_ID = f.CONTRACT_PIC - LEFT JOIN `qa-gwj-prevention`.oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID - LEFT JOIN `qa-gwj-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID - LEFT JOIN `qa-gwj-prevention`.vi_user_all vua on f.CREATOR = vua.USER_ID - LEFT JOIN `qa-gwj-regulatory`.vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID - left join `qa-gwj-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC + LEFT JOIN `qa-czks-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID + LEFT JOIN `qa-czks-regulatory`.SYS_USER isu ON isu.USER_ID = f.CONTRACT_PIC + LEFT JOIN `qa-czks-prevention`.oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID + LEFT JOIN `qa-czks-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID + LEFT JOIN `qa-czks-prevention`.vi_user_all vua on f.CREATOR = vua.USER_ID + LEFT JOIN `qa-czks-regulatory`.vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID + left join `qa-czks-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC -- 这个判断是隐患管理排序以及隐患管理的角标 left join (SELECT t.OUTSOURCED_ID,COUNT( distinct t.HIDDEN_ID) co FROM ( SELECT f.HIDDEN_ID,ifnull(bo.OUTSOURCED_ID,boai.OUTSOURCED_ID) OUTSOURCED_ID FROM - `qa-gwj-prevention`.BUS_KEYPROJECT_HIDDEN f - LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID - LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID - LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID - LEFT JOIN `qa-gwj-prevention`.BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID + `qa-czks-prevention`.BUS_KEYPROJECT_HIDDEN f + LEFT JOIN `qa-czks-prevention`.bus_keyprojectcheck keycheck ON keycheck.KEYPROJECTCHECK_ID = f.FOREIGN_ID + LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED bo ON keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID + LEFT JOIN `qa-czks-regulatory`.BUS_OUTSOURCED boai ON f.FOREIGN_ID = boai.OUTSOURCED_ID + LEFT JOIN `qa-czks-prevention`.BUS_KEYPROJECTPUNISH pu ON pu.HIDDEN_ID = f.HIDDEN_ID WHERE f.ISDELETE = '0' AND f.SOURCE IN ( '4', '5', '1' ) @@ -406,7 +406,7 @@ SELECT DEPARTMENT_ID FROM - `qa-gwj-prevention`.`sys_user` + `qa-czks-prevention`.`sys_user` WHERE ISMAIN = '0' and `USER_ID` =#{userId} @@ -487,24 +487,24 @@