Browse Source

service接口参数调整

dzx 1 year ago
parent
commit
abbdedf422

+ 5 - 5
src/main/java/com/xjrsoft/module/room/mapper/RoomBedMapper.java

@@ -44,9 +44,9 @@ public interface RoomBedMapper extends MPJBaseMapper<RoomBed> {
      */
     Page<RoomBedPageVo> getPage(Page<RoomBedPageVo> page, RoomBedPageDto dto);
 
-    Page<DistributeClassPageVo> getDistributeClassInfo(Page<DistributeClassPageVo> page, DistributeClassPageDto dto);
+    Page<DistributeClassPageVo> getDistributeClassInfo(Page<DistributeClassPageDto> page, DistributeClassPageDto dto);
 
-    Page<DistributeRoomBedPageVo> getDistributeRoomBedInfo(Page<DistributeRoomBedPageVo> page, DistributeRoomBedPageDto dto);
+    Page<DistributeRoomBedPageVo> getDistributeRoomBedInfo(Page<DistributeRoomBedPageDto> page, DistributeRoomBedPageDto dto);
 
     List<RoomBedVo> getBedInfo(List<Long> ids);
 
@@ -63,7 +63,7 @@ public interface RoomBedMapper extends MPJBaseMapper<RoomBed> {
      * @param dto
      * @return
      */
-    Page<AdjustBedClassPageVo> getClassStudetBed(Page<AdjustBedClassPageVo> page, @Param("dto") AdjustClassPageDto dto);
+    Page<AdjustBedClassPageVo> getClassStudetBed(Page<AdjustClassPageDto> page, @Param("dto") AdjustClassPageDto dto);
 
     /**
      * 调整床位,右边的床位学生信息
@@ -71,7 +71,7 @@ public interface RoomBedMapper extends MPJBaseMapper<RoomBed> {
      * @param dto
      * @return
      */
-    Page<AdjustBedStudentPageVo> getBedStudentInfo(Page<AdjustBedStudentPageVo> page, @Param("dto") AdjustBedPageDto dto);
+    Page<AdjustBedStudentPageVo> getBedStudentInfo(Page<AdjustBedPageDto> page, @Param("dto") AdjustBedPageDto dto);
 
 
     /**
@@ -80,6 +80,6 @@ public interface RoomBedMapper extends MPJBaseMapper<RoomBed> {
      * @param dto
      * @return
      */
-    Page<NoBedStudentPageVo> getNoBedStudent(Page<NoBedStudentPageVo> page, AdjustBedPageDto dto);
+    Page<NoBedStudentPageVo> getNoBedStudent(Page<AdjustBedPageDto> page, AdjustBedPageDto dto);
 
 }

+ 1 - 1
src/main/java/com/xjrsoft/module/room/mapper/RoomTeacherAppointMapper.java

@@ -21,5 +21,5 @@ public interface RoomTeacherAppointMapper extends MPJBaseMapper<RoomTeacherAppoi
      * @param dto
      * @return
      */
-    Page<RoomTeacherAppointPageVo> getPage(Page<RoomTeacherAppointPageVo> page, RoomTeacherAppointPageDto dto);
+    Page<RoomTeacherAppointPageVo> getPage(Page<RoomTeacherAppointPageDto> page, RoomTeacherAppointPageDto dto);
 }

+ 5 - 5
src/main/java/com/xjrsoft/module/room/service/IRoomBedService.java

