From 093b73aadb022895a02dbbcd64b87613e19b547b Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期一, 10 一月 2022 18:05:21 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/RoomRenovationServiceDaoImplMapper.xml | 96 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 82 insertions(+), 14 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/RoomRenovationServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RoomRenovationServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 7bedb4d..24d7c28
--- a/java110-db/src/main/resources/mapper/community/RoomRenovationServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RoomRenovationServiceDaoImplMapper.xml
@@ -4,25 +4,29 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="roomRenovationServiceDaoImpl">
-
<!-- 淇濆瓨瑁呬慨鐢宠淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveRoomRenovationInfo" parameterType="Map">
- insert into room_renovation(
- remark,is_violation,r_id,room_id,room_name,person_name,violation_desc,start_time,end_time,state,community_id,person_tel
- ) values (
- #{remark},#{isViolation},#{rId},#{roomId},#{roomName},#{personName},#{violationDesc},#{startTime},#{endTime},#{state},#{communityId},#{personTel}
- )
+ insert into room_renovation(remark, is_violation, r_id, room_id, room_name, person_name, violation_desc,
+ start_time, end_time, state, community_id, person_tel, is_postpone, postpone_time,
+ renovation_company, person_main, person_main_tel)
+ values (#{remark}, #{isViolation}, #{rId}, #{roomId}, #{roomName}, #{personName}, #{violationDesc},
+ #{startTime}, #{endTime}, #{state}, #{communityId}, #{personTel}, #{isPostpone}, #{postponeTime},
+ #{renovationCompany}, #{personMain}, #{personMainTel})
</insert>
-
<!-- 鏌ヨ瑁呬慨鐢宠淇℃伅 add by wuxw 2018-07-03 -->
<select id="getRoomRenovationInfo" parameterType="Map" resultType="Map">
select t.status_cd,t.status_cd statusCd,t.remark,t.is_violation,t.is_violation isViolation,t.r_id,t.r_id
rId,t.room_id,t.room_id roomId,t.room_name,t.room_name roomName,t.person_name,t.person_name
personName,t.violation_desc,t.violation_desc violationDesc,t.start_time,t.start_time
- startTime,t.end_time,t.end_time endTime,t.state,t.community_id,t.community_id
- communityId,t.person_tel,t.person_tel personTel
+ startTime,t.end_time,t.end_time endTime,t.state,td.name stateName,t.community_id,t.community_id
+ communityId,t.person_tel,t.person_tel personTel,t.create_time createTime,t.is_postpone,t.is_postpone
+ isPostpone,t.postpone_time,t.postpone_time postponeTime,
+ t.renovation_company,t.renovation_company renovationCompany,t.person_main,t.person_main
+ personMain,t.person_main_tel,t.person_main_tel personMainTel
from room_renovation t
+ left join t_dict td on td.table_name='room_renovation' and td.table_columns='state'
+ and t.state=td.status_cd
where 1 =1
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
@@ -32,6 +36,9 @@
</if>
<if test="isViolation !=null and isViolation != ''">
and t.is_violation= #{isViolation}
+ </if>
+ <if test="isPostpone !=null and isPostpone != ''">
+ and t.is_postpone= #{isPostpone}
</if>
<if test="rId !=null and rId != ''">
and t.r_id= #{rId}
@@ -43,7 +50,7 @@
and t.room_name= #{roomName}
</if>
<if test="personName !=null and personName != ''">
- and t.person_name= #{personName}
+ and t.person_name like '%${personName}%'
</if>
<if test="violationDesc !=null and violationDesc != ''">
and t.violation_desc= #{violationDesc}
@@ -53,6 +60,16 @@
</if>
<if test="endTime !=null and endTime != ''">
and t.end_time= #{endTime}
+ </if>
+ <if test="renovationTime !=null and renovationTime != ''">
+ and t.start_time <= #{renovationTime}
+ and t.end_time >= #{renovationTime}
+ </if>
+ <if test="renovationStartTime !=null and renovationStartTime != ''">
+ and t.create_time >= #{renovationStartTime}
+ </if>
+ <if test="renovationEndTime !=null and renovationEndTime != ''">
+ and t.create_time <= #{renovationEndTime}
</if>
<if test="state !=null and state != ''">
and t.state= #{state}
@@ -67,7 +84,6 @@
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
@@ -110,11 +126,40 @@
<if test="personTel !=null and personTel != ''">
, t.person_tel= #{personTel}
</if>
+ <if test="examineRemark != null and examineRemark != ''">
+ , t.examineRemark = #{examineRemark}
+ </if>
+ <if test="isPostpone != null and isPostpone != ''">
+ , t.is_postpone = #{isPostpone}
+ </if>
+ <if test="postponeTime != null and postponeTime != ''">
+ , t.postpone_time = #{postponeTime}
+ </if>
+ <if test="renovationCompany != null and renovationCompany != ''">
+ , t.renovation_company = #{renovationCompany}
+ </if>
+ <if test="personMain != null and personMain != ''">
+ , t.person_main = #{personMain}
+ </if>
+ <if test="personMainTel != null and personMainTel != ''">
+ , t.person_main_tel = #{personMainTel}
+ </if>
where 1=1
<if test="rId !=null and rId != ''">
and t.r_id= #{rId}
</if>
+ </update>
+ <!-- 淇敼瑁呬慨鐢宠淇℃伅 add by wuxw 2018-07-03 -->
+ <update id="updateRoom" parameterType="Map">
+ update building_room t set t.status_cd = #{statusCd}
+ <if test="state !=null and state != ''">
+ , t.state= #{state}
+ </if>
+ where 1=1
+ <if test="roomId !=null and roomId != ''">
+ and t.room_id= #{roomId}
+ </if>
</update>
<!-- 鏌ヨ瑁呬慨鐢宠鏁伴噺 add by wuxw 2018-07-03 -->
@@ -141,7 +186,7 @@
and t.room_name= #{roomName}
</if>
<if test="personName !=null and personName != ''">
- and t.person_name= #{personName}
+ and t.person_name like '%${personName}%'
</if>
<if test="violationDesc !=null and violationDesc != ''">
and t.violation_desc= #{violationDesc}
@@ -152,6 +197,16 @@
<if test="endTime !=null and endTime != ''">
and t.end_time= #{endTime}
</if>
+ <if test="renovationTime !=null and renovationTime != ''">
+ and t.start_time <= #{renovationTime}
+ and t.end_time >= #{renovationTime}
+ </if>
+ <if test="renovationStartTime !=null and renovationStartTime != ''">
+ and t.create_time >= #{renovationStartTime}
+ </if>
+ <if test="renovationEndTime !=null and renovationEndTime != ''">
+ and t.create_time <= #{renovationEndTime}
+ </if>
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
@@ -161,8 +216,21 @@
<if test="personTel !=null and personTel != ''">
and t.person_tel= #{personTel}
</if>
-
-
+ <if test="isPostpone != null and isPostpone != ''">
+ and t.is_postpone = #{isPostpone}
+ </if>
+ <if test="postponeTime != null and postponeTime != ''">
+ and t.postpone_time = #{postponeTime}
+ </if>
+ <if test="renovationCompany != null and renovationCompany != ''">
+ and t.renovation_company = #{renovationCompany}
+ </if>
+ <if test="personMain != null and personMain != ''">
+ and t.person_main = #{personMain}
+ </if>
+ <if test="personMainTel != null and personMainTel != ''">
+ and t.person_main_tel = #{personMainTel}
+ </if>
</select>
</mapper>
--
Gitblit v1.8.0