From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/TempCarFeeConfigAttrServiceDaoImplMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/TempCarFeeConfigAttrServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/TempCarFeeConfigAttrServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index df15d85..528cedf
--- a/java110-db/src/main/resources/mapper/fee/TempCarFeeConfigAttrServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/TempCarFeeConfigAttrServiceDaoImplMapper.xml
@@ -79,8 +79,10 @@
<select id="getTempCarFeeConfigAttrInfo" parameterType="Map" resultType="Map">
select t.attr_id,t.attr_id attrId,t.create_time,t.create_time createTime,t.config_id,t.config_id
configId,t.spec_cd,t.spec_cd specCd,t.status_cd,t.status_cd statusCd,t.b_id,t.b_id bId,t.value,
- t.community_id,t.community_id communityId
+ t.community_id,t.community_id communityId,tcfrs.spec_name specName
from temp_car_fee_config_attr t
+ left join temp_car_fee_config tcfc on t.config_id = tcfc.config_id and tcfc.status_cd = '0'
+ LEFT JOIN temp_car_fee_rule_spec tcfrs on tcfc.rule_id = tcfrs.rule_id and t.spec_cd = tcfrs.spec_id
where 1 =1
<if test="attrId !=null and attrId != ''">
and t.attr_id= #{attrId}
@@ -106,7 +108,7 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
- order by t.create_time desc
+ order by tcfrs.seq
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
--
Gitblit v1.8.0