户室开锁记录

pro-base/src/main/java/com/idea/buildManage/controller/ParkRoomReservationController.java

@@ -57,7 +57,7 @@ public class ParkRoomReservationController extends BaseController {
     @PostMapping(value = "completeListPage",produces = {"application/json;charset=UTF-8"})
     public Object completeListPage(Tablepar tablepar, ParkRoomReservationDto model){
         model.setReservationStatus(4);
-        PageInfo<ParkRoomReservation> page = modelService.listPage(tablepar,model);
+        PageInfo<ParkRoomReservation> page = modelService.completeListPage(tablepar,model);
         return new TableSplitResult<>(page.getPageNum(), page.getTotal(), page.getList());
     }
 
@@ -158,7 +158,7 @@ public class ParkRoomReservationController extends BaseController {
         List<ParkRoomReservationExcel> excelList = new ArrayList<>();
         try{
             model.setReservationStatus(4);
-            list = modelService.listPageAll(model);
+            list = modelService.completeListPageAll(model);
             if(CollectionUtils.isNotEmpty(list)){
                 for (ParkRoomReservation reservation : list) {
                     ParkRoomReservationExcel excel = new ParkRoomReservationExcel();

pro-base/src/main/java/com/idea/buildManage/mapper/ParkRoomReservationExtendMapper.java

@@ -11,6 +11,8 @@ public interface ParkRoomReservationExtendMapper {
 
     List<ParkRoomReservation> listPage(ParkRoomReservationDto dto);
 
+    List<ParkRoomReservation> completeListPage(ParkRoomReservationDto dto);
+
     List<ParkRoomVo> roomListPage(RoomSearchDto dto);
 
 }

pro-base/src/main/java/com/idea/buildManage/service/MnpBuildingService.java

@@ -83,6 +83,7 @@ public class MnpBuildingService implements BaseService<MnpBuilding, MnpBuildingE
 
     private MnpBuildingExample getCondition(MnpBuilding model, DateTrans dt) {
         MnpBuildingExample ex = new MnpBuildingExample();
+        ex.setOrderByClause("build_num + 0");
         MnpBuildingExample.Criteria criteria = ex.createCriteria();
         criteria.andDelFlagEqualTo("0");
         if (StringUtils.isNotEmpty(model.getGroupId())) {

pro-base/src/main/java/com/idea/buildManage/service/ParkRoomReservationService.java

@@ -55,8 +55,14 @@ public class ParkRoomReservationService implements BaseService<ParkRoomReservati
         return new PageInfo<>(list);
     }
 
-    public List<ParkRoomReservation> listPageAll(ParkRoomReservationDto model) {
-        return parkRoomReservationExtendMapper.listPage(model);
+    public PageInfo<ParkRoomReservation> completeListPage(Tablepar tablepar, ParkRoomReservationDto model) {
+        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+        List<ParkRoomReservation> list = parkRoomReservationExtendMapper.completeListPage(model);
+        return new PageInfo<>(list);
+    }
+
+    public List<ParkRoomReservation> completeListPageAll(ParkRoomReservationDto model) {
+        return parkRoomReservationExtendMapper.completeListPage(model);
     }
 
     public PageInfo<ParkRoomVo> roomListPage(Tablepar tablepar, RoomSearchDto model) {

pro-base/src/main/resources/mybatis/buildManage/ParkRoomReservationExtendMapper.xml

@@ -79,6 +79,84 @@
         order by create_time desc
     </select>
 
+    <select id="completeListPage" parameterType="com.idea.buildManage.dto.ParkRoomReservationDto"
+            resultType="com.idea.buildManage.model.ParkRoomReservation">
+        select a.id,
+        a.park_info_id,
+        a.park_info_name,
+        a.park_floor_disc_id,
+        a.park_floor_disc_name,
+        a.mnp_building_id,
+        a.mnp_building_no,
+        a.park_room_id,
+        a.park_room_floor,
+        a.park_room_no,
+        a.buyer_name,
+        a.buyer_phone,
+        a.buyer_gender,
+        a.buyer_address,
+        a.applicant_name,
+        a.applicant_phone,
+        a.overview_content,
+        a.reservation_date,
+        a.reservation_time_start,
+        a.reservation_time_end,
+        a.reservation_order,
+        a.reservation_status,
+        case a.reservation_status
+        when 1 then '已预约'
+        when 2 then '已取消'
+        when 3 then '待入户'
+        when 4 then '已完成'
+        end as reservationStatusStr,
+        a.door_pass_status,
+        case a.door_pass_status
+        when 1 then '未发'
+        when 2 then '已发'
+        end as doorPassStatusStr,
+        a.create_user,
+        a.create_time,
+        a.update_user,
+        a.update_time,
+        a.looking_notes,
+        b.truename as createUserName,
+        if(c.id is not null, '已匹配', '未匹配') as doorStatus
+        from park_room_reservation a
+        left join frame_user b on b.id = a.create_user
+        left join park_room_bind_door c on c.park_room_id = a.park_room_id
+        <where>
+            <if test="keyword!=null and keyword!=''">
+                and (
+                a.buyer_name like concat('%',#{keyword},'%')
+                or
+                a.buyer_phone like concat('%',#{keyword},'%')
+                )
+            </if>
+            <if test="createTimeStart!=null and createTimeStart!=''">
+                and date_format(a.create_time, '%Y-%m-%d') &gt;= #{createTimeStart}
+            </if>
+            <if test="createTimeEnd!=null and createTimeEnd!=''">
+                and date_format(a.create_time, '%Y-%m-%d') &lt;= #{createTimeEnd}
+            </if>
+            <if test="reservationStatus!=null">
+                and a.reservation_status= #{reservationStatus}
+            </if>
+            <if test="parkInfoId!=null and parkInfoId!=''">
+                and a.park_info_id = #{parkInfoId}
+            </if>
+            <if test="mnpBuildingId!=null and mnpBuildingId!=''">
+                and a.mnp_building_id = #{mnpBuildingId}
+            </if>
+            <if test="parkRoomNo!=null and parkRoomNo!=''">
+                and a.park_room_no like concat('%',#{parkRoomNo},'%')
+            </if>
+            <if test="roomAddress!=null and roomAddress!=''">
+                and concat(a.park_info_name, a.park_floor_disc_name, a.mnp_building_no, '号', a.park_room_no, '室') like concat('%',#{roomAddress},'%')
+            </if>
+        </where>
+        order by park_info_name, mnp_building_no + 0, park_room_no + 0, reservation_date desc
+    </select>
+
     <select id="roomListPage" parameterType="com.idea.buildManage.dto.RoomSearchDto"
             resultType="com.idea.buildManage.vo.ParkRoomVo">
         select a.id, a.group_id, a.group_name, a.disc_id, a.disc_name, a.build_id, a.build_name, a.floor, a.room_no,