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

# Conflicts:
#	src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

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

@@ -6,14 +6,15 @@ 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.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.dto.UpdateRoomValueWeekDto;
 import com.xjrsoft.module.room.entity.RoomValueWeek;
 import com.xjrsoft.module.room.service.IRoomValueWeekService;
+import com.xjrsoft.module.room.vo.RoomValueWeekItemVo;
 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;
@@ -51,19 +52,21 @@ public class RoomValueWeekController {
     @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);
+        roomValueWeekService.updateNumberPeople();
+        Page<RoomValueWeekPageVo> page = roomValueWeekService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        PageOutput<RoomValueWeekPageVo> pageOutput = ConventPage.getPageOutput(page, RoomValueWeekPageVo.class);
         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);
+    public RT<RoomValueWeekItemVo> info(@RequestParam Long id){
+        RoomValueWeekItemVo roomValueWeek = roomValueWeekService.getItemInfo(id);
         if (roomValueWeek == null) {
            return RT.error("找不到此数据！");
         }
-        return RT.ok(BeanUtil.toBean(roomValueWeek, RoomValueWeekVo.class));
+        return RT.ok(roomValueWeek);
     }
 
 
@@ -80,8 +83,7 @@ public class RoomValueWeekController {
     @SaCheckPermission("roomvalueweek:edit")
     public RT<Boolean> update(@Valid @RequestBody UpdateRoomValueWeekDto dto){
 
-        RoomValueWeek roomValueWeek = BeanUtil.toBean(dto, RoomValueWeek.class);
-        return RT.ok(roomValueWeekService.update(roomValueWeek));
+        return RT.ok(roomValueWeekService.updateItem(dto));
 
     }
 

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

@@ -5,6 +5,7 @@ import lombok.Data;
 import java.io.Serializable;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
+import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.LocalDateTime;
 import java.math.BigDecimal;
@@ -29,12 +30,12 @@ public class AddRoomValueWeekDto implements Serializable {
     * 开始时间
     */
     @ApiModelProperty("开始时间")
-    private Date startTime;
+    private LocalDate startTime;
     /**
     * 结束时间
     */
     @ApiModelProperty("结束时间")
-    private Date endTime;
+    private LocalDate endTime;
 
     @ApiModelProperty("男寝宿管id")
     private Long maleUserId;

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

@@ -21,7 +21,7 @@ import com.xjrsoft.module.room.entity.RoomValueWeekItem;
 * @Version 1.0
 */
 @Data
-public class UpdateRoomValueWeekDto extends AddRoomValueWeekDto {
+public class UpdateRoomValueWeekDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -30,4 +30,10 @@ public class UpdateRoomValueWeekDto extends AddRoomValueWeekDto {
     */
     @ApiModelProperty("主键编号")
     private Long id;
+
+    @ApiModelProperty("人员编号")
+    private Long userId;
+
+    @ApiModelProperty("留寝人数")
+    private Integer numberPeople;
 }

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

@@ -4,10 +4,11 @@ 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 com.xjrsoft.module.room.vo.RoomValueWeekPageVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 /**
 * @title: 宿管值班管理(人员)
@@ -18,7 +19,7 @@ import java.util.List;
 @Mapper
 public interface RoomValueWeekItemMapper extends MPJBaseMapper<RoomValueWeekItem> {
 
-    List<RoomValueWeekItemVo> getItemList(@Param("dto") RoomValueWeekPageDto dto);
+    Page<RoomValueWeekPageVo> getItemList(Page<RoomValueWeekPageDto> page, @Param("dto") RoomValueWeekPageDto dto);
 
     Integer getMaxSortCode();
 }

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

@@ -12,5 +12,5 @@ import org.apache.ibatis.annotations.Mapper;
 */
 @Mapper
 public interface RoomValueWeekMapper extends MPJBaseMapper<RoomValueWeek> {
-
+    Integer getMaxSortCode();
 }

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

@@ -2,10 +2,11 @@ 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.dto.UpdateRoomValueWeekDto;
 import com.xjrsoft.module.room.entity.RoomValueWeek;
+import com.xjrsoft.module.room.vo.RoomValueWeekItemVo;
 import com.xjrsoft.module.room.vo.RoomValueWeekPageVo;
 
 import java.util.List;
@@ -42,7 +43,11 @@ public interface IRoomValueWeekService extends MPJBaseService<RoomValueWeek> {
     */
     Boolean delete(List<Long> ids);
 
-    PageOutput<RoomValueWeekPageVo> getPage(Page<RoomValueWeekPageDto> page, RoomValueWeekPageDto dto);
+    Page<RoomValueWeekPageVo> getPage(Page<RoomValueWeekPageDto> page, RoomValueWeekPageDto dto);
 
     Boolean updateNumberPeople();
+
+    RoomValueWeekItemVo getItemInfo(Long id);
+
+    Boolean updateItem(UpdateRoomValueWeekDto dto);
 }

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

@@ -1,16 +1,13 @@
 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.dto.UpdateRoomValueWeekDto;
 import com.xjrsoft.module.room.entity.RoomValueWeek;
 import com.xjrsoft.module.room.entity.RoomValueWeekItem;
 import com.xjrsoft.module.room.mapper.RoomValueWeekItemMapper;
@@ -22,7 +19,8 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -46,6 +44,8 @@ public class RoomValueWeekServiceImpl extends MPJBaseServiceImpl<RoomValueWeekMa
     @Transactional(rollbackFor = Exception.class)
     public Boolean add(AddRoomValueWeekDto dto) {
         RoomValueWeek roomValueWeek = BeanUtil.toBean(dto, RoomValueWeek.class);
+        Integer maxSortCode = roomValueWeekRoomValueWeekMapper.getMaxSortCode();
+        roomValueWeek.setSortCode(maxSortCode + 1);
         roomValueWeekRoomValueWeekMapper.insert(roomValueWeek);
         Integer ItemMaxSortCode = roomValueWeekRoomValueWeekItemMapper.getMaxSortCode();
         if(dto.getMaleUserId() != null){
@@ -126,35 +126,10 @@ public class RoomValueWeekServiceImpl extends MPJBaseServiceImpl<RoomValueWeekMa
     }
 
     @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);
-        }
+    public Page<RoomValueWeekPageVo> getPage(Page<RoomValueWeekPageDto> page, RoomValueWeekPageDto dto) {
+        Page<RoomValueWeekPageVo> result = roomValueWeekRoomValueWeekItemMapper.getItemList(page, dto);
 
-        return pageOutput;
+        return result;
     }
 
     @Override
@@ -168,4 +143,28 @@ public class RoomValueWeekServiceImpl extends MPJBaseServiceImpl<RoomValueWeekMa
 
         return null;
     }
+
+    @Override
+    public RoomValueWeekItemVo getItemInfo(Long id) {
+        RoomValueWeekItem roomValueWeekItem = roomValueWeekRoomValueWeekItemMapper.selectById(id);
+        RoomValueWeekItemVo itemVo = BeanUtil.toBean(roomValueWeekItem, RoomValueWeekItemVo.class);
+        RoomValueWeek roomValueWeek = roomValueWeekRoomValueWeekMapper.selectById(roomValueWeekItem.getRoomValueWeekId());
+
+
+        ZoneId zoneId = ZoneId.systemDefault();
+        itemVo.setStartTime(ZonedDateTime.ofInstant(roomValueWeek.getStartTime().toInstant(), zoneId).toLocalDate());
+        itemVo.setStartTime(ZonedDateTime.ofInstant(roomValueWeek.getEndTime().toInstant(), zoneId).toLocalDate());
+
+        return itemVo;
+    }
+
+    @Override
+    public Boolean updateItem(UpdateRoomValueWeekDto dto) {
+        roomValueWeekRoomValueWeekItemMapper.updateById(new RoomValueWeekItem(){{
+            setId(dto.getId());
+            setUserId(dto.getUserId());
+            setNumberPeople(dto.getNumberPeople());
+        }});
+        return true;
+    }
 }

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

