Merge remote-tracking branch 'origin/dev' into dev

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

@@ -0,0 +1,105 @@
+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.extension.plugins.pagination.Page;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.module.room.dto.AddRoomValueWeekDto;
+import com.xjrsoft.module.room.dto.RoomValueWeekPageDto;
+import com.xjrsoft.module.room.dto.UpdateRoomValueWeekDto;
+import com.xjrsoft.module.room.entity.RoomValueWeek;
+import com.xjrsoft.module.room.service.IRoomValueWeekService;
+import com.xjrsoft.module.room.vo.RoomValueWeekPageVo;
+import com.xjrsoft.module.room.vo.RoomValueWeekVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+* @title: 宿管值班管理
+* @Author dzx
+* @Date: 2024-01-03
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/room" + "/roomValueWeek")
+@Api(value = "/room"  + "/roomValueWeek",tags = "宿管值班管理代码")
+@AllArgsConstructor
+public class RoomValueWeekController {
+
+
+    private final IRoomValueWeekService roomValueWeekService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="宿管值班管理列表(分页)")
+    @SaCheckPermission("roomvalueweek:detail")
+    public RT<PageOutput<RoomValueWeekPageVo>> page(@Valid RoomValueWeekPageDto dto){
+        PageOutput<RoomValueWeekPageVo> pageOutput = roomValueWeekService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询宿管值班管理信息")
+    @SaCheckPermission("roomvalueweek:detail")
+    public RT<RoomValueWeekVo> info(@RequestParam Long id){
+        RoomValueWeek roomValueWeek = roomValueWeekService.getByIdDeep(id);
+        if (roomValueWeek == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(roomValueWeek, RoomValueWeekVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增宿管值班管理")
+    @SaCheckPermission("roomvalueweek:add")
+    public RT<Boolean> add(@Valid @RequestBody AddRoomValueWeekDto dto){
+        boolean isSuccess = roomValueWeekService.add(dto);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改宿管值班管理")
+    @SaCheckPermission("roomvalueweek:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateRoomValueWeekDto dto){
+
+        RoomValueWeek roomValueWeek = BeanUtil.toBean(dto, RoomValueWeek.class);
+        return RT.ok(roomValueWeekService.update(roomValueWeek));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除宿管值班管理")
+    @SaCheckPermission("roomvalueweek:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(roomValueWeekService.delete(ids));
+
+    }
+
+    @GetMapping("/export")
+    @ApiOperation(value = "导出")
+    public ResponseEntity<byte[]> exportData(@Valid RoomValueWeekPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
+        List<RoomValueWeekPageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput<RoomValueWeekPageVo>) page(dto).getData()).getList();
+        ByteArrayOutputStream bot = new ByteArrayOutputStream();
+        EasyExcel.write(bot, RoomValueWeekPageVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList);
+
+        return RT.fileStream(bot.toByteArray(), "RoomValueWeek" + ExcelTypeEnum.XLSX.getValue());
+    }
+}

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

@@ -0,0 +1,53 @@
+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.RoomValueWeekItem;
+
+
+
+/**
+* @title: 宿管值班管理
+* @Author dzx
+* @Date: 2024-01-03
+* @Version 1.0
+*/
+@Data
+public class AddRoomValueWeekDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 开始时间
+    */
+    @ApiModelProperty("开始时间")
+    private Date startTime;
+    /**
+    * 结束时间
+    */
+    @ApiModelProperty("结束时间")
+    private Date endTime;
+
+    @ApiModelProperty("男寝宿管id")
+    private Long maleUserId;
+
+    @ApiModelProperty("女寝宿管id")
+    private Long femaleUserId;
+
+    @ApiModelProperty("教官id")
+    private Long instructorUserId;
+
+    @ApiModelProperty("男生留宿人数")
+    private Integer maleStudents;
+
+    @ApiModelProperty("女生留宿人数")
+    private Integer femaleStudents;
+}

src/main/java/com/xjrsoft/module/room/dto/AddRoomValueWeekItemDto.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 dzx
+* @Date: 2024-01-03
+* @Version 1.0
+*/
+@Data
+public class AddRoomValueWeekItemDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 宿管值班管理编号（room_value_week）
+    */
+    @ApiModelProperty("宿管值班管理编号（room_value_week）")
+    private Long roomValueWeekId;
+    /**
+    * 值班人员用户编号
+    */
+    @ApiModelProperty("值班人员用户编号")
+    private Long userId;
+    /**
+    * 职务（宿管、教官）
+    */
+    @ApiModelProperty("职务（宿管、教官）")
+    private String postName;
+    /**
+    * 负责寝室（男寝、女寝固定）
+    */
+    @ApiModelProperty("负责寝室（男寝、女寝固定）")
+    private String roomType;
+    /**
+    * 人数(添加时先默认统计一个进去)
+    */
+    @ApiModelProperty("人数(添加时先默认统计一个进去)")
+    private Integer numberPeople;
+
+}

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

@@ -0,0 +1,37 @@
+package com.xjrsoft.module.room.dto;
+
+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;
+
+
+/**
+* @title: 宿管值班管理分页查询入参
+* @Author dzx
+* @Date: 2024-01-03
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class RoomValueWeekPageDto extends PageInput {
+
+    @ApiModelProperty("开始时间")
+    private String startTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
+    @ApiModelProperty("值班人员id")
+    private String userId;
+
+    @ApiModelProperty("寝室类型")
+    private String roomType;
+
+}

src/main/java/com/xjrsoft/module/room/dto/UpdateRoomValueWeekDto.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.RoomValueWeekItem;
+
+
+
+/**
+* @title: 宿管值班管理
+* @Author dzx
+* @Date: 2024-01-03
+* @Version 1.0
+*/
+@Data
+public class UpdateRoomValueWeekDto extends AddRoomValueWeekDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

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

@@ -0,0 +1,100 @@
+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 dzx
+* @Date: 2024-01-03
+* @Version 1.0
+*/
+@Data
+@TableName("room_value_week")
+@ApiModel(value = "room_value_week", description = "宿管值班管理")
+public class RoomValueWeek 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 Date startTime;
+    /**
+    * 结束时间
+    */
+    @ApiModelProperty("结束时间")
+    private Date endTime;
+
+    /**
+    * roomValueWeekItem
+    */
+    @ApiModelProperty("roomValueWeekItem子表")
+    @TableField(exist = false)
+    @EntityMapping(thisField = "id", joinField = "roomValueWeekId")
+    private List<RoomValueWeekItem> roomValueWeekItemList;
+
+}

