|
|
@@ -5,14 +5,18 @@ import cn.hutool.core.bean.BeanUtil;
|
|
|
import com.alibaba.excel.EasyExcel;
|
|
|
import com.alibaba.excel.support.ExcelTypeEnum;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
|
import com.xjrsoft.common.model.result.RT;
|
|
|
+import com.xjrsoft.common.utils.VoToColumnUtil;
|
|
|
import com.xjrsoft.module.banding.dto.AddBandingTaskClassDto;
|
|
|
+import com.xjrsoft.module.banding.dto.BandingTaskClassListDto;
|
|
|
import com.xjrsoft.module.banding.dto.BandingTaskClassPageDto;
|
|
|
import com.xjrsoft.module.banding.dto.BandingTaskClassStudentPageDto;
|
|
|
import com.xjrsoft.module.banding.dto.ChangeClassDto;
|
|
|
import com.xjrsoft.module.banding.dto.StudentDto;
|
|
|
import com.xjrsoft.module.banding.dto.SureBandingTaskDto;
|
|
|
import com.xjrsoft.module.banding.dto.UpdateBandingClassDto;
|
|
|
+import com.xjrsoft.module.banding.entity.BandingTask;
|
|
|
import com.xjrsoft.module.banding.entity.BandingTaskClass;
|
|
|
import com.xjrsoft.module.banding.service.IBandingTaskClassService;
|
|
|
import com.xjrsoft.module.banding.service.IBandingTaskClassStudentService;
|
|
|
@@ -39,8 +43,6 @@ import org.springframework.web.multipart.MultipartFile;
|
|
|
import javax.validation.Valid;
|
|
|
import java.io.ByteArrayOutputStream;
|
|
|
import java.io.IOException;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
|
@@ -209,4 +211,20 @@ public class BandingTaskClassController {
|
|
|
List<BaseNewStudentPageDto> list = classStudentService.surplusStudent(dto.getBandingTaskClassId());
|
|
|
return RT.ok(list);
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ @GetMapping("/classListParam")
|
|
|
+ @ApiOperation(value = "根据专业和年级查询班级")
|
|
|
+ @SaCheckPermission("bandingTaskClass:surplus-student")
|
|
|
+ public RT<List<BandingTaskClassVo>> classListParam(@Valid BandingTaskClassListDto dto){
|
|
|
+ List<BandingTaskClassVo> list = bandingTaskClassService.selectJoinList(BandingTaskClassVo.class,
|
|
|
+ new MPJLambdaWrapper<BandingTaskClass>()
|
|
|
+ .select(BandingTask::getId)
|
|
|
+ .select(BandingTask.class, x -> VoToColumnUtil.fieldsToColumns(BandingTaskClassVo.class).contains(x.getProperty()))
|
|
|
+ .leftJoin(BandingTask.class, BandingTask::getId, BandingTaskClass::getBandingTaskId)
|
|
|
+ .eq(BandingTask::getGradeId, dto.getGradeId())
|
|
|
+ .eq(BandingTaskClass::getMajorSetId, dto.getMajorSetId())
|
|
|
+ );
|
|
|
+ return RT.ok(list);
|
|
|
+ }
|
|
|
}
|