Skip to content

A
amos-boot-biz
Commit c7e9b6c0 authored by 韩桐桐's avatar 韩桐桐
Browse files
Options

fix(jg):sql优化，部分LEFT JOIN语句改成子查询

parent 0791b767
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 205 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationReformMapper.xml
View file @ c7e9b6c0
......@@ -22,7 +22,7 @@
use.USE_INNER_CODE as innerCode,
concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME,use.STREET_NAME,use.ADDRESS) as place,
ifnull(ur.instance_id, '') as instanceId,
re.equ_id as equipId,
(select equ_id from tzs_jg_change_registration_reform_eq re where ur.sequence_nbr = re.equip_transfer_id) as equipId,
ur.apply_no as applyNo,
ifnull(ur.next_executor_ids,'') as nextExecutorIds,
ur.promoter,
......@@ -31,21 +31,14 @@
ur.next_task_id as nextTaskId,
ur.create_user_id as createUserId
from tzs_jg_change_registration_reform ur
LEFT JOIN tzs_jg_change_registration_reform_eq re on ur.sequence_nbr = re.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
LEFT JOIN idx_biz_jg_use_info use on re.equ_id = use.RECORD
<where>
and ur.is_delete = 0
<!-- <if test="dto.equCategory != null and dto.equCategory != ''">-->
<!-- and jri.EQU_CATEGORY = #{dto.equCategory}-->
<!-- </if>-->
<if test="dto.auditStatus != null and dto.auditStatus != ''">
and ur.audit_status = #{dto.auditStatus}
</if>
<!-- <if test="dto.equCode != null and dto.equCode != ''">-->
<!-- and jri.EQU_CODE like concat('%',#{dto.equCode},'%')-->
<!-- </if>-->
<if test="dto.useUnitName != null and dto.useUnitName != ''">
and ur.use_unit_name like concat('%',#{dto.useUnitName},'%')
</if>
......@@ -66,9 +59,6 @@
</select>
<select id="getDetail" resultType="java.util.Map">
SELECT jri.EQU_CODE as equCode,
-- (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
-- (SELECT name from tz_equipment_category where code = jri.EQU_LIST) as equList,
-- (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE) as equDefine,
jri.EQU_CATEGORY as equCategory,
jri.EQU_LIST as equList,
jri.EQU_DEFINE as equDefine,
......@@ -88,8 +78,6 @@
LEFT JOIN idx_biz_jg_factory_info jfi on jri.RECORD = jfi.RECORD
LEFT JOIN idx_biz_jg_construction_info jci on jri.RECORD = jci.RECORD
where jri.RECORD = #{id}
</select>
<select id="getInspectDetail" resultType="java.util.Map">
SELECT INSPECT_TYPE as inspectType,
......@@ -169,7 +157,6 @@
LEFT JOIN tzs_jg_change_registration_reform_eq re on ur.sequence_nbr = re.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
LEFT JOIN idx_biz_jg_use_info use on re.equ_id = use.RECORD
LEFT JOIN idx_biz_jg_other_info other on re.equ_id = other.RECORD
where ur.sequence_nbr = #{id}
</select>
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationUnitMapper.xml
View file @ c7e9b6c0
......@@ -100,20 +100,16 @@
fi.factory_standard AS factoryStandard,
fi.product_quality_yield_prove AS productQualityYieldProve,
fi.ins_use_maintain_explain AS insUseMaintainExplain,
ei.legal_person AS safetyManager,
ei.legal_phone AS safetyManagerPhone,
ei.address AS address,
oi.SUPERVISORY_CODE AS supervisoryCode
(select legal_person from tz_base_enterprise_info ei Where ei.use_code = isn.use_unit_credit_code) AS safetyManager,
(select legal_phone from tz_base_enterprise_info ei Where ei.use_code = isn.use_unit_credit_code) AS safetyManagerPhone,
(select address from tz_base_enterprise_info ei Where ei.use_code = isn.use_unit_credit_code) AS address,
(select SUPERVISORY_CODE from idx_biz_jg_other_info oi WHERE oi.record = re.equ_id) AS supervisoryCode
FROM
tzs_jg_change_registration_unit isn
LEFT JOIN tzs_jg_change_registration_unit_eq re ON re.unit_change_registration_id = isn.sequence_nbr
LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
LEFT JOIN idx_biz_jg_other_info oi ON oi.record = re.equ_id
LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = isn.use_unit_credit_code
WHERE
isn.sequence_nbr = #{sequenceNbr}
LIMIT 1
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEnableDisableMapper.xml
View file @ c7e9b6c0
......@@ -3,37 +3,38 @@
<mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgEnableDisableMapper">
<select id="pageList" resultType="java.util.Map">
SELECT jed.sequence_nbr as sequenceNbr,
jed.apply_no as applyNo,
date_format(jed.apply_date, '%Y-%m-%d') as applyDate,
CASE
when
jed.apply_type = 'SB_TY' then '停用'
else '启用' end as applyType,
jri.USE_ORG_CODE as useOrgCode,
(SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
(SELECT name from tz_equipment_category where code = jri.EQU_DEFINE) as equDefine,
jri.PRODUCT_NAME as productName,
use.USE_UNIT_NAME as useUnitName,
jed.receive_org_name as receiveOrgName,
concat(use."PROVINCE_NAME", '', use."CITY_NAME", '', use."COUNTY_NAME", '', use."STREET_NAME", '', use."ADDRESS") as address,
use."USE_INNER_CODE" as useInnerCode,
jed.audit_status as auditStatus,
date_format(jed.audit_pass_date, '%Y-%m-%d') as auditPassDate,
jed.instance_id as instanceId,
jed.execute_sequence as executeSequence,
jed.next_executor_ids as nextExecutorIds,
jed.promoter,
jed.next_execute_user_ids as nextExecuteUserIds,
jed.create_user_id as createUserId,
jed.next_task_id as nextTaskId,
oi.SUPERVISORY_CODE as supervisoryCode
SELECT
jed.sequence_nbr as sequenceNbr,
jed.apply_no as applyNo,
date_format(jed.apply_date, '%Y-%m-%d') as applyDate,
CASE
when
jed.apply_type = 'SB_TY' then '停用'
else '启用' end as applyType,
jri.USE_ORG_CODE as useOrgCode,
(SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
(SELECT name from tz_equipment_category where code = jri.EQU_DEFINE) as equDefine,
jri.PRODUCT_NAME as productName,
use.USE_UNIT_NAME as useUnitName,
jed.receive_org_name as receiveOrgName,
concat(use."PROVINCE_NAME", '', use."CITY_NAME", '', use."COUNTY_NAME", '', use."STREET_NAME", '',
use."ADDRESS") as address,
use."USE_INNER_CODE" as useInnerCode,
jed.audit_status as auditStatus,
date_format(jed.audit_pass_date, '%Y-%m-%d') as auditPassDate,
jed.instance_id as instanceId,
jed.execute_sequence as executeSequence,
jed.next_executor_ids as nextExecutorIds,
jed.promoter,
jed.next_execute_user_ids as nextExecuteUserIds,
jed.create_user_id as createUserId,
jed.next_task_id as nextTaskId,
(select SUPERVISORY_CODE from idx_biz_jg_other_info oi where jri.RECORD = oi.RECORD) as supervisoryCode
FROM tzs_jg_enable_disable jed
LEFT JOIN tzs_jg_enable_disable_eq jede on jed.sequence_nbr = jede.enable_disable_apply_id
LEFT JOIN idx_biz_jg_register_info jri on jede.equ_id = jri.RECORD
LEFT JOIN idx_biz_jg_use_info use on jri.RECORD = use.RECORD
LEFT JOIN idx_biz_jg_other_info oi on jri.RECORD = oi.RECORD
LEFT JOIN tzs_jg_enable_disable_eq jede on jed.sequence_nbr = jede.enable_disable_apply_id
LEFT JOIN idx_biz_jg_register_info jri on jede.equ_id = jri.RECORD
LEFT JOIN idx_biz_jg_use_info use on jri.RECORD = use.RECORD
<where>
jed.is_delete = 0
<if test="dto.applyNo != null and dto.applyNo != '' ">
......@@ -59,22 +60,20 @@
order by jed.rec_date desc
</select>
<select id="getDetail" resultType="java.util.Map">
SELECT jed.sequence_nbr as sequenceNbr,
concat(jed.receive_company_code,'_',jed.receive_org_name) as receiveOrgCode,
SELECT jed.sequence_nbr as sequenceNbr,
concat(jed.receive_company_code, '_', jed.receive_org_name) as receiveOrgCode,
concat(use."PROVINCE_NAME", use."CITY_NAME", use."COUNTY_NAME", use."ADDRESS",
use.STREET_NAME) as fullAddress,
jri.EQU_CODE as equCode,
jed.audit_status as auditStatus,
jed.apply_no as applyNo,
jed.apply_type as applyType,
use.STREET_NAME) as fullAddress,
jed.audit_status as auditStatus,
jed.apply_no as applyNo,
jed.apply_type as applyType,
jed.remark,
use.RECORD as record,
jfi.FACTORY_NUM as factoryNum
use.RECORD as record,
(select FACTORY_NUM from idx_biz_jg_factory_info jfi where jede.equ_id = jfi.RECORD) as factoryNum,
(select EQU_CODE from idx_biz_jg_register_info jri where jede.equ_id = jri.RECORD) as equCode
FROM tzs_jg_enable_disable jed
LEFT JOIN tzs_jg_enable_disable_eq jede on jed.sequence_nbr = jede.enable_disable_apply_id
LEFT JOIN idx_biz_jg_register_info jri on jede.equ_id = jri.RECORD
LEFT JOIN idx_biz_jg_use_info use on jri.RECORD = use.RECORD
LEFT JOIN idx_biz_jg_factory_info jfi on jri.RECORD = jfi.RECORD
LEFT JOIN idx_biz_jg_use_info use on jede.equ_id = use.RECORD
where jed.sequence_nbr = #{sequenceNbr}
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEquipTransferMapper.xml
View file @ c7e9b6c0
......@@ -50,11 +50,11 @@
ui.phone AS safetyManagerPhone,
CONCAT_WS('',ui.PROVINCE_NAME, ui.CITY_NAME, ui.COUNTY_NAME, ui.STREET_NAME, ui.ADDRESS) AS equAddress,
ui.USE_INNER_CODE AS useInnerCode,
oi.SUPERVISORY_CODE AS supervisoryCode,
jet.create_date AS createDate,
jet.next_execute_user_ids as nextExecuteUserIds,
jet.create_user_id as createUserId,
jet.next_task_id as nextTaskId,
(select SUPERVISORY_CODE from idx_biz_jg_other_info oi WHERE oi.record = ete.equ_id) AS supervisoryCode,
(select name from tz_equipment_category tec1 where tec1.code = ri."EQU_LIST") AS equList,
(select name from tz_equipment_category tec2 where tec2.code = ri."EQU_CATEGORY") AS equCategory,
(select name from tz_equipment_category tec3 where tec3.code = ri."EQU_DEFINE") AS equDefine
......@@ -65,7 +65,6 @@
LEFT JOIN idx_biz_jg_design_info di ON di.record = ete.equ_id
LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = ete.equ_id
LEFT JOIN idx_biz_jg_use_info ui ON ui.record = ete.equ_id
LEFT JOIN idx_biz_jg_other_info oi ON oi.record = ete.equ_id
<where>
jet.is_delete = false
<if test="param != null ">
......@@ -159,10 +158,10 @@
ui.CITY_NAME AS useUnitCityName,
ui.COUNTY_NAME AS useUnitCountyName,
ui.ADDRESS AS useUnitAddress,
tec2.name AS equCategory,
tec1.name AS equList,
tec.name AS equDefine,
oi.SUPERVISORY_CODE AS supervisoryCode,
(select name from tz_equipment_category tec2 WHERE ri."EQU_DEFINE"::text = tec2.code::text) AS equCategory,
(select name from tz_equipment_category tec1 WHERE ri."EQU_LIST"::text = tec1.code::text) AS equList,
(select name from tz_equipment_category tec WHERE ri."EQU_CATEGORY"::text = tec.code::text) AS equDefine,
(select SUPERVISORY_CODE from idx_biz_jg_other_info oi WHERE ri.RECORD = oi.RECORD) AS supervisoryCode,
ete.equ_id AS equId
FROM
tzs_jg_equip_transfer jet
......@@ -170,12 +169,7 @@
LEFT JOIN idx_biz_jg_register_info ri ON ri.record = ete.equ_id
LEFT JOIN idx_biz_jg_design_info di ON di.record = ete.equ_id
LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = ete.equ_id
LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = ete.equ_id
LEFT JOIN idx_biz_jg_use_info ui ON ui.record = ete.equ_id
LEFT JOIN tz_equipment_category tec ON ri."EQU_CATEGORY"::text = tec.code::text
LEFT JOIN tz_equipment_category tec1 ON ri."EQU_LIST"::text = tec1.code::text
LEFT JOIN tz_equipment_category tec2 ON ri."EQU_DEFINE"::text = tec2.code::text
LEFT JOIN idx_biz_jg_other_info oi ON ri.RECORD = oi.RECORD
WHERE
jet.sequence_nbr = #{sequenceNbr}
LIMIT 1
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml
View file @ c7e9b6c0
......@@ -22,10 +22,8 @@
isn.promoter,
isn.next_execute_ids AS nextExecuteIds,
isn.instance_status AS instanceStatus,
<!-- isn.equ_address AS equAddress,-->
isn.handle_date AS handleDate,
<!-- isn.equ_list AS equList,-->
ec.name AS equList,
(select name from tz_equipment_category ec WHERE ec.code = ri.equ_category) AS equList,
isn.notice_report_url AS noticeReportUrl,
isn.create_user_id as createUserId,
isn.next_task_id AS nextTaskId,
......@@ -35,7 +33,6 @@
LEFT JOIN tzs_jg_installation_notice_eq insEq on insEq.equip_transfer_id = isn.sequence_nbr
LEFT JOIN idx_biz_jg_use_info ibjui on insEq.equ_id = ibjui.RECORD
LEFT JOIN idx_biz_jg_register_info ri ON ri.record = insEq.equ_id
LEFT JOIN tz_equipment_category ec ON ec.code = ri.equ_category
<where>
isn.is_delete = false
<if test="param != null ">
......@@ -91,12 +88,11 @@
isn.use_unit_name AS useUnitName,
isn.inform_number AS informNumber,
isn.other_accessories AS otherAccessories,
tec2.name AS equCategory,
tec1.name AS equList,
tec.name AS equDefine,
(select name from tz_equipment_category tec2 where ri."EQU_DEFINE"::text = tec2.code::text) AS equCategory,
(select name from tz_equipment_category tec1 where ri."EQU_LIST"::text = tec1.code::text) AS equList,
(select name from tz_equipment_category tec where ri."EQU_CATEGORY"::text = tec.code::text) AS equDefine,
if(ri.EQU_CODE is null or ri.EQU_CODE = 'null', '', ri.EQU_CODE) AS equRegisterCode,
re.equ_id as equId,
ri.PRODUCT_NAME AS productName,
ri.BRAND_NAME AS brandName,
ri.EQU_TYPE AS equType,
......@@ -122,27 +118,19 @@
fi.factory_standard AS factoryStandard,
fi.product_quality_yield_prove AS productQualityYieldProve,
fi.ins_use_maintain_explain AS insUseMaintainExplain,
useUnit.use_contact AS safetyManager,
useUnit.contact_phone AS safetyManagerPhone,
useUnit.use_code AS useCode,
installUnit.use_code AS installUnitCreditCode,
idi.INSPECT_REPORT as inspectReport,
useUnit.address as useUnitLeaderAddress,
re.equ_id as equId,
installUnit.address installUnitAddress
(select useUnit.use_contact from tz_base_enterprise_info useUnit Where useUnit.use_unit_code = isn.use_unit_credit_code) AS safetyManager,
(select useUnit.contact_phone from tz_base_enterprise_info useUnit where useUnit.use_unit_code = isn.use_unit_credit_code) AS safetyManagerPhone,
(select useUnit.use_code from tz_base_enterprise_info useUnit Where useUnit.use_unit_code = isn.use_unit_credit_code) AS useCode,
(select idi.INSPECT_REPORT from idx_biz_jg_inspection_detection_info idi Where idi.record = re.equ_id) as inspectReport,
(select useUnit.address from tz_base_enterprise_info useUnit Where useUnit.use_unit_code = isn.use_unit_credit_code) as useUnitLeaderAddress,
(select use_code from tz_base_enterprise_info tbei Where tbei.use_code = isn.install_unit_credit_code) AS installUnitCreditCode,
(select address from tz_base_enterprise_info tbei Where tbei.use_code = isn.install_unit_credit_code) AS installUnitAddress
FROM
tzs_jg_installation_notice isn
LEFT JOIN tzs_jg_installation_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
LEFT JOIN tz_base_enterprise_info useUnit ON useUnit.use_unit_code = isn.use_unit_credit_code
LEFT JOIN tz_base_enterprise_info installUnit ON installUnit.use_code = isn.install_unit_credit_code
LEFT JOIN amos_tzs_biz.tz_equipment_category tec ON ri."EQU_CATEGORY"::text = tec.code::text
LEFT JOIN amos_tzs_biz.tz_equipment_category tec1 ON ri."EQU_LIST"::text = tec1.code::text
LEFT JOIN amos_tzs_biz.tz_equipment_category tec2 ON ri."EQU_DEFINE"::text = tec2.code::text
WHERE
isn.sequence_nbr = #{sequenceNbr}
LIMIT 1
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintenanceContractMapper.xml
View file @ c7e9b6c0
......@@ -200,13 +200,12 @@
jri.EQU_DEFINE,
jri.PRODUCT_NAME,
jri.EQU_CODE,
other.SUPERVISORY_CODE,
(select other.SUPERVISORY_CODE from idx_biz_jg_other_info other where other.RECORD = jui.RECORD) as SUPERVISORY_CODE,
(SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as EQU_CATEGORY
from tzs_jg_maintenance_contract_eq mc
LEFT JOIN idx_biz_jg_use_info jui on mc.equ_id = jui.RECORD
LEFT JOIN idx_biz_jg_factory_info jfi on mc.equ_id = jfi.RECORD
left JOIN idx_biz_jg_register_info jri on mc.equ_id = jri.RECORD
LEFT JOIN idx_biz_jg_other_info other on other.RECORD = jui.RECORD
WHERE mc.equip_transfer_id = #{id}
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgReformNoticeMapper.xml
View file @ c7e9b6c0
......@@ -32,13 +32,12 @@
isn.equ_category,
isn.create_user_id,
isn.next_execute_user_ids,
oi.SUPERVISORY_CODE AS supervisoryCode,
(select oi.SUPERVISORY_CODE from idx_biz_jg_other_info oi WHERE ri.RECORD = oi.RECORD) AS supervisoryCode,
isn.next_task_id as nextTaskId
FROM
tzs_jg_reform_notice isn
LEFT JOIN tzs_jg_reform_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
LEFT JOIN idx_biz_jg_other_info oi ON ri.RECORD = oi.RECORD
<where>
isn.is_delete = false
<if test="param != null ">
......@@ -125,29 +124,22 @@
fi.factory_standard AS factoryStandard,
fi.product_quality_yield_prove AS productQualityYieldProve,
fi.ins_use_maintain_explain AS insUseMaintainExplain,
useUnit.use_contact AS safetyManager,
useUnit.contact_phone AS safetyManagerPhone,
useUnit.ADDRESS AS useUnitLeaderAddress,
installUnit.use_code AS useCode,
installUnit.use_code AS installUnitCreditCode,
installUnit.address AS installUnitAddress,
tec2.name AS equCategory,
tec1.name AS equList,
tec.name AS equDefine,
oi.SUPERVISORY_CODE AS supervisoryCode,
(select useUnit.use_contact from tz_base_enterprise_info useUnit WHERE useUnit.use_code = isn.use_unit_credit_code) AS safetyManager,
(select useUnit.contact_phone from tz_base_enterprise_info useUnit WHERE useUnit.use_code = isn.use_unit_credit_code) AS safetyManagerPhone,
(select useUnit.ADDRESS from tz_base_enterprise_info useUnit WHERE useUnit.use_code = isn.use_unit_credit_code) AS useUnitLeaderAddress,
(select installUnit.use_code from tz_base_enterprise_info installUnit WHERE installUnit.use_code = isn.install_unit_credit_code) AS useCode,
(select installUnit.use_code from tz_base_enterprise_info installUnit WHERE installUnit.use_code = isn.install_unit_credit_code) AS installUnitCreditCode,
(select installUnit.address from tz_base_enterprise_info installUnit WHERE installUnit.use_code = isn.install_unit_credit_code) AS installUnitAddress,
(select tec.name from tz_equipment_category tec WHERE ri."EQU_DEFINE"::text = tec.code::text) AS equCategory,
(select tec.name from tz_equipment_category tec WHERE ri."EQU_LIST"::text = tec.code::text) AS equList,
(select tec.name from tz_equipment_category tec WHERE ri."EQU_CATEGORY"::text = tec.code::text) AS equDefine,
(select oi.SUPERVISORY_CODE from idx_biz_jg_other_info oi WHERE ri.RECORD = oi.RECORD) AS supervisoryCode,
re.equ_id AS equId
FROM tzs_jg_reform_notice isn
LEFT JOIN tzs_jg_reform_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
LEFT JOIN tz_base_enterprise_info useUnit ON useUnit.use_code = isn.use_unit_credit_code
LEFT JOIN tz_base_enterprise_info installUnit ON installUnit.use_code = isn.install_unit_credit_code
LEFT JOIN tz_equipment_category tec ON ri."EQU_CATEGORY"::text = tec.code::text
LEFT JOIN tz_equipment_category tec1 ON ri."EQU_LIST"::text = tec1.code::text
LEFT JOIN tz_equipment_category tec2 ON ri."EQU_DEFINE"::text = tec2.code::text
LEFT JOIN idx_biz_jg_other_info oi ON ri.RECORD = oi.RECORD
WHERE isn.sequence_nbr = #{sequenceNbr}
LIMIT 1
</select>
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgScrapCancelMapper.xml
View file @ c7e9b6c0
......@@ -76,9 +76,6 @@
</select>
<select id="getDetail" resultType="java.util.Map">
SELECT jri.EQU_CODE as equCode,
-- (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
-- (SELECT name from tz_equipment_category where code = jri.EQU_LIST) as equList,
-- (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE) as equDefine,
jri.EQU_CATEGORY as equCategory,
jri.EQU_LIST as equList,
jri.EQU_DEFINE as equDefine,
......@@ -206,12 +203,11 @@
ui.COUNTY_NAME AS useUnitCountyName,
ui.ADDRESS AS useUnitAddress
FROM tzs_jg_scrap_cancel ur
LEFT JOIN tzs_jg_scrap_cancel_eq re ON re.equip_transfer_id = ur.sequence_nbr
LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
LEFT JOIN tzs_jg_scrap_cancel_eq re ON re.equip_transfer_id = ur.sequence_nbr
LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
WHERE ur.sequence_nbr = #{sequenceNbr}
LIMIT 1
</select>
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgTransferNoticeMapper.xml
View file @ c7e9b6c0
......@@ -23,22 +23,19 @@
tjtn.next_execute_ids AS nextExecuteIds,
tjtn.instance_status AS instanceStatus,
tjtn.notice_report_url AS noticeReportUrl,
ec."name" AS equipCateName,
(select ec."name" from tz_equipment_category ec WHERE ec.code = ri.equ_category) AS equipCateName,
tjtn.handle_date AS handleDate,
tjtn.create_user_id as createUserId,
tjtn.next_execute_user_ids as nextExecuteUserIds,
oi.SUPERVISORY_CODE as supervisoryCode,
(select oi.SUPERVISORY_CODE from idx_biz_jg_other_info oi WHERE oi.RECORD = re.equ_id) as supervisoryCode,
tjtn.next_task_id AS nextTaskId,
concat(ibjui."PROVINCE_NAME", '', ibjui."CITY_NAME", '', ibjui."COUNTY_NAME", '', ibjui."STREET_NAME", '', ibjui."ADDRESS") as equAddress,
ei.address as useUnitLeaderAddress
(select ei.address from tz_base_enterprise_info ei WHERE ei.use_code = tjtn.use_unit_credit_code) as useUnitLeaderAddress
FROM
tzs_jg_transfer_notice tjtn
LEFT JOIN tzs_jg_transfer_notice_eq re ON re.equip_transfer_id = tjtn.sequence_nbr
LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
LEFT JOIN tz_equipment_category ec ON ec.code = ri.equ_category
LEFT JOIN idx_biz_jg_use_info ibjui on re.equ_id = ibjui.RECORD
left join idx_biz_jg_other_info oi on oi.RECORD = re.equ_id
LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = tjtn.use_unit_credit_code
<where>
tjtn.is_delete = false
<if test="param != null ">
......@@ -64,12 +61,6 @@
AND tjtn.transfer_type = '跨区移装'
</if>
</if>
<!-- <if test="type == 'supervision'">-->
<!-- AND tjtn.receive_org_code = #{orgCode} AND tjtn.instance_id IS NOT NULL-->
<!-- </if>-->
<!-- <if test="type == 'enterprise'">-->
<!-- AND tjtn.install_unit_credit_code = #{orgCode}-->
<!-- </if>-->
<if test="param.roleIds != null and type == 'supervision'">
<foreach collection='param.roleIds' item='role' open='and (' close=')' separator='or'>
......@@ -120,13 +111,10 @@
tjtn.street_name AS streetName,
tjtn.promoter AS promoter,
tjtn.plan_date AS installStartDate,
tec2.name AS equCategory,
tec1.name AS equList,
tec.name AS equDefine,
oi.SUPERVISORY_CODE as supervisoryCode,
tjtn.construction_manager AS installLeaderName,
tjtn.construction_manager_phone AS installLeaderPhone,
tjtn.inform_number AS informNumber,
re.equ_id as equId,
ri.EQU_CODE AS equRegisterCode,
ri.PRODUCT_NAME AS productName,
ri.BRAND_NAME AS brandName,
......@@ -153,32 +141,27 @@
fi.factory_standard AS factoryStandard,
fi.product_quality_yield_prove AS productQualityYieldProve,
fi.ins_use_maintain_explain AS insUseMaintainExplain,
useUnit.use_contact AS safetyManager,
useUnit.contact_phone AS safetyManagerPhone,
ui.PROVINCE_NAME AS useUnitProvinceName,
ui.CITY_NAME AS useUnitCityName,
ui.COUNTY_NAME AS useUnitCountyName,
ui.ADDRESS AS useUnitAddress,
installUnit.use_code AS useCode,
installUnit.use_code AS installUnitCreditCode,
idi.INSPECT_REPORT as inspectReport,
re.equ_id as equId,
useUnit.address as useUnitLeaderAddress,
installUnit.address installUnitAddress
(select ui.PROVINCE_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS useUnitProvinceName,
(select ui.CITY_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS useUnitCityName,
(select ui.COUNTY_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS useUnitCountyName,
(select ui.ADDRESS from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS useUnitAddress,
(select tec2.name from amos_tzs_biz.tz_equipment_category tec2 WHERE ri."EQU_DEFINE"::text = tec2.code::text) AS equCategory,
(select tec1.name from amos_tzs_biz.tz_equipment_category tec1 WHERE ri."EQU_LIST"::text = tec1.code::text) AS equList,
(select tec.name from amos_tzs_biz.tz_equipment_category tec WHERE ri."EQU_CATEGORY"::text = tec.code::text) AS equDefine,
(select idi.INSPECT_REPORT from idx_biz_jg_inspection_detection_info idi WHERE idi.record = re.equ_id) AS inspectReport,
(select oi.SUPERVISORY_CODE from idx_biz_jg_other_info oi WHERE oi.RECORD = re.equ_id) as supervisoryCode,
(select useUnit.use_contact from tz_base_enterprise_info useUnit WHERE useUnit.use_code = tjtn.use_unit_credit_code) AS safetyManager,
(select useUnit.contact_phone from tz_base_enterprise_info useUnit WHERE useUnit.use_code = tjtn.use_unit_credit_code) AS safetyManagerPhone,
(select useUnit.address from tz_base_enterprise_info useUnit WHERE useUnit.use_code = tjtn.use_unit_credit_code) AS useUnitLeaderAddress,
(select installUnit.use_code from tz_base_enterprise_info installUnit WHERE installUnit.use_code = tjtn.install_unit_credit_code) AS useCode,
(select installUnit.use_code from tz_base_enterprise_info installUnit WHERE installUnit.use_code = tjtn.install_unit_credit_code) AS installUnitCreditCode,
(select installUnit.address from tz_base_enterprise_info installUnit WHERE installUnit.use_code = tjtn.install_unit_credit_code) AS installUnitAddress
FROM
tzs_jg_transfer_notice tjtn
LEFT JOIN tzs_jg_transfer_notice_eq re ON re.equip_transfer_id = tjtn.sequence_nbr
LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
left join idx_biz_jg_other_info oi on oi.RECORD = re.equ_id
LEFT JOIN tz_base_enterprise_info useUnit ON useUnit.use_code = tjtn.use_unit_credit_code
LEFT JOIN tz_base_enterprise_info installUnit ON installUnit.use_code = tjtn.install_unit_credit_code
LEFT JOIN amos_tzs_biz.tz_equipment_category tec ON ri."EQU_CATEGORY"::text = tec.code::text
LEFT JOIN amos_tzs_biz.tz_equipment_category tec1 ON ri."EQU_LIST"::text = tec1.code::text
LEFT JOIN amos_tzs_biz.tz_equipment_category tec2 ON ri."EQU_DEFINE"::text = tec2.code::text
WHERE
tjtn.sequence_nbr = #{sequenceNbr}
LIMIT 1
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
View file @ c7e9b6c0
......@@ -105,42 +105,36 @@
</select>
<select id="getDetail" resultType="java.util.Map">
SELECT
jri.RECORD as equipId,
jri.EQU_CODE as equCode,
-- (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
-- (SELECT name from tz_equipment_category where code = jri.EQU_LIST) as equList,
-- (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE) as equDefine,
jri.EQU_CATEGORY as equCategory,
jri.EQU_LIST as equList,
jri.EQU_DEFINE as equDefine,
jri.PRODUCT_NAME as productName,
jri.EQU_TYPE as equType,
jri.PRODUCT_PHOTO as proDuctPhoto,
jri.BRAND_NAME as brandName,
jri.EQU_PRICE as equPrice,
jfi.FACTORY_NUM as factoryNum,
jfi.PRODUCE_UNIT_NAME as produceUnitName,
date_format(jfi.PRODUCE_DATE,'%Y-%m-%d') as produceDate,
jfi.FACTORY_STANDARD as factoryStandard,
jfi.PRODUCT_QUALITY_YIELD_PROVE as productQualityYieldProve,
jfi.INS_USE_MAINTAIN_EXPLAIN as insUseMaintainExplain,
jfi.IMPORTED as imported,
jfi.PRODUCE_LICENSE_NUM as produceLicenseNum,
jfi.PRODUCE_COUNTRY as produceCountry,
jfi.produce_unit_credit_code as produceUnitCreditCode,
jci.USC_UNIT_NAME as uscUnitName,
jci.USC_UNIT_CREDIT_CODE as uscUnitCreditCode,
jri.OTHER_ACCESSORIES_REG as otherAccessoriesReg,
jfi.OTHER_ACCESSORIES_FACT as otherAccessoriesFact,
jfi.FACT_SUPERVISION_INSPECTION_REPORT as factSupervisionInspectionReport,
jfi.BOILER_ENERGY_EFFICIENCY_CERTIFICATE as boilerEnergyEfficiencyCertificate
from idx_biz_jg_register_info jri
LEFT JOIN idx_biz_jg_factory_info jfi on jri.RECORD = jfi.RECORD
LEFT JOIN idx_biz_jg_construction_info jci on jri.RECORD = jci.RECORD
where jri.RECORD = #{id}
jri.RECORD as equipId,
jri.EQU_CODE as equCode,
jri.EQU_CATEGORY as equCategory,
jri.EQU_LIST as equList,
jri.EQU_DEFINE as equDefine,
jri.PRODUCT_NAME as productName,
jri.EQU_TYPE as equType,
jri.PRODUCT_PHOTO as proDuctPhoto,
jri.BRAND_NAME as brandName,
jri.EQU_PRICE as equPrice,
jfi.FACTORY_NUM as factoryNum,
jfi.PRODUCE_UNIT_NAME as produceUnitName,
date_format(jfi.PRODUCE_DATE,'%Y-%m-%d') as produceDate,
jfi.FACTORY_STANDARD as factoryStandard,
jfi.PRODUCT_QUALITY_YIELD_PROVE as productQualityYieldProve,
jfi.INS_USE_MAINTAIN_EXPLAIN as insUseMaintainExplain,
jfi.IMPORTED as imported,
jfi.PRODUCE_LICENSE_NUM as produceLicenseNum,
jfi.PRODUCE_COUNTRY as produceCountry,
jfi.produce_unit_credit_code as produceUnitCreditCode,
jci.USC_UNIT_NAME as uscUnitName,
jci.USC_UNIT_CREDIT_CODE as uscUnitCreditCode,
jri.OTHER_ACCESSORIES_REG as otherAccessoriesReg,
jfi.OTHER_ACCESSORIES_FACT as otherAccessoriesFact,
jfi.FACT_SUPERVISION_INSPECTION_REPORT as factSupervisionInspectionReport,
jfi.BOILER_ENERGY_EFFICIENCY_CERTIFICATE as boilerEnergyEfficiencyCertificate
from idx_biz_jg_register_info jri
LEFT JOIN idx_biz_jg_factory_info jfi on jri.RECORD = jfi.RECORD
LEFT JOIN idx_biz_jg_construction_info jci on jri.RECORD = jci.RECORD
where jri.RECORD = #{id}
</select>
<select id="getInspectDetail" resultType="java.util.Map">
SELECT INSPECT_TYPE as inspectType,
......@@ -290,7 +284,7 @@
tjur."supervisory_code" as UseRegistratSupervisoryCode,
tjur."receive_org_name" as UseRegistratReceiveOrgName
FROM "tzs_jg_use_registration_eq" AS tjure
LEFT JOIN "tzs_jg_use_registration" AS tjur ON tjure."equip_transfer_id" = tjur."sequence_nbr"
LEFT JOIN "tzs_jg_use_registration" AS tjur ON tjure."equip_transfer_id" = tjur."sequence_nbr"
WHERE tjure."equ_id" = #{id}
AND tjur."status" = '已完成'
ORDER BY tjure."rec_date" desc
......@@ -327,13 +321,12 @@
(SELECT name from tz_equipment_category where code = jri.EQU_DEFINE) as EQU_DEFINE,
jri.PRODUCT_NAME,
jri.EQU_CODE,
other.SUPERVISORY_CODE,
(select other.SUPERVISORY_CODE from idx_biz_jg_other_info other where other.RECORD = jui.RECORD) as SUPERVISORY_CODE,
(SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as EQU_CATEGORY
from tzs_jg_use_registration_eq tjure
LEFT JOIN idx_biz_jg_use_info jui on tjure.equ_id = jui.RECORD
LEFT JOIN idx_biz_jg_factory_info jfi on tjure.equ_id = jfi.RECORD
left JOIN idx_biz_jg_register_info jri on tjure.equ_id = jri.RECORD
LEFT JOIN idx_biz_jg_other_info other on other.RECORD = jui.RECORD
WHERE tjure.equip_transfer_id = #{id}
</select>
<sql id="page-list-pipeline">
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgVehicleInformationMapper.xml
View file @ c7e9b6c0
......@@ -176,13 +176,12 @@
(SELECT name from tz_equipment_category where code = jri.EQU_DEFINE) as EQU_DEFINE,
jri.PRODUCT_NAME,
jri.EQU_CODE,
other.SUPERVISORY_CODE,
(select other.SUPERVISORY_CODE from idx_biz_jg_other_info other where other.RECORD = jui.RECORD) as SUPERVISORY_CODE,
(SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as EQU_CATEGORY
from tzs_jg_vehicle_information_eq tjvie
LEFT JOIN idx_biz_jg_use_info jui on tjvie.equ_id = jui.RECORD
LEFT JOIN idx_biz_jg_factory_info jfi on tjvie.equ_id = jfi.RECORD
left JOIN idx_biz_jg_register_info jri on tjvie.equ_id = jri.RECORD
LEFT JOIN idx_biz_jg_other_info other on other.RECORD = jui.RECORD
WHERE tjvie.vehicle_id = #{id}
</select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment