新闻增添阅读关系

src/main/java/com/xjrsoft/module/oa/controller/NewsController.java

@@ -90,7 +90,7 @@ public class NewsController {
 
     @PostMapping
     @ApiOperation(value = "新增新闻")
-    public RT<Long> add(@RequestBody AddNewsDto addNewsDto) {
+    public RT<Boolean> add(@RequestBody AddNewsDto addNewsDto) {
         return RT.ok(newsService.add(addNewsDto));
     }
 

src/main/java/com/xjrsoft/module/oa/dto/AddNewsRelationDto.java

@@ -12,6 +12,6 @@ public class AddNewsRelationDto {
     @ApiModelProperty("关系ID")
     private Long relationId;
 
-    @ApiModelProperty("新闻主键")
-    private Long newsId;
+//    @ApiModelProperty("新闻主键")
+//    private Long newsId;
 }

src/main/java/com/xjrsoft/module/oa/service/INewsService.java

@@ -23,7 +23,7 @@ public interface INewsService extends MPJBaseService<News> {
      * @param addNewsDto
      * @return
      */
-    Long add(AddNewsDto addNewsDto);
+    Boolean add(AddNewsDto addNewsDto);
 
     /**
      * 获取新闻分页

src/main/java/com/xjrsoft/module/oa/service/impl/NewsServiceImpl.java

@@ -80,7 +80,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Long add(AddNewsDto addNewsDto) {
+    public Boolean add(AddNewsDto addNewsDto) {
 
         News news = BeanUtil.toBean(addNewsDto, News.class);
         news.setEnabledMark(EnabledMark.ENABLED.getCode());
@@ -136,7 +136,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
             SendMessage(news.getId());
         }
 
-        return news.getId();
+        return true;
     }
 
     @Override

src/main/java/com/xjrsoft/module/room/controller/RoomBedCheckRecordController.java

@@ -0,0 +1,101 @@
+package com.xjrsoft.module.room.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.module.room.dto.AddRoomBedCheckRecordDto;
+import com.xjrsoft.module.room.dto.RoomBedCheckRecordPageDto;
+import com.xjrsoft.module.room.dto.UpdateRoomBedCheckRecordDto;
+import com.xjrsoft.module.room.entity.RoomBedCheckRecord;
+import com.xjrsoft.module.room.service.IRoomBedCheckRecordService;
+import com.xjrsoft.module.room.vo.RoomBedCheckRecordPageVo;
+import com.xjrsoft.module.room.vo.RoomBedCheckRecordVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+* @title: 查寝记录
+* @Author szs
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/room" + "/roomBedCheckRecord")
+@Api(value = "/room"  + "/roomBedCheckRecord",tags = "查寝记录代码")
+@AllArgsConstructor
+public class RoomBedCheckRecordController {
+
+
+    private final IRoomBedCheckRecordService roomBedCheckRecordService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="查寝记录列表(分页)")
+    @SaCheckPermission("roombedcheckrecord:detail")
+    public RT<PageOutput<RoomBedCheckRecordPageVo>> page(@Valid RoomBedCheckRecordPageDto dto){
+        IPage<RoomBedCheckRecord> page = roomBedCheckRecordService.getPage(dto);
+        PageOutput<RoomBedCheckRecordPageVo> pageOutput = ConventPage.getPageOutput(page, RoomBedCheckRecordPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询查寝记录信息")
+    @SaCheckPermission("roombedcheckrecord:detail")
+    public RT<RoomBedCheckRecordVo> info(@RequestParam Long id){
+        RoomBedCheckRecord roomBedCheckRecord = roomBedCheckRecordService.getByIdDeep(id);
+        if (roomBedCheckRecord == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(roomBedCheckRecord, RoomBedCheckRecordVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增查寝记录")
+    @SaCheckPermission("roombedcheckrecord:add")
+    public RT<Boolean> add(@Valid @RequestBody AddRoomBedCheckRecordDto dto){
+        RoomBedCheckRecord roomBedCheckRecord = BeanUtil.toBean(dto, RoomBedCheckRecord.class);
+        boolean isSuccess = roomBedCheckRecordService.add(roomBedCheckRecord);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改查寝记录")
+    @SaCheckPermission("roombedcheckrecord:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateRoomBedCheckRecordDto dto){
+
+        RoomBedCheckRecord roomBedCheckRecord = BeanUtil.toBean(dto, RoomBedCheckRecord.class);
+        return RT.ok(roomBedCheckRecordService.update(roomBedCheckRecord));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除查寝记录")
+    @SaCheckPermission("roombedcheckrecord:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(roomBedCheckRecordService.delete(ids));
+
+    }
+
+    @GetMapping("/export")
+    @ApiOperation(value = "导出")
+    public ResponseEntity<byte[]> exportData(@Valid RoomBedCheckRecordPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
+        List<RoomBedCheckRecordPageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput<RoomBedCheckRecordPageVo>) page(dto).getData()).getList();
+        ByteArrayOutputStream bot = new ByteArrayOutputStream();
+        EasyExcel.write(bot, RoomBedCheckRecordPageVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList);
+
+        return RT.fileStream(bot.toByteArray(), "RoomBedCheckRecord" + ExcelTypeEnum.XLSX.getValue());
+    }
+}

src/main/java/com/xjrsoft/module/room/controller/WfRoomStayOvernightController.java

@@ -1,39 +1,33 @@
 package com.xjrsoft.module.room.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.xjrsoft.common.constant.GlobalConstant;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.room.dto.AddWfRoomStayOvernightDto;
 import com.xjrsoft.module.room.dto.UpdateWfRoomStayOvernightDto;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.support.ExcelTypeEnum;
-import org.springframework.http.ResponseEntity;
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-
 import com.xjrsoft.module.room.dto.WfRoomStayOvernightPageDto;
 import com.xjrsoft.module.room.entity.WfRoomStayOvernight;
 import com.xjrsoft.module.room.service.IWfRoomStayOvernightService;
 import com.xjrsoft.module.room.vo.WfRoomStayOvernightPageVo;
-
 import com.xjrsoft.module.room.vo.WfRoomStayOvernightVo;
+import com.xjrsoft.module.teacher.entity.XjrUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -55,12 +49,22 @@ public class WfRoomStayOvernightController {
     @ApiOperation(value="留校住宿申请列表(分页)")
     @SaCheckPermission("wfroomstayovernight:detail")
     public RT<PageOutput<WfRoomStayOvernightPageVo>> page(@Valid WfRoomStayOvernightPageDto dto){
-
-        LambdaQueryWrapper<WfRoomStayOvernight> queryWrapper = new LambdaQueryWrapper<>();
+        MPJLambdaWrapper<WfRoomStayOvernight> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
-                    .orderByDesc(WfRoomStayOvernight::getId)
+                .disableSubLogicDel()
+                .like(ObjectUtil.isNotNull(dto.getClassName()),WfRoomStayOvernight::getClassName,dto.getClassName())
+                .like(ObjectUtil.isNotNull(dto.getGenderName()),WfRoomStayOvernight::getGenderName,dto.getGenderName())
+                .like(ObjectUtil.isNotNull(dto.getStudentId()),WfRoomStayOvernight::getStudentId,dto.getStudentId())
+                .ge(ObjectUtil.isNotNull(dto.getStartTime()),WfRoomStayOvernight::getStartTime,dto.getStartTime())
+                .le(ObjectUtil.isNotNull(dto.getEndTime()),WfRoomStayOvernight::getEndTime,dto.getEndTime())
+                .leftJoin(XjrUser.class,XjrUser::getId,WfRoomStayOvernight::getApplicantUserId,ext1->ext1
+                        .selectAs(XjrUser::getName,WfRoomStayOvernightPageVo::getApplicantUserIdCN))
+                .leftJoin(XjrUser.class,XjrUser::getId,WfRoomStayOvernight::getHeadTeacherId,ext2->ext2
+                        .selectAs(XjrUser::getName,WfRoomStayOvernightPageVo::getHeadTeacherIdCN))
+                .orderByDesc(WfRoomStayOvernight::getId)
+                .select(WfRoomStayOvernight::getId)
                 .select(WfRoomStayOvernight.class,x -> VoToColumnUtil.fieldsToColumns(WfRoomStayOvernightPageVo.class).contains(x.getProperty()));
-        IPage<WfRoomStayOvernight> page = wfRoomStayOvernightService.page(ConventPage.getPage(dto), queryWrapper);
+        IPage<WfRoomStayOvernightPageVo> page = wfRoomStayOvernightService.selectJoinListPage(ConventPage.getPage(dto), WfRoomStayOvernightPageVo.class, queryWrapper);
         PageOutput<WfRoomStayOvernightPageVo> pageOutput = ConventPage.getPageOutput(page, WfRoomStayOvernightPageVo.class);
         return RT.ok(pageOutput);
     }

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

@@ -0,0 +1,69 @@
+package com.xjrsoft.module.room.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+import com.xjrsoft.module.room.entity.RoomBedCheckRecordRelation;
+
+
+
+/**
+* @title: 查寝记录
+* @Author szs
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Data
+public class AddRoomBedCheckRecordDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 填写人
+    */
+    @ApiModelProperty("填写人")
+    private Long userId;
+    /**
+    * 班级编号
+    */
+    @ApiModelProperty("班级编号")
+    private Long classId;
+    /**
+    * 查寝时间
+    */
+    @ApiModelProperty("查寝时间")
+    private Date checkRecordTime;
+    /**
+    * 情况
+    */
+    @ApiModelProperty("情况")
+    private String condition;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+    * 附件文件id
+    */
+    @ApiModelProperty("附件文件id")
+    private Long fileId;
+
+    /**
+    * roomBedCheckRecordRelation
+    */
+    @ApiModelProperty("roomBedCheckRecordRelation子表")
+    private List<AddRoomBedCheckRecordRelationDto> roomBedCheckRecordRelationList;
+}

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

@@ -0,0 +1,58 @@
+package com.xjrsoft.module.room.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 查寝记录(关联寝室)
+* @Author szs
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Data
+public class AddRoomBedCheckRecordRelationDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 查寝记录编号（room_bed_check_record）
+    */
+    @ApiModelProperty("查寝记录编号（room_bed_check_record）")
+    private Long roomBedCheckRecordId;
+    /**
+    * 寝室编号(room)
+    */
+    @ApiModelProperty("寝室编号(room)")
+    private Long roomId;
+    /**
+    * 楼栋(base_office_build)
+    */
+    @ApiModelProperty("楼栋(base_office_build)")
+    private String officeBuildId;
+    /**
+    * 楼层
+    */
+    @ApiModelProperty("楼层")
+    private Integer floorNumber;
+    /**
+    * 寝室名称
+    */
+    @ApiModelProperty("寝室名称")
+    private String roomName;
+
+}

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

@@ -0,0 +1,18 @@
+package com.xjrsoft.module.room.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 查寝记录分页查询入参
+* @Author szs
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class RoomBedCheckRecordPageDto extends PageInput {
+
+}

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

@@ -0,0 +1,33 @@
+package com.xjrsoft.module.room.dto;
+
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import java.util.Date;
+import com.xjrsoft.module.room.entity.RoomBedCheckRecordRelation;
+
+
+
+/**
+* @title: 查寝记录
+* @Author szs
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Data
+public class UpdateRoomBedCheckRecordDto extends AddRoomBedCheckRecordDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

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

@@ -1,14 +1,12 @@
 package com.xjrsoft.module.room.dto;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
 import java.util.Date;
 
 
@@ -22,5 +20,39 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = false)
 public class WfRoomStayOvernightPageDto extends PageInput {
 
-
+    /**
+     * 班级
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("班级")
+    @ApiModelProperty("班级")
+    private String className;
+    /**
+     * 学号
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学号")
+    @ApiModelProperty("学号")
+    private String studentId;
+    /**
+     * 性别
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("性别")
+    @ApiModelProperty("性别")
+    private String genderName;
+    /**
+     * 开始时间
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("开始时间")
+    @ApiModelProperty("开始时间")
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("结束时间")
+    @ApiModelProperty("结束时间")
+    private Date endTime;
 }

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

@@ -0,0 +1,120 @@
+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 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;
+
+
+/**
+* @title: 查寝记录
+* @Author szs
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Data
+@TableName("room_bed_check_record")
+@ApiModel(value = "room_bed_check_record", description = "查寝记录")
+public class RoomBedCheckRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 填写人
+    */
+    @ApiModelProperty("填写人")
+    private Long userId;
+    /**
+    * 班级编号
+    */
+    @ApiModelProperty("班级编号")
+    private Long classId;
+    /**
+    * 查寝时间
+    */
+    @ApiModelProperty("查寝时间")
+    private Date checkRecordTime;
+    /**
+    * 情况
+    */
+    @ApiModelProperty("情况")
+    private String condition;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+    * 附件文件id
+    */
+    @ApiModelProperty("附件文件id")
+    private Long fileId;
+
+    /**
+    * roomBedCheckRecordRelation
+    */
+    @ApiModelProperty("roomBedCheckRecordRelation子表")
+    @TableField(exist = false)
+    @EntityMapping(thisField = "id", joinField = "roomBedCheckRecordId")
+    private List<RoomBedCheckRecordRelation> roomBedCheckRecordRelationList;
+
+}

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

