设置规则

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

@@ -57,6 +57,14 @@ public class BandingTaskClassController {
         return RT.ok(pageOutput);
     }
 
+    @GetMapping(value = "/class-student")
+    @ApiOperation(value="新生分班任务班级配置列表(分页)")
+    @SaCheckPermission("bandingtask:detail")
+    public RT<List<BandingTaskClassPageVo>> classStudent(@Valid BandingTaskClassPageDto dto){
+
+        return RT.ok();
+    }
+
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询新生分班任务信息")
     @SaCheckPermission("bandingTaskClass:detail")

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

@@ -9,6 +9,7 @@ import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.banding.dto.AddBandingTaskDto;
+import com.xjrsoft.module.banding.dto.AddBandingTaskRuleDto;
 import com.xjrsoft.module.banding.dto.BandingTaskPageDto;
 import com.xjrsoft.module.banding.dto.UpdateBandingTaskDto;
 import com.xjrsoft.module.banding.entity.BandingRule;
@@ -36,6 +37,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -96,6 +98,22 @@ public class BandingTaskController {
         return RT.ok(isSuccess);
     }
 
+    @PostMapping("/set-rule")
+    @ApiOperation(value = "设置规则")
+    @SaCheckPermission("bandingtask:set-rule")
+    public RT<Boolean> setRule(@Valid @RequestBody AddBandingTaskRuleDto dto){
+        List<BandingTaskRule> ruleList = new ArrayList<>();
+        for (Long bandingRuleId : dto.getBandingRuleIds()) {
+            BandingTaskRule taskRule = new BandingTaskRule();
+            taskRule.setBandingTaskId(dto.getBandingTaskId());
+            taskRule.setBandingRuleId(bandingRuleId);
+            taskRule.setCreateDate(new Date());
+            ruleList.add(taskRule);
+        }
+        boolean isSuccess = taskRuleService.saveBatch(ruleList);
+        return RT.ok(isSuccess);
+    }
+
     @PutMapping
     @ApiOperation(value = "修改新生分班任务")
     @SaCheckPermission("bandingtask:edit")

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

@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-
+import java.util.List;
 
 
 /**
@@ -18,16 +18,11 @@ public class AddBandingTaskRuleDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private Integer sortCode;
     /**
     * 新生分班规则(banding_rule)
     */
     @ApiModelProperty("新生分班规则(banding_rule)")
-    private Long bandingRuleId;
+    private List<Long> bandingRuleIds;
     /**
     * 分班任务(banding_task)
     */

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

@@ -0,0 +1,47 @@
+package com.xjrsoft.module.banding.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+* @title: 新生分班任务分页列表出参
+* @Author dzx
+* @Date: 2024-07-01
+* @Version 1.0
+*/
+@Data
+public class BandingTaskClassStudentListVo {
+
+    @ApiModelProperty("主键编号")
+    private Long id;
+
+    @ApiModelProperty("班级排序")
+    private Integer sortCode;
+
+    @ApiModelProperty("专业方向id")
+    private Long majorSetId;
+
+    @ApiModelProperty("专业方向")
+    private String majorSetName;
+
+    @ApiModelProperty("班级名称")
+    private String name;
+
+    @ApiModelProperty("班级人数")
+    private Integer number;
+
+    @ApiModelProperty("第一志愿人数")
+    private Integer firstAmbitionCount;
+
+    @ApiModelProperty("第二志愿人数")
+    private Integer secondAmbitionCount;
+
+    @ApiModelProperty("身高")
+    private BigDecimal height;
+
+    @ApiModelProperty("体重")
+    private BigDecimal weight;
+
+}