@@ -47,7 +47,7 @@ public interface IRoomBedService extends MPJBaseService<RoomBed> {
      * @param dto
      * @return
      */
-    Page<DistributeClassPageVo> getDistributeClassInfo(Page<DistributeClassPageVo> page, DistributeClassPageDto dto);
+    Page<DistributeClassPageVo> getDistributeClassInfo(Page<DistributeClassPageDto> page, DistributeClassPageDto dto);
 
     /**
      * 分配床位,第二步查询班级
@@ -55,7 +55,7 @@ public interface IRoomBedService extends MPJBaseService<RoomBed> {
      * @param dto
      * @return
      */
-    Page<DistributeRoomBedPageVo> getDistributeRoomBedInfo(Page<DistributeRoomBedPageVo> page, DistributeRoomBedPageDto dto);
+    Page<DistributeRoomBedPageVo> getDistributeRoomBedInfo(Page<DistributeRoomBedPageDto> page, DistributeRoomBedPageDto dto);
 
     Boolean distributeRoomBed(DistributeRoomBedDto dto);
 
@@ -72,7 +72,7 @@ public interface IRoomBedService extends MPJBaseService<RoomBed> {
      * @param dto
      * @return
      */
-    Page<AdjustBedClassPageVo> getClassStudetBed(Page<AdjustBedClassPageVo> page, AdjustClassPageDto dto);
+    Page<AdjustBedClassPageVo> getClassStudetBed(Page<AdjustClassPageDto> page, AdjustClassPageDto dto);
 
     /**
      * 调整床位,右边的床位学生信息
@@ -80,7 +80,7 @@ public interface IRoomBedService extends MPJBaseService<RoomBed> {
      * @param dto
      * @return
      */
-    Page<AdjustBedStudentPageVo> getBedStudetInfo(Page<AdjustBedStudentPageVo> page, AdjustBedPageDto dto);
+    Page<AdjustBedStudentPageVo> getBedStudetInfo(Page<AdjustBedPageDto> page, AdjustBedPageDto dto);
 
     /**
      * 未分配床位的学生信息
@@ -88,5 +88,5 @@ public interface IRoomBedService extends MPJBaseService<RoomBed> {
      * @param dto
      * @return
      */
-    Page<NoBedStudentPageVo> getNoBedStudent(Page<NoBedStudentPageVo> page, AdjustBedPageDto dto);
+    Page<NoBedStudentPageVo> getNoBedStudent(Page<AdjustBedPageDto> page, AdjustBedPageDto dto);
 }

+ 1 - 1
src/main/java/com/xjrsoft/module/room/service/IRoomTeacherAppointService.java

@@ -24,7 +24,7 @@ public interface IRoomTeacherAppointService extends MPJBaseService<RoomTeacherAp
      * @param dto
      * @return
      */
-    Page<RoomTeacherAppointPageVo> getPage(Page<RoomTeacherAppointPageVo> page, RoomTeacherAppointPageDto dto);
+    Page<RoomTeacherAppointPageVo> getPage(Page<RoomTeacherAppointPageDto> page, RoomTeacherAppointPageDto dto);
 
     Boolean clearAppoint(List<Long> ids);
 

+ 5 - 5
src/main/java/com/xjrsoft/module/room/service/impl/RoomBedServiceImpl.java

@@ -89,12 +89,12 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
     }
 
     @Override
-    public Page<DistributeClassPageVo> getDistributeClassInfo(Page<DistributeClassPageVo> page, DistributeClassPageDto dto) {
+    public Page<DistributeClassPageVo> getDistributeClassInfo(Page<DistributeClassPageDto> page, DistributeClassPageDto dto) {
         return roomBedMapper.getDistributeClassInfo(page, dto);
     }
 
     @Override
-    public Page<DistributeRoomBedPageVo> getDistributeRoomBedInfo(Page<DistributeRoomBedPageVo> page, DistributeRoomBedPageDto dto) {
+    public Page<DistributeRoomBedPageVo> getDistributeRoomBedInfo(Page<DistributeRoomBedPageDto> page, DistributeRoomBedPageDto dto) {
         return roomBedMapper.getDistributeRoomBedInfo(page, dto);
     }
 
@@ -210,18 +210,18 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
     }
 
     @Override
-    public Page<AdjustBedClassPageVo> getClassStudetBed(Page<AdjustBedClassPageVo> page, AdjustClassPageDto dto) {
+    public Page<AdjustBedClassPageVo> getClassStudetBed(Page<AdjustClassPageDto> page, AdjustClassPageDto dto) {
         Page<AdjustBedClassPageVo> result = roomBedMapper.getClassStudetBed(page, dto);
         return result;
     }
 
     @Override
-    public Page<AdjustBedStudentPageVo> getBedStudetInfo(Page<AdjustBedStudentPageVo> page, AdjustBedPageDto dto) {
+    public Page<AdjustBedStudentPageVo> getBedStudetInfo(Page<AdjustBedPageDto> page, AdjustBedPageDto dto) {
         return roomBedMapper.getBedStudentInfo(page, dto);
     }
 
     @Override
-    public Page<NoBedStudentPageVo> getNoBedStudent(Page<NoBedStudentPageVo> page, AdjustBedPageDto dto) {
+    public Page<NoBedStudentPageVo> getNoBedStudent(Page<AdjustBedPageDto> page, AdjustBedPageDto dto) {
         return roomBedMapper.getNoBedStudent(page, dto);
     }
 }

+ 1 - 1
src/main/java/com/xjrsoft/module/room/service/impl/RoomTeacherAppointServiceImpl.java

@@ -29,7 +29,7 @@ import java.util.List;
 public class RoomTeacherAppointServiceImpl extends MPJBaseServiceImpl<RoomTeacherAppointMapper, RoomTeacherAppoint> implements IRoomTeacherAppointService {
     private final RoomTeacherAppointMapper roomTeacherAppointMapper;
     @Override
-    public Page<RoomTeacherAppointPageVo> getPage(Page<RoomTeacherAppointPageVo> page, RoomTeacherAppointPageDto dto) {
+    public Page<RoomTeacherAppointPageVo> getPage(Page<RoomTeacherAppointPageDto> page, RoomTeacherAppointPageDto dto) {
         return roomTeacherAppointMapper.getPage(page, dto);
     }