@@ -3,6 +3,9 @@ package com.xjrsoft.module.room.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDate;
+import java.util.Date;
+
 /**
 * @title: 宿管值班管理(人员)表单出参
 * @Author dzx
@@ -48,6 +51,15 @@ public class RoomValueWeekItemVo {
     @ApiModelProperty("人数(添加时先默认统计一个进去)")
     private Integer numberPeople;
 
-
+    /**
+     * 开始时间
+     */
+    @ApiModelProperty("开始时间")
+    private LocalDate startTime;
+    /**
+     * 结束时间
+     */
+    @ApiModelProperty("结束时间")
+    private LocalDate endTime;
 
 }

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

@@ -9,6 +9,8 @@ import lombok.Data;
 
 import com.xjrsoft.common.annotation.Trans;
 import com.xjrsoft.common.enums.TransType;
+
+import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.LocalDateTime;
 import java.math.BigDecimal;
@@ -44,21 +46,40 @@ public class RoomValueWeekPageVo {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("开始时间")
     @ApiModelProperty("开始时间")
-    private Date startTime;
+    private LocalDate startTime;
     /**
     * 结束时间
     */
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("结束时间")
     @ApiModelProperty("结束时间")
-    private Date endTime;
+    private LocalDate endTime;
 
     /**
-     * 结束时间
+     * 值班人员用户编号
      */
-    @ContentStyle(dataFormat = 49)
-    @ExcelProperty("子项集合")
-    @ApiModelProperty("结束时间")
-    private List<RoomValueWeekItemVo> ItemList;
+    @ApiModelProperty("值班人员用户编号")
+    private Long userId;
+
+    /**
+     * 值班人员用户编号
+     */
+    @ApiModelProperty("值班人员用户编号")
+    private String userName;
+    /**
+     * 职务（宿管、教官）
+     */
+    @ApiModelProperty("职务（宿管、教官）")
+    private String postName;
+    /**
+     * 负责寝室（男寝、女寝固定）
+     */
+    @ApiModelProperty("负责寝室（男寝、女寝固定）")
+    private String roomType;
+    /**
+     * 人数(添加时先默认统计一个进去)
+     */
+    @ApiModelProperty("人数(添加时先默认统计一个进去)")
+    private Integer numberPeople;
 
 }

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

