去除开始时间和结束事假

java110-bean/src/main/java/com/java110/dto/RoomDto.java

@@ -71,8 +71,6 @@ public class RoomDto extends PageDto implements Serializable {
 
     private Date createTime;
 
-    private String startTime;
-    private String endTime;
 
     private String statusCd = "0";
 
@@ -366,19 +364,5 @@ public class RoomDto extends PageDto implements Serializable {
         this.roomSubTypeName = roomSubTypeName;
     }
 
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
 
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
 }

java110-bean/src/main/java/com/java110/po/room/RoomPo.java

@@ -30,8 +30,6 @@ public class RoomPo implements Serializable {
     private String roomSubType;
     private String roomRent;
     private String roomArea;
-    private String startTime;
-    private String endTime;
 
     public String getRoomId() {
         return roomId;
@@ -169,19 +167,4 @@ public class RoomPo implements Serializable {
         this.roomArea = roomArea;
     }
 
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
 }

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}
@@ -268,12 +251,6 @@
         <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 != ''">
             and t.room_id= #{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 -->
@@ -489,12 +456,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 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'
@@ -717,12 +667,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
         <if test="page != -1 and page != null">
             limit #{page},#{row}
@@ -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'
@@ -957,12 +891,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>
         <if test="page != -1 and page != null">
             limit #{page},#{row}
         </if>

service-community/src/main/java/com/java110/community/listener/room/AbstractRoomBusinessServiceDataFlowListener.java

@@ -54,8 +54,6 @@ public abstract class AbstractRoomBusinessServiceDataFlowListener extends Abstra
         businessRoomInfo.put("roomSubType", businessRoomInfo.get("room_sub_type"));
         businessRoomInfo.put("roomRent", businessRoomInfo.get("room_rent"));
         businessRoomInfo.put("roomArea", businessRoomInfo.get("room_area"));
-        businessRoomInfo.put("startTime", businessRoomInfo.get("start_time"));
-        businessRoomInfo.put("endTime", businessRoomInfo.get("end_time"));
         businessRoomInfo.remove("bId");
         businessRoomInfo.put("statusCd", statusCd);
     }
@@ -97,8 +95,6 @@ public abstract class AbstractRoomBusinessServiceDataFlowListener extends Abstra
         currentRoomInfo.put("roomSubType", currentRoomInfo.get("room_sub_type"));
         currentRoomInfo.put("roomRent", currentRoomInfo.get("room_rent"));
         currentRoomInfo.put("roomArea", currentRoomInfo.get("room_area"));
-        currentRoomInfo.put("startTime", currentRoomInfo.get("start_time"));
-        currentRoomInfo.put("endTime", currentRoomInfo.get("end_time"));
 
         currentRoomInfo.put("operate", StatusConstant.OPERATE_DEL);
         getRoomServiceDaoImpl().saveBusinessRoomInfo(currentRoomInfo);