@@ -0,0 +1,108 @@
+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 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;
+
+
+/**
+* @title: 查寝记录(关联寝室)
+* @Author szs
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Data
+@TableName("room_bed_check_record_relation")
+@ApiModel(value = "room_bed_check_record_relation", description = "查寝记录(关联寝室)")
+public class RoomBedCheckRecordRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 查寝记录编号（room_bed_check_record）
+    */
+    @ApiModelProperty("查寝记录编号（room_bed_check_record）")
+    private Long roomBedCheckRecordId;
+    /**
+    * 寝室编号(room)
+    */
+    @ApiModelProperty("寝室编号(room)")
+    private Long roomId;
+    /**
+    * 楼栋(base_office_build)
+    */
+    @ApiModelProperty("楼栋(base_office_build)")
+    private String officeBuildId;
+    /**
+    * 楼层
+    */
+    @ApiModelProperty("楼层")
+    private Integer floorNumber;
+    /**
+    * 寝室名称
+    */
+    @ApiModelProperty("寝室名称")
+    private String roomName;
+
+
+}

src/main/java/com/xjrsoft/module/room/mapper/RoomBedCheckRecordMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.room.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.room.entity.RoomBedCheckRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 查寝记录
+* @Author szs
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Mapper
+public interface RoomBedCheckRecordMapper extends MPJBaseMapper<RoomBedCheckRecord> {
+
+}

src/main/java/com/xjrsoft/module/room/mapper/RoomBedCheckRecordRelationMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.room.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.room.entity.RoomBedCheckRecordRelation;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 查寝记录(关联寝室)
+* @Author szs
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Mapper
+public interface RoomBedCheckRecordRelationMapper extends MPJBaseMapper<RoomBedCheckRecordRelation> {
+
+}

src/main/java/com/xjrsoft/module/room/service/IRoomBedCheckRecordService.java

@@ -0,0 +1,48 @@
+package com.xjrsoft.module.room.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.room.dto.RoomBedCheckRecordPageDto;
+import com.xjrsoft.module.room.entity.RoomBedCheckRecord;
+
+import java.util.List;
+
+/**
+* @title: 查寝记录
+* @Author szs
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+
+public interface IRoomBedCheckRecordService extends MPJBaseService<RoomBedCheckRecord> {
+    /**
+    * 新增
+    *
+    * @param roomBedCheckRecord
+    * @return
+    */
+    Boolean add(RoomBedCheckRecord roomBedCheckRecord);
+
+    /**
+    * 更新
+    *
+    * @param roomBedCheckRecord
+    * @return
+    */
+    Boolean update(RoomBedCheckRecord roomBedCheckRecord);
+
+    /**
+    * 删除
+    *
+    * @param ids
+    * @return
+    */
+    Boolean delete(List<Long> ids);
+
+    /**
+     * 获取分页
+     * @param dto
+     * @return
+     */
+    IPage<RoomBedCheckRecord> getPage(RoomBedCheckRecordPageDto dto);
+}

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

