From 555a0ccd790cfd37fc0eb3d4e7f85897427a3583 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 16 一月 2023 01:49:31 +0800
Subject: [PATCH] 加入 放行已办 待办查询接口
---
java110-db/src/main/resources/mapper/common/ItemReleaseV1ServiceDaoImplMapper.xml | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/common/ItemReleaseV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/ItemReleaseV1ServiceDaoImplMapper.xml
index 738f084..16e0d50 100644
--- a/java110-db/src/main/resources/mapper/common/ItemReleaseV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/ItemReleaseV1ServiceDaoImplMapper.xml
@@ -7,23 +7,24 @@
<!-- 淇濆瓨鏀捐绠＄悊淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveItemReleaseInfo" parameterType="Map">
insert into item_release(
- amount,apply_company,id_card,pass_time,car_num,remark,apply_person,ir_id,apply_tel,type_id,state,community_id
+ apply_company,id_card,pass_time,car_num,remark,apply_person,ir_id,apply_tel,type_id,state,community_id,create_user_id
) values (
- #{amount},#{applyCompany},#{idCard},#{passTime},#{carNum},#{remark},#{applyPerson},#{irId},#{applyTel},#{typeId},#{state},#{communityId}
+ #{applyCompany},#{idCard},#{passTime},#{carNum},#{remark},#{applyPerson},#{irId},#{applyTel},#{typeId},#{state},#{communityId},#{createUserId}
)
</insert>
<!-- 鏌ヨ鏀捐绠＄悊淇℃伅 add by wuxw 2018-07-03 -->
<select id="getItemReleaseInfo" parameterType="Map" resultType="Map">
- select t.amount,t.apply_company,t.apply_company applyCompany,t.id_card,t.id_card idCard,t.pass_time,t.pass_time
+ select t.apply_company,t.apply_company applyCompany,t.id_card,t.id_card idCard,t.pass_time,t.pass_time
passTime,t.car_num,t.car_num carNum,t.remark,t.status_cd,t.status_cd statusCd,t.apply_person,t.apply_person
applyPerson,t.ir_id,t.ir_id irId,t.apply_tel,t.apply_tel applyTel,t.type_id,t.type_id
- typeId,t.state,t.community_id,t.community_id communityId
+ typeId,t.state,t.community_id,t.community_id communityId,irt.type_name typeName,irt.flow_id flowId,irt.flow_name flowName,
+ td.name stateName,t.create_time createTime,SUM(irr.amount) amount,t.create_user_id createUserId
from item_release t
+ LEFT JOIN item_release_type irt on t.type_id = irt.type_id and irt.status_cd = '0' and irt.community_id = t.community_id
+ left join t_dict td on t.state = td.status_cd and td.table_name = 'item_release' and td.table_columns = 'state'
+ left join item_release_res irr on t.ir_id = irr.ir_id and t.community_id = irr.community_id and irr.status_cd = '0'
where 1 =1
- <if test="amount !=null and amount != ''">
- and t.amount= #{amount}
- </if>
<if test="applyCompany !=null and applyCompany != ''">
and t.apply_company= #{applyCompany}
</if>
@@ -48,6 +49,12 @@
<if test="irId !=null and irId != ''">
and t.ir_id= #{irId}
</if>
+ <if test="irIds !=null ">
+ and t.ir_id in
+ <foreach collection="irIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="applyTel !=null and applyTel != ''">
and t.apply_tel= #{applyTel}
</if>
@@ -57,9 +64,14 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
+ <if test="createUserId !=null and createUserId != ''">
+ and t.create_user_id= #{createUserId}
+ </if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
+ group by t.create_time,t.apply_company,t.id_card,t.pass_time,t.car_num,t.remark,t.status_cd,t.apply_person,t.ir_id,t.apply_tel,t.type_id,t.state,t.community_id,irt.type_name,irt.flow_id ,irt.flow_name,
+ td.name
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -71,9 +83,6 @@
<!-- 淇敼鏀捐绠＄悊淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateItemReleaseInfo" parameterType="Map">
update item_release t set t.status_cd = #{statusCd}
- <if test="newBId != null and newBId != ''">
- ,t.b_id = #{newBId}
- </if>
<if test="amount !=null and amount != ''">
, t.amount= #{amount}
</if>
@@ -104,12 +113,13 @@
<if test="state !=null and state != ''">
, t.state= #{state}
</if>
- <if test="communityId !=null and communityId != ''">
- , t.community_id= #{communityId}
- </if>
+
where 1=1
<if test="irId !=null and irId != ''">
and t.ir_id= #{irId}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
</if>
</update>
@@ -118,9 +128,6 @@
select count(1) count
from item_release t
where 1 =1
- <if test="amount !=null and amount != ''">
- and t.amount= #{amount}
- </if>
<if test="applyCompany !=null and applyCompany != ''">
and t.apply_company= #{applyCompany}
</if>
@@ -145,6 +152,12 @@
<if test="irId !=null and irId != ''">
and t.ir_id= #{irId}
</if>
+ <if test="irIds !=null ">
+ and t.ir_id in
+ <foreach collection="irIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="applyTel !=null and applyTel != ''">
and t.apply_tel= #{applyTel}
</if>
@@ -154,6 +167,10 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
+ <if test="createUserId !=null and createUserId != ''">
+ and t.create_user_id= #{createUserId}
+ </if>
+
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
--
Gitblit v1.8.0