From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
java110-db/src/main/resources/mapper/fee/TempCarFeeConfigServiceDaoImplMapper.xml | 43 ++++++++++++++++++++++++++-----------------
1 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/TempCarFeeConfigServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/TempCarFeeConfigServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index ea7c2ba..3378e46
--- a/java110-db/src/main/resources/mapper/fee/TempCarFeeConfigServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/TempCarFeeConfigServiceDaoImplMapper.xml
@@ -7,9 +7,9 @@
<!-- 淇濆瓨涓存椂杞︽敹璐规爣鍑嗕俊鎭� add by wuxw 2018-07-03 -->
<insert id="saveBusinessTempCarFeeConfigInfo" parameterType="Map">
insert into business_temp_car_fee_config(
- car_type,operate,config_id,fee_name,pa_id,area_num,start_time,end_time,b_id,rule_id,community_id
+ car_type,operate,config_id,fee_name,pa_id,area_num,start_time,end_time,b_id,rule_id,community_id,fee_config_id
) values (
- #{carType},#{operate},#{configId},#{feeName},#{paId},#{areaNum},#{startTime},#{endTime},#{bId},#{ruleId},#{communityId}
+ #{carType},#{operate},#{configId},#{feeName},#{paId},#{areaNum},#{startTime},#{endTime},#{bId},#{ruleId},#{communityId},#{feeConfigId}
)
</insert>
@@ -19,7 +19,7 @@
select t.car_type,t.car_type carType,t.operate,t.config_id,t.config_id configId,t.fee_name,t.fee_name
feeName,t.pa_id,t.pa_id paId,t.area_num,t.area_num areaNum,t.start_time,t.start_time
startTime,t.end_time,t.end_time endTime,t.b_id,t.b_id bId,t.rule_id,t.rule_id
- ruleId,t.community_id,t.community_id communityId
+ ruleId,t.community_id,t.community_id communityId,t.fee_config_id,t.fee_config_id feeConfigId
from business_temp_car_fee_config t
where 1 =1
<if test="carType !=null and carType != ''">
@@ -40,10 +40,10 @@
<if test="areaNum !=null and areaNum != ''">
and t.area_num= #{areaNum}
</if>
- <if test="startTime !=null and startTime != ''">
+ <if test="startTime !=null ">
and t.start_time= #{startTime}
</if>
- <if test="endTime !=null and endTime != ''">
+ <if test="endTime !=null ">
and t.end_time= #{endTime}
</if>
<if test="bId !=null and bId != ''">
@@ -62,9 +62,9 @@
<!-- 淇濆瓨涓存椂杞︽敹璐规爣鍑嗕俊鎭嚦 instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveTempCarFeeConfigInfoInstance" parameterType="Map">
insert into temp_car_fee_config(
- car_type,config_id,fee_name,pa_id,area_num,status_cd,start_time,end_time,b_id,rule_id,community_id
+ car_type,config_id,fee_name,pa_id,area_num,status_cd,start_time,end_time,b_id,rule_id,community_id,fee_config_id
) select
- t.car_type,t.config_id,t.fee_name,t.pa_id,t.area_num,'0',t.start_time,t.end_time,t.b_id,t.rule_id,t.community_id
+ t.car_type,t.config_id,t.fee_name,t.pa_id,t.area_num,'0',t.start_time,t.end_time,t.b_id,t.rule_id,t.community_id,t.fee_config_id
from business_temp_car_fee_config t where 1=1
<if test="carType !=null and carType != ''">
and t.car_type= #{carType}
@@ -82,10 +82,10 @@
<if test="areaNum !=null and areaNum != ''">
and t.area_num= #{areaNum}
</if>
- <if test="startTime !=null and startTime != ''">
+ <if test="startTime !=null ">
and t.start_time= #{startTime}
</if>
- <if test="endTime !=null and endTime != ''">
+ <if test="endTime !=null ">
and t.end_time= #{endTime}
</if>
<if test="bId !=null and bId != ''">
@@ -106,8 +106,10 @@
select t.car_type,t.car_type carType,t.config_id,t.config_id configId,t.fee_name,t.fee_name
feeName,t.pa_id,t.pa_id paId,t.area_num,t.area_num areaNum,t.status_cd,t.status_cd
statusCd,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.b_id,t.b_id bId,t.rule_id,t.rule_id
- ruleId,t.community_id,t.community_id communityId
+ ruleId,t.community_id,t.community_id communityId,tcfr.rule_name ruleName,td.name carTypeName,t.fee_config_id,t.fee_config_id feeConfigId
from temp_car_fee_config t
+ left join temp_car_fee_rule tcfr on t.rule_id = tcfr.rule_id and tcfr.status_cd = '0'
+ left join t_dict td on t.car_type = td.status_cd and td.table_name = 'temp_car_fee_config' and td.table_columns = 'car_type'
where 1 =1
<if test="carType !=null and carType != ''">
and t.car_type= #{carType}
@@ -127,10 +129,10 @@
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
</if>
- <if test="startTime !=null and startTime != ''">
+ <if test="startTime !=null ">
and t.start_time= #{startTime}
</if>
- <if test="endTime !=null and endTime != ''">
+ <if test="endTime !=null ">
and t.end_time= #{endTime}
</if>
<if test="bId !=null and bId != ''">
@@ -141,6 +143,9 @@
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
+ </if>
+ <if test="feeConfigId !=null and feeConfigId != ''">
+ and t.fee_config_id= #{feeConfigId}
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
@@ -168,10 +173,10 @@
<if test="areaNum !=null and areaNum != ''">
, t.area_num= #{areaNum}
</if>
- <if test="startTime !=null and startTime != ''">
+ <if test="startTime !=null ">
, t.start_time= #{startTime}
</if>
- <if test="endTime !=null and endTime != ''">
+ <if test="endTime !=null ">
, t.end_time= #{endTime}
</if>
<if test="ruleId !=null and ruleId != ''">
@@ -213,10 +218,10 @@
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
</if>
- <if test="startTime !=null and startTime != ''">
+ <if test="startTime !=null ">
and t.start_time= #{startTime}
</if>
- <if test="endTime !=null and endTime != ''">
+ <if test="endTime !=null ">
and t.end_time= #{endTime}
</if>
<if test="bId !=null and bId != ''">
@@ -227,6 +232,9 @@
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
+ </if>
+ <if test="feeConfigId !=null and feeConfigId != ''">
+ and t.fee_config_id= #{feeConfigId}
</if>
</select>
<!-- 鏌ヨ涓存椂杞� 鏀惰垂瑙勫垯 -->
@@ -243,7 +251,8 @@
<!-- 鏌ヨ涓存椂杞� 鏀惰垂瑙勫垯 -->
<select id="queryTempCarFeeRuleSpecs" parameterType="Map" resultType="Map">
- select t.rule_id ruleId,t.spec_id specId,t.spec_name specName,t.seq from
+ select t.rule_id ruleId,t.spec_id specId,t.spec_name specName,t.seq,t.remark
+ from
temp_car_fee_rule_spec t
where t.status_cd = '0'
<if test="ruleId !=null and ruleId != ''">
--
Gitblit v1.8.0