@@ -0,0 +1,109 @@
+package com.xjrsoft.module.room.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.room.dto.RoomBedCheckRecordPageDto;
+import com.xjrsoft.module.room.entity.RoomBedCheckRecord;
+import com.xjrsoft.module.room.entity.RoomBedCheckRecordRelation;
+import com.xjrsoft.module.room.mapper.RoomBedCheckRecordMapper;
+import com.xjrsoft.module.room.mapper.RoomBedCheckRecordRelationMapper;
+import com.xjrsoft.module.room.service.IRoomBedCheckRecordService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+* @title: 查寝记录
+* @Author szs
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class RoomBedCheckRecordServiceImpl extends MPJBaseServiceImpl<RoomBedCheckRecordMapper, RoomBedCheckRecord> implements IRoomBedCheckRecordService {
+    private final RoomBedCheckRecordMapper roomBedCheckRecordRoomBedCheckRecordMapper;
+
+    private final RoomBedCheckRecordRelationMapper roomBedCheckRecordRoomBedCheckRecordRelationMapper;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean add(RoomBedCheckRecord roomBedCheckRecord) {
+        roomBedCheckRecordRoomBedCheckRecordMapper.insert(roomBedCheckRecord);
+        for (RoomBedCheckRecordRelation roomBedCheckRecordRelation : roomBedCheckRecord.getRoomBedCheckRecordRelationList()) {
+            roomBedCheckRecordRelation.setRoomBedCheckRecordId(roomBedCheckRecord.getId());
+            roomBedCheckRecordRoomBedCheckRecordRelationMapper.insert(roomBedCheckRecordRelation);
+        }
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean update(RoomBedCheckRecord roomBedCheckRecord) {
+        roomBedCheckRecordRoomBedCheckRecordMapper.updateById(roomBedCheckRecord);
+        //********************************* RoomBedCheckRecordRelation  增删改  开始 *******************************************/
+        {
+            // 查出所有子级的id
+            List<RoomBedCheckRecordRelation> roomBedCheckRecordRelationList = roomBedCheckRecordRoomBedCheckRecordRelationMapper.selectList(Wrappers.lambdaQuery(RoomBedCheckRecordRelation.class).eq(RoomBedCheckRecordRelation::getRoomBedCheckRecordId, roomBedCheckRecord.getId()).select(RoomBedCheckRecordRelation::getId));
+            List<Long> roomBedCheckRecordRelationIds = roomBedCheckRecordRelationList.stream().map(RoomBedCheckRecordRelation::getId).collect(Collectors.toList());
+            //原有子表单 没有被删除的主键
+            List<Long> roomBedCheckRecordRelationOldIds = roomBedCheckRecord.getRoomBedCheckRecordRelationList().stream().map(RoomBedCheckRecordRelation::getId).filter(Objects::nonNull).collect(Collectors.toList());
+            //找到需要删除的id
+            List<Long> roomBedCheckRecordRelationRemoveIds = roomBedCheckRecordRelationIds.stream().filter(item -> !roomBedCheckRecordRelationOldIds.contains(item)).collect(Collectors.toList());
+
+            for (RoomBedCheckRecordRelation roomBedCheckRecordRelation : roomBedCheckRecord.getRoomBedCheckRecordRelationList()) {
+                //如果不等于空则修改
+                if (roomBedCheckRecordRelation.getId() != null) {
+                    roomBedCheckRecordRoomBedCheckRecordRelationMapper.updateById(roomBedCheckRecordRelation);
+                }
+                //如果等于空 则新增
+                else {
+                    //已经不存在的id 删除
+                    roomBedCheckRecordRelation.setRoomBedCheckRecordId(roomBedCheckRecord.getId());
+                    roomBedCheckRecordRoomBedCheckRecordRelationMapper.insert(roomBedCheckRecordRelation);
+                }
+            }
+            //已经不存在的id 删除
+            if(roomBedCheckRecordRelationRemoveIds.size() > 0){
+                roomBedCheckRecordRoomBedCheckRecordRelationMapper.deleteBatchIds(roomBedCheckRecordRelationRemoveIds);
+            }
+        }
+        //********************************* RoomBedCheckRecordRelation  增删改  结束 *******************************************/
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(List<Long> ids) {
+        roomBedCheckRecordRoomBedCheckRecordMapper.deleteBatchIds(ids);
+        roomBedCheckRecordRoomBedCheckRecordRelationMapper.delete(Wrappers.lambdaQuery(RoomBedCheckRecordRelation.class).in(RoomBedCheckRecordRelation::getRoomBedCheckRecordId, ids));
+
+        return true;
+    }
+
+    @Override
+    public IPage<RoomBedCheckRecord> getPage(RoomBedCheckRecordPageDto dto) {
+        //查询当前用户的班级
+//        LambdaQueryWrapper<BaseClass> queryWrapper = new LambdaQueryWrapper<>();
+//        queryWrapper
+//                .eq(BaseClass::getTeacherId, StpUtil.getLoginIdAsLong())
+//                .orderByDesc(BaseClass::getId);
+//        BaseClass
+//
+//        MPJLambdaWrapper<RoomBedCheckRecord> query = new MPJLambdaWrapper<>();
+//
+//        LambdaQueryWrapper<RoomBedCheckRecord> queryWrapper = new LambdaQueryWrapper<>();
+//        queryWrapper
+//                .orderByDesc(RoomBedCheckRecord::getId)
+//                .select(RoomBedCheckRecord.class,x -> VoToColumnUtil.fieldsToColumns(RoomBedCheckRecordPageVo.class).contains(x.getProperty()));
+        //IPage<RoomBedCheckRecord> page = this.getPage(ConventPage.getPage(dto), queryWrapper);
+        return null;
+    }
+}

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

@@ -0,0 +1,81 @@
+package com.xjrsoft.module.room.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.github.yulichang.annotation.EntityMapping;
+import com.xjrsoft.module.room.entity.RoomBedCheckRecordRelation;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+* @title: 查寝记录分页列表出参
+* @Author szs
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Data
+public class RoomBedCheckRecordPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("主键编号")
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 填写人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("填写人")
+    @ApiModelProperty("填写人")
+    private Long userId;
+    /**
+    * 班级编号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("班级编号")
+    @ApiModelProperty("班级编号")
+    private Long classId;
+    /**
+    * 查寝时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("查寝时间")
+    @ApiModelProperty("查寝时间")
+    private Date checkRecordTime;
+    /**
+    * 情况
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("情况")
+    @ApiModelProperty("情况")
+    private String condition;
+    /**
+    * 备注
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("备注")
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+    * 附件文件id
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("附件文件id")
+    @ApiModelProperty("附件文件id")
+    private Long fileId;
+
+    /**
+     * roomBedCheckRecordRelation
+     */
+    @ApiModelProperty("roomBedCheckRecordRelation子表")
+    @TableField(exist = false)
+    @EntityMapping(thisField = "id", joinField = "roomBedCheckRecordId")
+    private List<RoomBedCheckRecordRelation> roomBedCheckRecordRelationList;
+
+}

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

@@ -0,0 +1,59 @@
+package com.xjrsoft.module.room.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: 查寝记录(关联寝室)表单出参
+* @Author szs
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Data
+public class RoomBedCheckRecordRelationVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 查寝记录编号（room_bed_check_record）
+    */
+    @ApiModelProperty("查寝记录编号（room_bed_check_record）")
+    private Long roomBedCheckRecordId;
+    /**
+    * 寝室编号(room)
+    */
+    @ApiModelProperty("寝室编号(room)")
+    private Long roomId;
+    /**
+    * 楼栋(base_office_build)
+    */
+    @ApiModelProperty("楼栋(base_office_build)")
+    private String officeBuildId;
+    /**
+    * 楼层
+    */
+    @ApiModelProperty("楼层")
+    private Integer floorNumber;
+    /**
+    * 寝室名称
+    */
+    @ApiModelProperty("寝室名称")
+    private String roomName;
+
+
+
+}

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

