Commit 6c3b479c authored by tianbo's avatar tianbo

fix(jg): cherry pick from main:西安电梯数据导出接口修改

parent f9e7ac2b
...@@ -1922,8 +1922,8 @@ ...@@ -1922,8 +1922,8 @@
ibjfi.FACTORY_NUM as factoryNum, ibjfi.FACTORY_NUM as factoryNum,
joi.CODE96333 as spotCode, joi.CODE96333 as spotCode,
ibjri.USE_ORG_CODE as regCertCode, ibjri.USE_ORG_CODE as regCertCode,
date_format(tjur.audit_pass_date , '%Y-%m-%d') as regCertTime, date_format(tjurm.audit_pass_date , '%Y-%m-%d') as regCertTime,
date_format(tjur.create_date,'%Y-%m-%d') as applyDate, date_format(tjurm.create_date,'%Y-%m-%d') as applyDate,
ibjui.USE_INNER_CODE as useInnerCode, ibjui.USE_INNER_CODE as useInnerCode,
ibjtpe.SXCSBHZZ_PRODUCT_NO as upProtectCode, ibjtpe.SXCSBHZZ_PRODUCT_NO as upProtectCode,
ibjtpe.JMMSZZ_MANUFACTURER as carLockEnterp, ibjtpe.JMMSZZ_MANUFACTURER as carLockEnterp,
...@@ -1945,7 +1945,7 @@ ...@@ -1945,7 +1945,7 @@
ibjtpe.CMMSZZ_PRODUCT_NO as doorLockCode, ibjtpe.CMMSZZ_PRODUCT_NO as doorLockCode,
ibjtpe.AQQ_MANUFACTURER as safeClamEnterp, ibjtpe.AQQ_MANUFACTURER as safeClamEnterp,
ibjtpe.DCHCQ_MODEL as heavyBufferModel, ibjtpe.DCHCQ_MODEL as heavyBufferModel,
tjur.RECEIVE_ORG_NAME as regOrgId,--注册机构 tjurm.receive_company_code as regOrgId,--注册机构
ibjtpe.QDZJ_MODEL as driveHostModel, ibjtpe.QDZJ_MODEL as driveHostModel,
ibjtpe.AQQ_MODEL as safeClamModel, ibjtpe.AQQ_MODEL as safeClamModel,
ibjtpe.KZG_MANUFACTURER as controlCabEnterp, ibjtpe.KZG_MANUFACTURER as controlCabEnterp,
...@@ -1963,21 +1963,20 @@ ...@@ -1963,21 +1963,20 @@
ibjtpe.XGXL_MEDIA_NUMBER as suspensionMediumTotal, ibjtpe.XGXL_MEDIA_NUMBER as suspensionMediumTotal,
ibjtpe.JMMSZZ_PRODUCT_NO as carLockCode, ibjtpe.JMMSZZ_PRODUCT_NO as carLockCode,
ibjtpe.QDZJ_REDUCTION_RATIO as driveHostReduceRatio, ibjtpe.QDZJ_REDUCTION_RATIO as driveHostReduceRatio,
tjur.SUPERVISION_ORG_CODE as supervisionOrgCode, tjurm.supervise_org_code as supervisionOrgCode,
ibjui.DATA_SOURCE as dataSource ibjui.DATA_SOURCE as dataSource
FROM FROM
tzs_jg_use_registration_manage tjurm tzs_jg_use_registration_manage tjurm
LEFT JOIN idx_biz_jg_register_info ibjri on ibjri."RECORD" = tjurm.equ_id LEFT JOIN idx_biz_jg_register_info ibjri on ibjri."USE_ORG_CODE" = tjurm.use_registration_code
LEFT JOIN idx_biz_jg_use_info ibjui ON tjure.equ_id = ibjui."RECORD" LEFT JOIN idx_biz_jg_use_info ibjui ON ibjri."RECORD" = ibjui."RECORD"
LEFT JOIN idx_biz_jg_register_info ibjri on ibjri."RECORD" = tjure.equ_id LEFT JOIN idx_biz_jg_factory_info ibjfi on ibjfi."RECORD" = ibjri."RECORD"
LEFT JOIN idx_biz_jg_factory_info ibjfi on ibjfi."RECORD" = tjure.equ_id LEFT JOIN idx_biz_jg_other_info joi ON joi."RECORD" = ibjri."RECORD"
LEFT JOIN idx_biz_jg_other_info joi ON joi."RECORD" = tjure.equ_id LEFT JOIN idx_biz_jg_tech_params_elevator ibjtpe ON ibjtpe."RECORD" = ibjri."RECORD"
LEFT JOIN idx_biz_jg_tech_params_elevator ibjtpe ON ibjtpe."RECORD" = tjure.equ_id
WHERE ibjri."EQU_LIST" = '3000' WHERE ibjri."EQU_LIST" = '3000'
AND tjur.status = '已完成' AND tjurm.certificate_status = '已登记'
AND (tjur.audit_pass_date between #{beginDate} and #{endDate}) AND (tjurm.audit_pass_date between #{beginDate} and #{endDate})
AND tjur.supervision_org_code LIKE CONCAT('50*52', '%') AND tjurm.supervise_org_code LIKE CONCAT('50*52', '%')
ORDER BY tjur.audit_pass_date ORDER BY tjurm.audit_pass_date
</select> </select>
<select id="selectListForInstallNoticeDiscard" resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq"> <select id="selectListForInstallNoticeDiscard" resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq">
SELECT 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