src/main/java/com/xjrsoft/module/room/entity/RoomValueWeekItem.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 dzx
+* @Date: 2024-01-03
+* @Version 1.0
+*/
+@Data
+@TableName("room_value_week_item")
+@ApiModel(value = "room_value_week_item", description = "宿管值班管理(人员)")
+public class RoomValueWeekItem 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_value_week）
+    */
+    @ApiModelProperty("宿管值班管理编号（room_value_week）")
+    private Long roomValueWeekId;
+    /**
+    * 值班人员用户编号
+    */
+    @ApiModelProperty("值班人员用户编号")
+    private Long userId;
+    /**
+    * 职务（宿管、教官）
+    */
+    @ApiModelProperty("职务（宿管、教官）")
+    private String postName;
+    /**
+    * 负责寝室（男寝、女寝固定）
+    */
+    @ApiModelProperty("负责寝室（男寝、女寝固定）")
+    private String roomType;
+    /**
+    * 人数(添加时先默认统计一个进去)
+    */
+    @ApiModelProperty("人数(添加时先默认统计一个进去)")
+    private Integer numberPeople;
+
+
+}

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

@@ -0,0 +1,24 @@
+package com.xjrsoft.module.room.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.room.dto.RoomValueWeekPageDto;
+import com.xjrsoft.module.room.entity.RoomValueWeekItem;
+import com.xjrsoft.module.room.vo.RoomValueWeekItemVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+* @title: 宿管值班管理(人员)
+* @Author dzx
+* @Date: 2024-01-03
+* @Version 1.0
+*/
+@Mapper
+public interface RoomValueWeekItemMapper extends MPJBaseMapper<RoomValueWeekItem> {
+
+    List<RoomValueWeekItemVo> getItemList(@Param("dto") RoomValueWeekPageDto dto);
+
+    Integer getMaxSortCode();
+}

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

