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/TempCarFeeConfigServiceDaoImplMapper.xml | 65 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 31 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..fd8e79e
--- a/java110-db/src/main/resources/mapper/fee/TempCarFeeConfigServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/TempCarFeeConfigServiceDaoImplMapper.xml
@@ -1,25 +1,23 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="tempCarFeeConfigServiceDaoImpl">
<!-- 淇濆瓨涓存椂杞︽敹璐规爣鍑嗕俊鎭� 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>
-
<!-- 鏌ヨ涓存椂杞︽敹璐规爣鍑嗕俊鎭紙Business锛� add by wuxw 2018-07-03 -->
<select id="getBusinessTempCarFeeConfigInfo" parameterType="Map" resultType="Map">
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 +38,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 != ''">
@@ -55,16 +53,14 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
-
</select>
-
<!-- 淇濆瓨涓存椂杞︽敹璐规爣鍑嗕俊鎭嚦 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 +78,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 != ''">
@@ -97,18 +93,19 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
-
</insert>
-
<!-- 鏌ヨ涓存椂杞︽敹璐规爣鍑嗕俊鎭� add by wuxw 2018-07-03 -->
<select id="getTempCarFeeConfigInfo" parameterType="Map" resultType="Map">
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
- where 1 =1
+ left join temp_car_fee_rule tcfr on t.rule_id = tcfr.rule_id and tcfr.status_cd = '0'
+ inner join pay_fee_config pfc on t.fee_config_id = pfc.config_id and pfc.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}
</if>
@@ -127,10 +124,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 != ''">
@@ -142,13 +139,14 @@
<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 ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼涓存椂杞︽敹璐规爣鍑嗕俊鎭� add by wuxw 2018-07-03 -->
<update id="updateTempCarFeeConfigInfoInstance" parameterType="Map">
@@ -168,10 +166,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 != ''">
@@ -187,14 +185,16 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</update>
<!-- 鏌ヨ涓存椂杞︽敹璐规爣鍑嗘暟閲� add by wuxw 2018-07-03 -->
<select id="queryTempCarFeeConfigsCount" parameterType="Map" resultType="Map">
select count(1) count
from temp_car_fee_config t
- where 1 =1
+ left join temp_car_fee_rule tcfr on t.rule_id = tcfr.rule_id and tcfr.status_cd = '0'
+ inner join pay_fee_config pfc on t.fee_config_id = pfc.config_id and pfc.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}
</if>
@@ -213,10 +213,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 != ''">
@@ -228,7 +228,11 @@
<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>
+
<!-- 鏌ヨ涓存椂杞� 鏀惰垂瑙勫垯 -->
<select id="queryTempCarFeeRules" parameterType="Map" resultType="Map">
select
@@ -243,8 +247,8 @@
<!-- 鏌ヨ涓存椂杞� 鏀惰垂瑙勫垯 -->
<select id="queryTempCarFeeRuleSpecs" parameterType="Map" resultType="Map">
- select t.rule_id ruleId,t.spec_id specId,t.spec_name specName,t.seq from
- temp_car_fee_rule_spec t
+ 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 != ''">
and t.rule_id= #{ruleId}
@@ -260,5 +264,4 @@
</if>
order by t.seq
</select>
-
</mapper>
--
Gitblit v1.8.0