@@ -0,0 +1,70 @@
+package com.xjrsoft.module.room.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+import com.xjrsoft.module.room.entity.RoomBedCheckRecordRelation;
+
+/**
+* @title: 查寝记录表单出参
+* @Author szs
+* @Date: 2024-01-02
+* @Version 1.0
+*/
+@Data
+public class RoomBedCheckRecordVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 填写人
+    */
+    @ApiModelProperty("填写人")
+    private Long userId;
+    /**
+    * 班级编号
+    */
+    @ApiModelProperty("班级编号")
+    private Long classId;
+    /**
+    * 查寝时间
+    */
+    @ApiModelProperty("查寝时间")
+    private Date checkRecordTime;
+    /**
+    * 情况
+    */
+    @ApiModelProperty("情况")
+    private String condition;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+    * 附件文件id
+    */
+    @ApiModelProperty("附件文件id")
+    private Long fileId;
+
+
+    /**
+    * roomBedCheckRecordRelation
+    */
+    @ApiModelProperty("roomBedCheckRecordRelation子表")
+    private List<RoomBedCheckRecordRelationVo> roomBedCheckRecordRelationList;
+
+}

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

@@ -1,17 +1,10 @@
 package com.xjrsoft.module.room.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.write.style.ContentStyle;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import com.xjrsoft.common.annotation.Trans;
