Browse Source

根据专业和年级查询班级

dzx 1 year ago
parent
commit
38ed7ba32c

+ 20 - 2
src/main/java/com/xjrsoft/module/banding/controller/BandingTaskClassController.java

@@ -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);
+    }
 }

+ 24 - 0
src/main/java/com/xjrsoft/module/banding/dto/BandingTaskClassListDto.java

@@ -0,0 +1,24 @@
+package com.xjrsoft.module.banding.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 新生分班任务分页查询入参
+* @Author dzx
+* @Date: 2024-07-01
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BandingTaskClassListDto {
+
+    @ApiModelProperty("年级id")
+    private Long gradeId;
+
+    @ApiModelProperty("专业id")
+    private Long majorSetId;
+
+}