@@ -3,171 +3,27 @@
         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
+    <select id="getItemList" parameterType="com.xjrsoft.module.room.dto.RoomValueWeekPageDto" resultType="com.xjrsoft.module.room.vo.RoomValueWeekPageVo">
+        SELECT t1.id,t2.sort_code,t2.start_time,t2.end_time,t3.name as user_name,t1.post_name,t1.room_type,t1.number_people FROM room_value_week_item t1
+        LEFT JOIN room_value_week t2 ON t1.room_value_week_id = t2.id
+        LEFT JOIN xjr_user t3 ON t1.user_id = t3.id
+        WHERE t2.delete_mark = 0 AND t1.delete_mark = 0
+        <if test="dto.startTime != null">
+            and t2.start_time >= #{dto.startTime}
+        </if>
+        <if test="dto.endTime != null">
+            and #{dto.endTime} >= t2.end_time
+        </if>
         <if test="dto.userId != null and dto.userId != ''">
-            and t2.id = #{dto.userId}
+            and t3.id = #{dto.userId}
         </if>
         <if test="dto.roomType != null and dto.roomType != ''">
             and t1.room_type = #{dto.roomType}
         </if>
-        ORDER BY t1.sort_code
+        ORDER BY t2.sort_code,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/main/resources/mapper/room/RoomValueWeekMapper.xml

@@ -0,0 +1,10 @@
+<?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.RoomValueWeekMapper">
+
+    <select id="getMaxSortCode" resultType="java.lang.Integer">
+        SELECT IFNULL(MAX(sort_code),0) FROM room_value_week WHERE delete_mark = 0
+    </select>
+</mapper>