diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml index 172c2dfe5..df1a21771 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml @@ -30,15 +30,15 @@ and applied_vehicle_project LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.market}),'%') - - and id LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.issueKey}),'%') + + and id LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.vdr}),'%') and summary LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.summary}),'%') and (impact_cn_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%') - or impact_eu_homo impact_cn_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%')) + and impact_eu_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%')) order by create_time desc @@ -77,16 +77,20 @@ from ota_manage_receive omr left join ota_manage_apply oma on oma.issue_key = omr.id - 1=1 - - and ts.issue_key LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.issueKey}),'%') + 1=1 + + and omr.planned_bp_launch_batch_ =#{otaManageApplyEO.plannedBpLaunchBatch} + + + + and omr.id LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.vdr}),'%') - and ts.summary LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.summary}),'%') + and omr.summary LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.summary}),'%') - and (ts.impact_cn_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%') - or impact_eu_homo ts.impact_cn_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%')) + and (omr.impact_cn_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%') + and omr.impact_eu_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%')) order by create_time desc diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index 07b235ad3..4153b19de 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -215,6 +215,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl