From f1eac54b518fcfdf4f94811717515b2eb29780fd Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 08 九月 2021 21:12:48 +0800
Subject: [PATCH] 去除开始时间和结束事假
---
java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml | 114 ++++++++++----------------------------------------------
1 files changed, 21 insertions(+), 93 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
index b299091..48aa7cb 100755
--- a/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
@@ -8,10 +8,10 @@
<insert id="saveBusinessRoomInfo" parameterType="Map">
insert into business_building_room(
fee_coefficient,section,remark,user_id,room_id,layer,built_up_area,operate,room_num,unit_id,b_id,apartment,state,community_id,
- room_type,room_sub_type,room_rent,room_area,start_time,end_time
+ room_type,room_sub_type,room_rent,room_area
) values (
#{feeCoefficient},#{section},#{remark},#{userId},#{roomId},#{layer},#{builtUpArea},#{operate},#{roomNum},#{unitId},#{bId},#{apartment},#{state},
- #{communityId},#{roomType},#{roomSubType},#{roomRent},#{roomArea},#{startTime},#{endTime}
+ #{communityId},#{roomType},#{roomSubType},#{roomRent},#{roomArea}
)
</insert>
@@ -24,7 +24,7 @@
roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,t.community_id,t.community_id
communityId,t.room_type,t.room_type roomType,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type
roomSubType,
- t.room_rent roomRent,t.room_area roomArea,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime
+ t.room_rent roomRent,t.room_area roomArea
from business_building_room t
where 1 =1
<if test="feeCoefficient !=null and feeCoefficient != ''">
@@ -75,12 +75,7 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
- <if test="startTime !=null">
- and t.start_time= #{startTime}
- </if>
- <if test="endTime !=null">
- and t.end_time= #{endTime}
- </if>
+
</select>
@@ -88,10 +83,10 @@
<insert id="saveRoomInfoInstance" parameterType="Map">
insert into building_room(
fee_coefficient,section,status_cd,remark,user_id,room_id,layer,built_up_area,room_num,unit_id,b_id,apartment,state,community_id,
- room_type,room_sub_type,room_rent,room_area,start_time,end_time
+ room_type,room_sub_type,room_rent,room_area
) select
t.fee_coefficient,t.section,'0',t.remark,t.user_id,t.room_id,t.layer,t.built_up_area,t.room_num,t.unit_id,t.b_id,t.apartment,t.state,t.community_id,
- t.room_type,t.room_sub_type,t.room_rent,t.room_area,t.start_time,t.end_time
+ t.room_type,t.room_sub_type,t.room_rent,t.room_area
from business_building_room t where 1=1
<if test="feeCoefficient !=null and feeCoefficient != ''">
and t.fee_coefficient= #{feeCoefficient}
@@ -139,12 +134,6 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
- <if test="startTime !=null">
- and t.start_time= #{startTime}
- </if>
- <if test="endTime !=null">
- and t.end_time= #{endTime}
- </if>
</insert>
<!-- 鏌ヨ灏忓尯鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
@@ -153,8 +142,7 @@
statusCd,t.remark,t.user_id,t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area
builtUpArea,t.room_num,t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id
bId,t.apartment,t.state,t.community_id,t.community_id communityId,t.room_type,t.room_type roomType,
- t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea,
- t.start_time,t.start_time startTime,t.end_time,t.end_time endTime
+ t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
from building_room t
where 1 =1
<if test="feeCoefficient !=null and feeCoefficient != ''">
@@ -211,12 +199,7 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
- <if test="startTime !=null">
- and t.start_time= #{startTime}
- </if>
- <if test="endTime !=null">
- and t.end_time= #{endTime}
- </if>
+
order by t.create_time desc
<if test="page != -1 and page != null">
limit #{page},#{row}
@@ -267,12 +250,6 @@
</if>
<if test="roomArea !=null and roomArea != ''">
, t.room_area= #{roomArea}
- </if>
- <if test="startTime !=null">
- , t.start_time= #{startTime}
- </if>
- <if test="endTime !=null">
- , t.end_time= #{endTime}
</if>
where 1=1
<if test="roomId !=null and roomId != ''">
@@ -339,12 +316,7 @@
<if test="roomSubType !=null and roomSubType != ''">
and t.room_sub_type= #{roomSubType}
</if>
- <if test="startTime !=null">
- and t.start_time= #{startTime}
- </if>
- <if test="endTime !=null">
- and t.end_time= #{endTime}
- </if>
+
</select>
<!-- 鏌ヨ灏忓尯鎴垮眿鏁伴噺 add by wuxw 2018-07-03 -->
@@ -418,12 +390,7 @@
<if test="unitNum !=null and unitNum != ''">
and u.unit_num= #{unitNum}
</if>
- <if test="startTime !=null">
- and t.start_time= #{startTime}
- </if>
- <if test="endTime !=null">
- and t.end_time= #{endTime}
- </if>
+
</select>
<!-- 鏌ヨ灏忓尯鎴垮眿鏁伴噺 add by wuxw 2018-07-03 -->
@@ -488,12 +455,6 @@
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
- </if>
- <if test="startTime !=null">
- and t.start_time= #{startTime}
- </if>
- <if test="endTime !=null">
- and t.end_time= #{endTime}
</if>
and borr.`room_id` is null
</select>
@@ -561,12 +522,6 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
- <if test="startTime !=null">
- and t.start_time= #{startTime}
- </if>
- <if test="endTime !=null">
- and t.end_time= #{endTime}
- </if>
AND borr.`room_id` is not null
</select>
@@ -578,7 +533,7 @@
t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num`
unitNum,f.floor_num floorNum
,t.room_type roomType,t.room_type,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type
- roomSubType,t.room_rent roomRent,t.room_area roomArea,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime
+ roomSubType,t.room_rent roomRent,t.room_area roomArea
FROM
building_room t
INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
@@ -638,12 +593,7 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
- <if test="startTime !=null">
- and t.start_time= #{startTime}
- </if>
- <if test="endTime !=null">
- and t.end_time= #{endTime}
- </if>
+
and borr.`room_id` is null
<if test="page != -1 and page != null">
limit #{page},#{row}
@@ -657,7 +607,7 @@
t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum,
t.room_type roomType,t.room_type,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent
- roomRent,t.room_area roomArea,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime
+ roomRent,t.room_area roomArea
FROM
building_room t
INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
@@ -716,12 +666,6 @@
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
- </if>
- <if test="startTime !=null">
- and t.start_time= #{startTime}
- </if>
- <if test="endTime !=null">
- and t.end_time= #{endTime}
</if>
AND borr.`room_id` is not null
<if test="page != -1 and page != null">
@@ -737,8 +681,8 @@
t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum,
u.unit_id unitId,f.floor_id floorId,f.floor_num floorNum,f.floor_area floorArea,u.unit_area unitArea,td.name
stateName,t.room_type roomType,t.room_type,t.`community_id` communityId,td1.`name` roomSubTypeName
- ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea,
- t.start_time,t.start_time startTime,t.end_time,t.end_time endTime
+ ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
+
FROM building_room t
inner join building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
inner JOIN f_floor f on u.`floor_id` = f.`floor_id` AND f.`community_id` = t.`community_id` AND f.`status_cd` =
@@ -822,12 +766,7 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
- <if test="startTime !=null">
- and t.start_time= #{startTime}
- </if>
- <if test="endTime !=null">
- and t.end_time= #{endTime}
- </if>
+
order by f.floor_num ,u.unit_num,t.room_num
<if test="page != -1 and page != null">
limit #{page},#{row}
@@ -842,8 +781,8 @@
t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num`
unitNum,f.`floor_num` floorNum,t.room_type roomType,t.room_type,f.floor_id floorId
- ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea,
- t.start_time,t.start_time startTime,t.end_time ,t.end_time endTime
+ ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
+
FROM
building_owner bo,building_room t,building_owner_room_rel borr,building_unit u,f_floor f
WHERE
@@ -898,12 +837,7 @@
<if test="ownerTypeCd !=null and ownerTypeCd != ''">
and bo.owner_type_cd= #{ownerTypeCd}
</if>
- <if test="startTime !=null">
- and t.start_time= #{startTime}
- </if>
- <if test="endTime !=null">
- and t.end_time= #{endTime}
- </if>
+
</select>
<!-- 鏌ヨ灏忓尯鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
@@ -913,8 +847,8 @@
t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum,
t.room_type roomType,t.room_type,f.floor_num floorNum
- ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea,
- t.start_time,t.start_time startTime,t.end_time,t.end_time endTime
+ ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
+
FROM
building_room t
INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
@@ -956,12 +890,6 @@
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
- </if>
- <if test="startTime !=null">
- and t.start_time= #{startTime}
- </if>
- <if test="endTime !=null">
- and t.end_time= #{endTime}
</if>
<if test="page != -1 and page != null">
limit #{page},#{row}
--
Gitblit v1.8.0