From 8881d5512345a808fec61c32f72611343d623bd6 Mon Sep 17 00:00:00 2001 From: "YAS\\29473" <2947326429@qq.com> Date: Tue, 8 Apr 2025 09:11:39 +0800 Subject: [PATCH] update --- .../src/main/resources/mapper/pile/OrderBasicInfoMapper.xml | 2 ++ .../main/resources/mapper/pile/PileConnectorInfoMapper.xml | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index 66512b7cf..97174ca91 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -3125,6 +3125,8 @@ FROM order_basic_info WHERE + del_flag = '0' + and station_id = #{stationId} ORDER BY create_time DESC diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml index 1cd4b3f08..9dc1f336f 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml @@ -311,10 +311,12 @@ t1.pile_sn FROM pile_connector_info t1 - LEFT JOIN pile_basic_info t2 ON t1.pile_sn = t2.sn + LEFT JOIN pile_basic_info t2 ON (t1.pile_sn = t2.sn and t2.del_flag = '0') WHERE - t1.status = '255' + t1.status in ('255','0') AND t2.station_id = #{stationId,jdbcType=VARCHAR} + AND + t1.del_flag = '0' \ No newline at end of file