@@ -0,0 +1,16 @@
+package com.xjrsoft.module.room.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.room.entity.RoomValueWeek;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 宿管值班管理
+* @Author dzx
+* @Date: 2024-01-03
+* @Version 1.0
+*/
+@Mapper
+public interface RoomValueWeekMapper extends MPJBaseMapper<RoomValueWeek> {
+
+}

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

@@ -0,0 +1,48 @@
+package com.xjrsoft.module.room.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.module.room.dto.AddRoomValueWeekDto;
+import com.xjrsoft.module.room.dto.RoomValueWeekPageDto;
+import com.xjrsoft.module.room.entity.RoomValueWeek;
+import com.xjrsoft.module.room.vo.RoomValueWeekPageVo;
+
+import java.util.List;
+
+/**
+* @title: 宿管值班管理
+* @Author dzx
+* @Date: 2024-01-03
+* @Version 1.0
+*/
+
+public interface IRoomValueWeekService extends MPJBaseService<RoomValueWeek> {
+    /**
+    * 新增
+    *
+    * @param dto
+    * @return
+    */
+    Boolean add(AddRoomValueWeekDto dto);
+
+    /**
+    * 更新
+    *
+    * @param roomValueWeek
+    * @return
+    */
+    Boolean update(RoomValueWeek roomValueWeek);
+
+    /**
+    * 删除
+    *
+    * @param ids
+    * @return
+    */
+    Boolean delete(List<Long> ids);
+
+    PageOutput<RoomValueWeekPageVo> getPage(Page<RoomValueWeekPageDto> page, RoomValueWeekPageDto dto);
+
+    Boolean updateNumberPeople();
+}

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

