调整班级接口

src/main/java/com/xjrsoft/module/banding/controller/BandingTaskClassController.java

@@ -3,10 +3,7 @@ package com.xjrsoft.module.banding.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.EasyExcel;
-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.banding.dto.AddBandingTaskClassDto;
 import com.xjrsoft.module.banding.dto.BandingTaskClassPageDto;
 import com.xjrsoft.module.banding.dto.BandingTaskClassStudentPageDto;
@@ -51,14 +48,13 @@ public class BandingTaskClassController {
     private final IBandingTaskClassService bandingTaskClassService;
     private final IBandingTaskClassStudentService classStudentService;
 
-    @GetMapping(value = "/page")
-    @ApiOperation(value="新生分班任务班级配置列表(分页)")
+    @GetMapping(value = "/list")
+    @ApiOperation(value="新生分班任务班级配置列表")
     @SaCheckPermission("bandingtask:detail")
-    public RT<PageOutput<BandingTaskClassPageVo>> page(@Valid BandingTaskClassPageDto dto){
+    public RT<List<BandingTaskClassPageVo>> list(@Valid BandingTaskClassPageDto dto){
 
-        Page<BandingTaskClassPageVo> page = bandingTaskClassService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
-        PageOutput<BandingTaskClassPageVo> pageOutput = ConventPage.getPageOutput(page, BandingTaskClassPageVo.class);
-        return RT.ok(pageOutput);
+        List<BandingTaskClassPageVo> list = bandingTaskClassService.getList(dto);
+        return RT.ok(list);
     }
 
     @GetMapping(value = "/class-student")

src/main/java/com/xjrsoft/module/banding/dto/BandingTaskClassPageDto.java

@@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode;
 */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class BandingTaskClassPageDto extends PageInput {
+public class BandingTaskClassPageDto{
 
     @ApiModelProperty("任务id")
     private Long bandingTaskId;

src/main/java/com/xjrsoft/module/banding/mapper/BandingTaskClassMapper.java

@@ -19,7 +19,7 @@ import java.util.List;
 */
 @Mapper
 public interface BandingTaskClassMapper extends MPJBaseMapper<BandingTaskClass> {
-    Page<BandingTaskClassPageVo> getPage(Page<BandingTaskClassPageVo> page, BandingTaskClassPageDto dto);
+    List<BandingTaskClassPageVo> getList(@Param("dto")BandingTaskClassPageDto dto);
 
     List<BandingTaskClassPageVo> getClassStudent(@Param("dto") BandingTaskClassStudentPageDto dto);
 }

src/main/java/com/xjrsoft/module/banding/service/IBandingTaskClassService.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.banding.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseService;
 import com.xjrsoft.module.banding.dto.BandingTaskClassPageDto;
 import com.xjrsoft.module.banding.dto.BandingTaskClassStudentPageDto;
@@ -42,7 +41,7 @@ public interface IBandingTaskClassService extends MPJBaseService<BandingTaskClas
     Boolean delete(List<Long> ids);
 
 
-    Page<BandingTaskClassPageVo> getPage(Page<BandingTaskClassPageVo> page, BandingTaskClassPageDto dto);
+    List<BandingTaskClassPageVo> getList(BandingTaskClassPageDto dto);
 
     Boolean reset(Long bandingTaskId);
 

src/main/java/com/xjrsoft/module/banding/service/impl/BandingTaskClassServiceImpl.java

@@ -1,7 +1,6 @@
 package com.xjrsoft.module.banding.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.module.banding.dto.BandingTaskClassPageDto;
 import com.xjrsoft.module.banding.dto.BandingTaskClassStudentPageDto;
@@ -54,8 +53,8 @@ public class BandingTaskClassServiceImpl extends MPJBaseServiceImpl<BandingTaskC
     }
 
     @Override
-    public Page<BandingTaskClassPageVo> getPage(Page<BandingTaskClassPageVo> page, BandingTaskClassPageDto dto) {
-        return this.baseMapper.getPage(page, dto);
+    public List<BandingTaskClassPageVo> getList(BandingTaskClassPageDto dto) {
+        return this.baseMapper.getList(dto);
     }
 
     @Override

src/main/java/com/xjrsoft/module/banding/vo/BandingTaskClassPageVo.java

@@ -44,4 +44,13 @@ public class BandingTaskClassPageVo {
     @ApiModelProperty("体重")
     private BigDecimal weight;
 
+    @ApiModelProperty("是否订单班(0:否 1:是)")
+    private Integer isOrderClass;
+
+    @ApiModelProperty("满足人数")
+    private Integer satisfyCount;
+
+    @ApiModelProperty("剩余人数")
+    private Integer surplusCount;
+
 }

src/main/resources/mapper/banding/BandingTaskClassMapper.xml

@@ -3,11 +3,11 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.banding.mapper.BandingTaskClassMapper">
-    <select id="getPage" parameterType="com.xjrsoft.module.banding.dto.BandingTaskClassPageDto" resultType="com.xjrsoft.module.banding.vo.BandingTaskClassPageVo">
-        SELECT t1.id, t1.major_set_id,t2.name AS major_set_name, t1.name, t1.number,t1.sort_code,
+    <select id="getList" parameterType="com.xjrsoft.module.banding.dto.BandingTaskClassPageDto" resultType="com.xjrsoft.module.banding.vo.BandingTaskClassPageVo">
+        SELECT t1.id, t1.major_set_id,t2.name AS major_set_name, t1.name, t1.number,t1.sort_code,t1.is_order_class,
         (SELECT COUNT(*) FROM base_new_student WHERE delete_mark = 0 AND first_ambition_id = t1.major_set_id) AS first_ambition_count,
         (SELECT COUNT(*) FROM base_new_student WHERE delete_mark = 0 AND second_ambition_id = t1.major_set_id) AS second_ambition_count,
-        t1.height, t1.weight FROM banding_task_class t1
+        t1.height, t1.weight, 0 as satisfy_count, 0 as surplus_count FROM banding_task_class t1
         LEFT JOIN base_major_set t2 ON t1.major_set_id = t2.id
         LEFT JOIN xjr_user t3 ON t1.teacher_id = t3.id
         LEFT JOIN base_classroom t4 ON t1.classroom_id = t4.id