-import com.xjrsoft.common.enums.TransType;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -31,61 +24,19 @@ public class WfRoomStayOvernightPageVo {
     @ApiModelProperty("主键编号")
     private String id;
     /**
-    * 创建人
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("创建人")
-    @ApiModelProperty("创建人")
-    private Long createUserId;
-    /**
-    * 创建时间
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("创建时间")
-    @ApiModelProperty("创建时间")
-    private Date createDate;
-    /**
-    * 修改人
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("修改人")
-    @ApiModelProperty("修改人")
-    private Long modifyUserId;
-    /**
-    * 修改时间
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("修改时间")
-    @ApiModelProperty("修改时间")
-    private Date modifyDate;
-    /**
-    * 删除标记
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("删除标记")
-    @ApiModelProperty("删除标记")
-    private Integer deleteMark;
-    /**
-    * 有效标志
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("有效标志")
-    @ApiModelProperty("有效标志")
-    private Integer enabledMark;
-    /**
-    * 序号
-    */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("序号")
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
     * 申请人
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("申请人")
     @ApiModelProperty("申请人")
     private Long applicantUserId;
+    /**
+     * 申请人
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("申请人")
+    @ApiModelProperty("申请人")
+    private String applicantUserIdCN;
     /**
     * 班主任用户编号
     */
@@ -93,6 +44,13 @@ public class WfRoomStayOvernightPageVo {
     @ExcelProperty("班主任用户编号")
     @ApiModelProperty("班主任用户编号")
     private Long headTeacherId;
+    /**
+     * 班主任用户编号
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("班主任用户编号")
+    @ApiModelProperty("班主任用户编号")
+    private String headTeacherIdCN;
     /**
     * 寝室编号(room)
     */

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -1760,4 +1760,42 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
+    /**
+     * 查寝记录
+     * @throws IOException
+     */
+    @Test
+    public void gcRoomBedCheckRecord() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("room_bed_check_record");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        mainTable = new TableConfig();
+        mainTable.setTableName("room_bed_check_record_relation");//init_sql中的表名
+        mainTable.setIsMain(false);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        mainTable.setRelationField("room_bed_check_record_id");//设置外键
+        mainTable.setRelationTableField(GlobalConstant.DEFAULT_PK);//设置外键
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("szs");//作者名称
+        params.setPackageName("room");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(true);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
 }