查寝记录楼栋id

src/main/java/com/xjrsoft/module/room/dto/RoomBedCheckRecordPageDto.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 
 /**
@@ -30,14 +30,14 @@ public class RoomBedCheckRecordPageDto extends PageInput {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("查寝时间-开始")
     @ApiModelProperty("查寝时间-开始")
-    private Date checkRecordTimeStart;
+    private LocalDateTime checkRecordTimeStart;
     /**
      * 查寝时间-结束
      */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("查寝时间-结束")
     @ApiModelProperty("查寝时间-结束")
-    private Date checkRecordTimeEnd;
+    private LocalDateTime checkRecordTimeEnd;
 
 
 }

src/main/java/com/xjrsoft/module/room/dto/WfRoomStayOvernightPageDto.java

@@ -2,13 +2,12 @@ package com.xjrsoft.module.room.dto;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ContentStyle;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
+import java.time.LocalDate;
 
 
 /**
@@ -48,14 +47,12 @@ public class WfRoomStayOvernightPageDto extends PageInput {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("开始时间")
     @ApiModelProperty("开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date startTime;
+    private LocalDate startTime;
     /**
      * 结束时间
      */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("结束时间")
     @ApiModelProperty("结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date endTime;
+    private LocalDate endTime;
 }

src/main/java/com/xjrsoft/module/room/entity/RoomBedCheckRecordRelation.java

@@ -1,19 +1,11 @@
 package com.xjrsoft.module.room.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.github.yulichang.annotation.EntityMapping;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.io.Serializable;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 import java.util.Date;
 
 
@@ -92,7 +84,7 @@ public class RoomBedCheckRecordRelation implements Serializable {
     * 楼栋(base_office_build)
     */
     @ApiModelProperty("楼栋(base_office_build)")
-    private String officeBuildId;
+    private Long officeBuildId;
     /**
     * 楼层
     */

src/main/java/com/xjrsoft/module/room/service/impl/RoomBedCheckRecordServiceImpl.java

@@ -9,6 +9,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseClass;
+import com.xjrsoft.module.base.entity.BaseOfficeBuild;
 import com.xjrsoft.module.room.dto.RoomBedCheckRecordPageDto;
 import com.xjrsoft.module.room.entity.RoomBedCheckRecord;
 import com.xjrsoft.module.room.entity.RoomBedCheckRecordRelation;
@@ -144,7 +145,9 @@ public class RoomBedCheckRecordServiceImpl extends MPJBaseServiceImpl<RoomBedChe
         MPJLambdaWrapper<RoomBedCheckRecordRelation> queryRelation = new MPJLambdaWrapper<>();
         queryRelation
                 .select(RoomBedCheckRecordRelation::getId)
+                .selectAs(BaseOfficeBuild::getName,RoomBedCheckRecordRelationVo::getOfficeBuildIdCN)
                 .select(RoomBedCheckRecordRelation.class,x -> VoToColumnUtil.fieldsToColumns(RoomBedCheckRecordRelationVo.class).contains(x.getProperty()))
+                .leftJoin(BaseOfficeBuild.class, BaseOfficeBuild::getId, RoomBedCheckRecordRelation::getOfficeBuildId)
                 .eq(RoomBedCheckRecordRelation::getRoomBedCheckRecordId,roomBedCheckRecordVo.getId())
                 .orderByDesc(RoomBedCheckRecordRelation::getId);
         List<RoomBedCheckRecordRelationVo> roomBedCheckRecordRelationVoList = roomBedCheckRecordRoomBedCheckRecordRelationMapper.selectJoinList(RoomBedCheckRecordRelationVo.class, queryRelation);

src/main/java/com/xjrsoft/module/room/vo/RoomBedCheckRecordRelationVo.java

@@ -36,7 +36,12 @@ public class RoomBedCheckRecordRelationVo {
     * 楼栋(base_office_build)
     */
     @ApiModelProperty("楼栋(base_office_build)")
-    private String officeBuildId;
+    private Long officeBuildId;
+    /**
+     * 楼栋(base_office_build)
+     */
+    @ApiModelProperty("楼栋(base_office_build)")
+    private String officeBuildIdCN;
     /**
     * 楼层
     */

src/test/java/com/xjrsoft/module/textbook/service/impl/TextbookServiceImplTest.java

@@ -18,7 +18,7 @@ class TextbookServiceImplTest {
 
     @Test
     void dataHandleAddTextbookNode() {
-        textbookService.dataHandleAddTextbookNode(1742724751068033024L);
+        textbookService.dataHandleAddTextbookNode(1742830195832844288L);
     }
 
     @Test