autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-11 21:40:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

代码格式化

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-03-05 14:56:43 +08:00
parent 837075ebe3
commit 9e7d35d1df
1 changed files with 94 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
View File

@@ -1613,7 +1613,8 @@
del_flag del_flag
</sql> </sql>
<select id="selectOrderBasicInfoList" parameterType="com.jsowell.pile.dto.QueryOrderDTO" resultType="com.jsowell.pile.vo.web.OrderListVO"> <select id="selectOrderBasicInfoList" parameterType="com.jsowell.pile.dto.QueryOrderDTO"
resultType="com.jsowell.pile.vo.web.OrderListVO">
SELECT t1.id as id, SELECT t1.id as id,
t1.order_code as orderCode, t1.order_code as orderCode,
t1.transaction_code as transactionCode, t1.transaction_code as transactionCode,
@@ -1651,12 +1652,10 @@
t4.peak_used_electricity as peakElectricity, t4.peak_used_electricity as peakElectricity,
t4.flat_used_electricity as flatElectricity, t4.flat_used_electricity as flatElectricity,
t4.valley_used_electricity as valleyElectricity t4.valley_used_electricity as valleyElectricity
<!--t5.payment_institutions as paymentInstitutions-->
from order_basic_info t1 from order_basic_info t1
left join member_basic_info t2 on t1.member_id = t2.member_id and t2.del_flag = '0' left join member_basic_info t2 on t1.member_id = t2.member_id and t2.del_flag = '0'
join pile_station_info t3 on t1.station_id = t3.id and t3.del_flag = '0' join pile_station_info t3 on t1.station_id = t3.id and t3.del_flag = '0'
join order_detail t4 on t4.order_code = t1.order_code and t4.del_flag = '0' join order_detail t4 on t4.order_code = t1.order_code and t4.del_flag = '0'
<!--left join member_transaction_record t5 on t5.order_code = t1.order_code and action_type = 'forward' and t5.del_flag = '0'-->
where t1.del_flag = '0' where t1.del_flag = '0'
<if test="pileSn != null and pileSn != ''"> <if test="pileSn != null and pileSn != ''">
and t1.pile_sn = #{pileSn,jdbcType=VARCHAR} and t1.pile_sn = #{pileSn,jdbcType=VARCHAR}
@@ -1700,13 +1699,6 @@
<if test="groupCode != null and groupCode != ''"> <if test="groupCode != null and groupCode != ''">
and t1.group_code = #{groupCode,jdbcType=VARCHAR} and t1.group_code = #{groupCode,jdbcType=VARCHAR}
</if> </if>
<!-- 数据范围过滤 -->
<!-- &amp;amp;lt;if test="merchantDeptIds != null and merchantDeptIds.size() != 0"&amp;amp;gt;-->
<!-- and t3.dept_id in-->
<!-- &amp;amp;lt;foreach collection="merchantDeptIds" item="merchantDeptId" open="(" separator="," close=")"&amp;amp;gt;-->
<!-- #{merchantDeptId}-->
<!-- &amp;amp;lt;/foreach&amp;amp;gt;-->
<!-- &amp;amp;lt;/if&amp;amp;gt;-->
<if test="stationDeptIds != null and stationDeptIds.size() != 0"> <if test="stationDeptIds != null and stationDeptIds.size() != 0">
and t3.dept_id in and t3.dept_id in
<foreach close=")" collection="stationDeptIds" item="stationDeptId" open="(" separator=","> <foreach close=")" collection="stationDeptIds" item="stationDeptId" open="(" separator=",">