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

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

@@ -30,4 +30,7 @@ public class RoomTeacherAppointPageDto extends PageInput {
 
     @ApiModelProperty("宿管员id")
     private Long userId;
+
+    @ApiModelProperty("入住身份")
+    private String identity;
 }

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

@@ -23,6 +23,8 @@ import com.xjrsoft.module.room.vo.RoomPageVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -53,7 +55,7 @@ public class RoomServiceImpl extends MPJBaseServiceImpl<RoomMapper, Room> implem
         for (RoomExcelVo roomExcelVo : list) {
             if("1".equals(roomExcelVo.getIsMax())){
                 roomExcelVo.setIsMax("是");
-            }else if("2".equals(roomExcelVo.getIsMax())){
+            }else if("0".equals(roomExcelVo.getIsMax())){
                 roomExcelVo.setIsMax("否");
             }
         }
@@ -74,10 +76,16 @@ public class RoomServiceImpl extends MPJBaseServiceImpl<RoomMapper, Room> implem
         Integer maxSortCode = roomMapper.getMaxSortCode();
         Date createDate = new Date();
         long createUserId = StpUtil.getLoginIdAsLong();
-        for (int i = 0; i < dto.getFloorRoomsCount(); i ++){
-            for (String floorNumber : dto.getFloorNumber().split(",")) {
+        String[] split = dto.getFloorNumber().split(",");
+        List<Integer> floorList = new ArrayList<>();
+        for (String floorStr : split) {
+            floorList.add(Integer.parseInt(floorStr));
+        }
+        Collections.sort(floorList);
+        for (Integer floorNumber : floorList) {
+            for (int i = 0; i < dto.getFloorRoomsCount(); i ++){
                 String roomName = "";
-                if(roomRule.getRule().contains("1")){
+                if(roomRule.getRule().contains("1") && build.getBuildNumber() != null){
                     roomName += build.getBuildNumber();
                 }
                 if(roomRule.getRule().contains("2")){
@@ -89,7 +97,7 @@ public class RoomServiceImpl extends MPJBaseServiceImpl<RoomMapper, Room> implem
 
                 Map<String, Object> param = new HashMap<>();
                 param.put("room_name", roomName);
-                param.put("floor_number", Integer.parseInt(floorNumber));
+                param.put("floor_number", floorNumber);
                 param.put("office_build_id", dto.getOfficeBuildId());
                 List<Room> rooms = roomMapper.selectByMap(param);
                 if(rooms != null && !rooms.isEmpty()){
@@ -99,7 +107,7 @@ public class RoomServiceImpl extends MPJBaseServiceImpl<RoomMapper, Room> implem
                 //先添加寝室
                 Room room = BeanUtil.toBean(dto, Room.class);
                 room.setSortCode(maxSortCode);
-                room.setFloorNumber(Integer.parseInt(floorNumber));
+                room.setFloorNumber(floorNumber);
                 room.setCreateDate(createDate);
                 room.setCreateUserId(createUserId);
                 room.setDeleteMark(0);

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

@@ -40,7 +40,7 @@
             and t5.student_id like concat('%',#{dto.studentId},'%')
         </if>
         <if test="dto.identity != null and dto.identity != ''">
-            and t5.check_in_status like concat('%',#{dto.identity},'%')
+            and t2.check_in_status like concat('%',#{dto.identity},'%')
         </if>
         ORDER BY t1.sort_code
     </select>

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

@@ -32,6 +32,9 @@
             WHERE c1.delete_mark = 0 AND c2.id = #{dto.userId}
             )
         </if>
+        <if test="dto.identity != null and dto.identity != ''">
+            and t1.check_in_status like concat('%',#{dto.identity},'%')
+        </if>
         ORDER BY t1.sort_code
     </select>
 </mapper>