From a8990150b50fde2e507b9df01d8e0847b2bda81d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 22 八月 2021 19:05:06 +0800
Subject: [PATCH] 优化代码

---
 java110-db/src/main/resources/mapper/fee/TempCarFeeConfigServiceDaoImplMapper.xml |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 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 dbbcda3..a56d5ee
--- a/java110-db/src/main/resources/mapper/fee/TempCarFeeConfigServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/TempCarFeeConfigServiceDaoImplMapper.xml
@@ -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 != ''">
@@ -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
         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 != ''">
@@ -168,10 +170,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 +215,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 != ''">

--
Gitblit v1.8.0