@@ -109,6 +109,9 @@ public class RoomRuleServiceImpl extends MPJBaseServiceImpl<RoomRuleMapper, Room
         //再插入最新传入的楼栋
         Integer itemMaxSortCode = roomRuleRoomRuleMapper.getItemMaxSortCode();
         for (Long buildId : dto.getOfficeBuildIds()) {
+            if(buildId == null || dto.getRoomRuleId() == null){
+                continue;
+            }
             RoomRuleItem roomRuleItem = new RoomRuleItem();
             itemMaxSortCode ++;
             roomRuleItem.setSortCode(itemMaxSortCode);

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

@@ -0,0 +1,171 @@
+package com.xjrsoft.module.room.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.module.room.dto.AddRoomValueWeekDto;
+import com.xjrsoft.module.room.dto.RoomValueWeekPageDto;
+import com.xjrsoft.module.room.entity.RoomValueWeek;
+import com.xjrsoft.module.room.entity.RoomValueWeekItem;
+import com.xjrsoft.module.room.mapper.RoomValueWeekItemMapper;
+import com.xjrsoft.module.room.mapper.RoomValueWeekMapper;
+import com.xjrsoft.module.room.service.IRoomValueWeekService;
+import com.xjrsoft.module.room.vo.RoomValueWeekItemVo;
+import com.xjrsoft.module.room.vo.RoomValueWeekPageVo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+* @title: 宿管值班管理
+* @Author dzx
+* @Date: 2024-01-03
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class RoomValueWeekServiceImpl extends MPJBaseServiceImpl<RoomValueWeekMapper, RoomValueWeek> implements IRoomValueWeekService {
+    private final RoomValueWeekMapper roomValueWeekRoomValueWeekMapper;
+
+    private final RoomValueWeekItemMapper roomValueWeekRoomValueWeekItemMapper;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean add(AddRoomValueWeekDto dto) {
+        RoomValueWeek roomValueWeek = BeanUtil.toBean(dto, RoomValueWeek.class);
+        roomValueWeekRoomValueWeekMapper.insert(roomValueWeek);
+        Integer ItemMaxSortCode = roomValueWeekRoomValueWeekItemMapper.getMaxSortCode();
+        if(dto.getMaleUserId() != null){
+            RoomValueWeekItem maleItem = new RoomValueWeekItem();
+            maleItem.setRoomValueWeekId(roomValueWeek.getId());
+            maleItem.setRoomType("男寝");
+            maleItem.setPostName("宿管");
+            maleItem.setUserId(dto.getMaleUserId());
+            maleItem.setNumberPeople(dto.getMaleStudents());
+            maleItem.setSortCode(ItemMaxSortCode + 1);
+            roomValueWeekRoomValueWeekItemMapper.insert(maleItem);
+        }
+        if(dto.getFemaleUserId() != null){
+            RoomValueWeekItem femaleItem = new RoomValueWeekItem();
+            femaleItem.setRoomValueWeekId(roomValueWeek.getId());
+            femaleItem.setRoomType("女寝");
+            femaleItem.setPostName("宿管");
+            femaleItem.setUserId(dto.getFemaleUserId());
+            femaleItem.setNumberPeople(dto.getFemaleStudents());
+            femaleItem.setSortCode(ItemMaxSortCode + 2);
+            roomValueWeekRoomValueWeekItemMapper.insert(femaleItem);
+        }
+        if(dto.getInstructorUserId() != null){
+            RoomValueWeekItem instructorItem = new RoomValueWeekItem();
+            instructorItem.setRoomValueWeekId(roomValueWeek.getId());
+            instructorItem.setPostName("教官");
+            instructorItem.setUserId(dto.getInstructorUserId());
+            instructorItem.setSortCode(ItemMaxSortCode + 3);
+            roomValueWeekRoomValueWeekItemMapper.insert(instructorItem);
+        }
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean update(RoomValueWeek roomValueWeek) {
+        roomValueWeekRoomValueWeekMapper.updateById(roomValueWeek);
+        //********************************* RoomValueWeekItem  增删改  开始 *******************************************/
+        {
+            // 查出所有子级的id
+            List<RoomValueWeekItem> roomValueWeekItemList = roomValueWeekRoomValueWeekItemMapper.selectList(Wrappers.lambdaQuery(RoomValueWeekItem.class).eq(RoomValueWeekItem::getRoomValueWeekId, roomValueWeek.getId()).select(RoomValueWeekItem::getId));
+            List<Long> roomValueWeekItemIds = roomValueWeekItemList.stream().map(RoomValueWeekItem::getId).collect(Collectors.toList());
+            //原有子表单 没有被删除的主键
+            List<Long> roomValueWeekItemOldIds = roomValueWeek.getRoomValueWeekItemList().stream().map(RoomValueWeekItem::getId).filter(Objects::nonNull).collect(Collectors.toList());
+            //找到需要删除的id
+            List<Long> roomValueWeekItemRemoveIds = roomValueWeekItemIds.stream().filter(item -> !roomValueWeekItemOldIds.contains(item)).collect(Collectors.toList());
+
+            for (RoomValueWeekItem roomValueWeekItem : roomValueWeek.getRoomValueWeekItemList()) {
+                //如果不等于空则修改
+                if (roomValueWeekItem.getId() != null) {
+                    roomValueWeekRoomValueWeekItemMapper.updateById(roomValueWeekItem);
+                }
+                //如果等于空 则新增
+                else {
+                    //已经不存在的id 删除
+                    roomValueWeekItem.setRoomValueWeekId(roomValueWeek.getId());
+                    roomValueWeekRoomValueWeekItemMapper.insert(roomValueWeekItem);
+                }
+            }
+            //已经不存在的id 删除
+            if(roomValueWeekItemRemoveIds.size() > 0){
+                roomValueWeekRoomValueWeekItemMapper.deleteBatchIds(roomValueWeekItemRemoveIds);
+            }
+        }
+        //********************************* RoomValueWeekItem  增删改  结束 *******************************************/
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(List<Long> ids) {
+        roomValueWeekRoomValueWeekMapper.deleteBatchIds(ids);
+        roomValueWeekRoomValueWeekItemMapper.delete(Wrappers.lambdaQuery(RoomValueWeekItem.class).in(RoomValueWeekItem::getRoomValueWeekId, ids));
+
+        return true;
+    }
+
+    @Override
+    public PageOutput<RoomValueWeekPageVo> getPage(Page<RoomValueWeekPageDto> page, RoomValueWeekPageDto dto) {
+        List<RoomValueWeekItemVo> itemList = roomValueWeekRoomValueWeekItemMapper.getItemList(dto);
+        List<Long> weekIds = new ArrayList<>();
+        for (RoomValueWeekItemVo itemVo : itemList) {
+            weekIds.add(itemVo.getId());
+        }
+
+        IPage<RoomValueWeek> roomValueWeekIPage = roomValueWeekRoomValueWeekMapper.selectPage(ConventPage.getPage(dto),
+            new QueryWrapper<RoomValueWeek>().lambda()
+            .le(ObjectUtil.isNotEmpty(dto.getStartTime()), RoomValueWeek::getStartTime, dto.getStartTime())
+            .ge(ObjectUtil.isNotEmpty(dto.getEndTime()), RoomValueWeek::getEndTime, dto.getEndTime())
+            .in(!weekIds.isEmpty(), RoomValueWeek::getId, weekIds)
+        );
+
+        PageOutput<RoomValueWeekPageVo> pageOutput = ConventPage.getPageOutput(roomValueWeekIPage, RoomValueWeekPageVo.class);
+
+        for (RoomValueWeekPageVo record : pageOutput.getList()) {
+            List<RoomValueWeekItemVo> itemList2 = new ArrayList<>();
+            for (RoomValueWeekItemVo roomValueWeekItemVo : itemList) {
+                if(!roomValueWeekItemVo.getRoomValueWeekId().toString().equals(record.getId())){
+                    continue;
+                }
+                itemList2.add(roomValueWeekItemVo);
+            }
+
+            record.setItemList(itemList2);
+        }
+
+        return pageOutput;
+    }
+
+    @Override
+    public Boolean updateNumberPeople() {
+        Date date = new Date();
+        List<RoomValueWeek> weeks = roomValueWeekRoomValueWeekMapper.selectList(
+            new QueryWrapper<RoomValueWeek>().lambda()
+            .le(RoomValueWeek::getEndTime, date)
+            .ge(RoomValueWeek::getStartTime, date)
+        );
+
+        return null;
+    }
+}

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

@@ -0,0 +1,53 @@
+package com.xjrsoft.module.room.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 宿管值班管理(人员)表单出参
+* @Author dzx
+* @Date: 2024-01-03
+* @Version 1.0
+*/
+@Data
+public class RoomValueWeekItemVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 宿管值班管理编号（room_value_week）
+    */
+    @ApiModelProperty("宿管值班管理编号（room_value_week）")
+    private Long roomValueWeekId;
+    /**
+    * 值班人员用户编号
+    */
+    @ApiModelProperty("值班人员用户编号")
+    private Long userId;
+    /**
+    * 职务（宿管、教官）
+    */
+    @ApiModelProperty("职务（宿管、教官）")
+    private String postName;
+    /**
+    * 负责寝室（男寝、女寝固定）
+    */
+    @ApiModelProperty("负责寝室（男寝、女寝固定）")
+    private String roomType;
+    /**
+    * 人数(添加时先默认统计一个进去)
+    */
+    @ApiModelProperty("人数(添加时先默认统计一个进去)")
+    private Integer numberPeople;
+
+
+
+}

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

@@ -0,0 +1,64 @@
+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;
+import java.util.List;
+
+/**
+* @title: 宿管值班管理分页列表出参
+* @Author dzx
+* @Date: 2024-01-03
+* @Version 1.0
+*/
+@Data
+public class RoomValueWeekPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("主键编号")
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 序号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("序号")
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 开始时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("开始时间")
+    @ApiModelProperty("开始时间")
+    private Date startTime;
+    /**
+    * 结束时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("结束时间")
+    @ApiModelProperty("结束时间")
+    private Date endTime;
+
+    /**
+     * 结束时间
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("子项集合")
+    @ApiModelProperty("结束时间")
+    private List<RoomValueWeekItemVo> ItemList;
+
+}

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

@@ -0,0 +1,50 @@
+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.RoomValueWeekItem;
+
+/**
+* @title: 宿管值班管理表单出参
+* @Author dzx
+* @Date: 2024-01-03
+* @Version 1.0
+*/
+@Data
+public class RoomValueWeekVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 开始时间
+    */
+    @ApiModelProperty("开始时间")
+    private Date startTime;
+    /**
+    * 结束时间
+    */
+    @ApiModelProperty("结束时间")
+    private Date endTime;
+
+
+    /**
+    * roomValueWeekItem
+    */
+    @ApiModelProperty("roomValueWeekItem子表")
+    private List<RoomValueWeekItemVo> roomValueWeekItemList;
+
+}

src/main/resources/mapper/room/RoomValueWeekItemMapper.xml

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xjrsoft.module.room.mapper.RoomValueWeekItemMapper">
+    <select id="getItemList" parameterType="com.xjrsoft.module.room.dto.RoomValueWeekPageDto" resultType="com.xjrsoft.module.room.vo.RoomValueWeekItemVo">
+        SELECT t1.room_value_week_id,t2.name,t1.post_name,t1.room_type,t1.number_people FROM room_value_week_item t1
+        LEFT JOIN xjr_user t2 ON t1.user_id = t2.id
+        WHERE t1.delete_mark = 0
+        <if test="dto.userId != null and dto.userId != ''">
+            and t2.id = #{dto.userId}
+        </if>
+        <if test="dto.roomType != null and dto.roomType != ''">
+            and t1.room_type = #{dto.roomType}
+        </if>
+        ORDER BY t1.sort_code
+    </select>
+    <select id="getMaxSortCode" resultType="java.lang.Integer">
+        SELECT IFNULL(MAX(sort_code),0) FROM room_value_week_item WHERE delete_mark = 0
+    </select>
+
+    <select id="getDistributeClassInfo" parameterType="com.xjrsoft.module.room.dto.DistributeClassPageDto" resultType="com.xjrsoft.module.room.vo.DistributeClassPageVo">
+        SELECT t1.id,t2.name AS grade_name,t3.name AS org_name,t1.name AS class_name,
+        (SELECT COUNT(*) FROM base_student c1
+        LEFT JOIN base_student_school_roll c2 ON c1.user_id = c2.user_id
+        LEFT JOIN xjr_dictionary_detail c3 ON c2.stduy_status = c3.code AND c3.item_id = 2023000000000000030
+        WHERE c1.delete_mark = 0 AND c2.delete_mark = 0
+        AND c3.code = 'FB3002' AND c2.class_id = t1.id) AS need_count,(
+        SELECT COUNT(*) FROM room_bed a1
+        LEFT JOIN base_student_school_roll a2 ON a1.student_user_id = a2.user_id
+        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0
+        AND a2.class_id = t1.id
+        ) AS distribute_count FROM base_class t1
+        LEFT JOIN base_grade t2 ON t1.grade_id = t2.id
+        LEFT JOIN xjr_department t3 ON t1.org_id = t3.id
+        WHERE t1.delete_mark = 0
+        and (
+        SELECT COUNT(*) FROM base_student c1
+        LEFT JOIN base_student_school_roll c2 ON c1.user_id = c2.user_id
+        LEFT JOIN xjr_dictionary_detail c3 ON c2.stduy_status = c3.code AND c3.item_id = 2023000000000000030
+        WHERE c1.delete_mark = 0 AND c2.delete_mark = 0
+        AND c3.code = 'FB3002' AND c2.class_id = t1.id
+        ) >
+        (
+        SELECT COUNT(*) FROM room_bed a1
+        LEFT JOIN base_student_school_roll a2 ON a1.student_user_id = a2.user_id
+        WHERE a1.delete_mark = 0 AND a2.delete_mark = 0
+        AND a2.class_id = t1.id
+        )
+        <if test="dto.gradeId != null">
+            and t1.grade_id = #{dto.gradeId}
+        </if>
+        <if test="dto.classId != null">
+            and t1.class_id = #{dto.classId}
+        </if>
+    </select>
+    <select id="getDistributeRoomBedInfo" parameterType="com.xjrsoft.module.room.dto.DistributeRoomBedPageDto" resultType="com.xjrsoft.module.room.vo.DistributeRoomBedPageVo">
+        SELECT t1.id,t1.sort_code,t2.name AS build_name,t1.floor_number,t1.room_name,t4.name AS gender_cn, t3.name AS check_in_status_cn,
+        t1.bed_count,(
+        SELECT COUNT(*) FROM room_bed
+        WHERE delete_mark = 0 AND room_id = t1.id
+        AND student_user_id IS NOT NULL
+        ) AS into_count,(
+        SELECT GROUP_CONCAT(c3.name) FROM room_bed c1
+        LEFT JOIN base_student_school_roll c2 ON c1.student_user_id = c2.user_id
+        LEFT JOIN base_class c3 ON c2.class_id = c3.id
+        WHERE c1.delete_mark = 0 AND c1.room_id = t1.id
+        AND c1.student_user_id IS NOT NULL
+        ) AS into_class FROM room t1
+        LEFT JOIN base_office_build t2 ON t1.office_build_id = t2.id
+        LEFT JOIN xjr_dictionary_detail t3 ON t1.check_in_status = t3.code AND t3.item_id = 1739843696019435521
+        LEFT JOIN xjr_dictionary_detail t4 ON t1.gender = t4.code AND t4.item_id = 2023000000000000004
+        WHERE t1.delete_mark = 0
+        and
+            (
+                SELECT COUNT(*) FROM room_bed
+                WHERE delete_mark = 0 AND room_id = t1.id
+                  AND student_user_id IS NOT NULL
+            ) != t1.bed_count
+        ORDER BY t1.sort_code
+    </select>
+
+    <select id="getBedInfo" resultType="com.xjrsoft.module.room.vo.RoomBedVo">
+        SELECT t1.* FROM room_bed t1
+        LEFT JOIN room t2 ON t1.room_id = t2.id
+        WHERE t1.delete_mark = 0 AND t1.room_id IN
+        <foreach item="roomId" index="index" collection="ids" open="(" close=")" separator=",">
+            #{roomId}
+        </foreach>
+        ORDER BY t2.sort_code,t1.sort_code
+    </select>
+
+    <select id="getDistributeResult" parameterType="com.xjrsoft.module.room.dto.DistributeRoomBedDto" resultType="com.xjrsoft.module.room.vo.DistributeResultListVo">
+        SELECT t5.class_id,t4.name,t6.name AS gender_cn,t3.name AS build_name,t2.room_name,t1.bed_number FROM room_bed t1
+        LEFT JOIN room t2 ON t1.room_id = t2.id
+        LEFT JOIN base_office_build t3 ON t2.office_build_id = t3.id
+        LEFT JOIN xjr_user t4 ON t1.student_user_id = t4.id
+        LEFT JOIN base_student_school_roll t5 ON t5.user_id = t4.id
+        LEFT JOIN xjr_dictionary_detail t6 ON t2.gender = t6.code AND t6.item_id = 2023000000000000004
+        WHERE t1.student_user_id IS NOT NULL AND t1.delete_mark = 0
+        AND t1.room_id IN
+        <foreach item="roomId" index="index" collection="dto.roomIds" open="(" close=")" separator=",">
+            #{roomId}
+        </foreach>
+        AND t5.class_id IN
+        <foreach item="classId" index="index" collection="dto.classIds" open="(" close=")" separator=",">
+            #{classId}
+        </foreach>
+        ORDER BY t2.sort_code,t1.sort_code
+    </select>
+
+    <select id="getClassStudetBed" parameterType="com.xjrsoft.module.room.dto.AdjustClassPageDto" resultType="com.xjrsoft.module.room.vo.AdjustBedClassStudentPageVo">
+        SELECT t1.user_id,t4.id AS class_id, t4.name AS class_name,t2.name AS student_name,REPLACE(REPLACE(t2.gender,1,'男'),2,'女') AS gender_cn,t7.name AS build_name,t6.room_name,t5.bed_number FROM base_student t1
+        LEFT JOIN xjr_user t2 ON t1.user_id = t2.id
+        LEFT JOIN base_student_school_roll t3 ON t1.user_id = t3.user_id
+        LEFT JOIN base_class t4 ON t3.class_id = t4.id
+        LEFT JOIN room_bed t5 ON t5.student_user_id = t1.user_id
+        LEFT JOIN room t6 ON t5.room_id = t6.id
+        LEFT JOIN base_office_build t7 ON t6.office_build_id = t7.id
+        WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
+        and t3.stduy_status = 'FB3002'
+        <if test="dto.gradeId != null">
+            and t4.grade_id = #{dto.gradeId}
+        </if>
+        <if test="dto.classId != null">
+            and t4.id = #{dto.classId}
+        </if>
+        <if test="dto.gender != null and dto.gender != ''">
+            and t6.gender = #{dto.gender}
+        </if>
+        <if test="dto.gender != null and dto.gender != ''">
+            and t6.gender = #{dto.gender}
+        </if>
+        <if test="dto.isDistribute != null">
+            <if test="dto.isDistribute == 1">
+                and t5.student_user_id is not null
+            </if>
+            <if test="dto.isDistribute == 0">
+                and t5.student_user_id is null
+            </if>
+        </if>
+        <if test="dto.studentName != null and dto.studentName != ''">
+            and t2.name like concat('%', #{dto.studentName}, '%')
+        </if>
+    </select>
+
+    <select id="getBedStudentInfo" parameterType="com.xjrsoft.module.room.dto.AdjustBedPageDto" resultType="com.xjrsoft.module.room.vo.AdjustBedStudentPageVo">
+        SELECT t1.id,t3.name AS build_name,t2.room_name,t5.name AS gender_cn,t1.bed_number,t4.name AS student_name,t4.id as student_user_id,t6.student_user_id as student_appoint_id,t2.is_max,t2.id as room_id FROM room_bed t1
+        LEFT JOIN room t2 ON t1.room_id = t2.id
+        LEFT JOIN base_office_build t3 ON t2.office_build_id = t3.id
+        LEFT JOIN xjr_user t4 ON t1.student_user_id = t4.id
+        LEFT JOIN xjr_dictionary_detail t5 ON t2.gender = t5.code AND t5.item_id = 2023000000000000004
+        LEFT JOIN room_student_appoint t6 ON t6.room_bed_id = t1.id
+        WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
+        <if test="dto.isEmptyRoom != null">
+            and t2.name like concat('%', #{dto.studentName}, '%')
+        </if>
+        ORDER BY t2.sort_code,t1.sort_code
+    </select>
+
+    <select id="getNoBedStudent" parameterType="com.xjrsoft.module.room.dto.AdjustBedPageDto" resultType="com.xjrsoft.module.room.vo.NoBedStudentPageVo">
+        SELECT t1.user_id, t2.name AS student_name,REPLACE(REPLACE(t2.gender,1,'男'),2,'女') as gender_cn,t4.name AS class_name FROM base_student t1
+        INNER JOIN xjr_user t2 ON t1.user_id = t2.id
+        LEFT JOIN base_student_school_roll t3 ON t1.user_id = t3.user_id
+        LEFT JOIN base_class t4 ON t3.class_id = t4.id
+        WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
+        AND t3.stduy_status = 'FB3001'
+        AND t1.user_id NOT IN (
+            SELECT student_user_id FROM room_bed WHERE delete_mark = 0 AND student_user_id IS NOT NULL
+        )
+    </select>
+
+</mapper>

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

@@ -1902,4 +1902,43 @@ public class FreeMarkerGeneratorTest {
         apiGeneratorService.generateCodes(params);
     }
 }
+    /**
+     * 查寝记录
+     * @throws IOException
+     */
+    @Test
+    public void gcRoomValueWeek() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("room_value_week");//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_value_week_item");//init_sql中的表名
+        mainTable.setIsMain(false);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        mainTable.setRelationField("room_value_week_id");//设置外键
+        mainTable.setRelationTableField(GlobalConstant.DEFAULT_PK);//设置外键
+        tableConfigs.add(mainTable);
 
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("dzx");//作者名称
+        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);
+    }
+
+
+}