调整班级接口

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

@@ -3,6 +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.core.conditions.query.QueryWrapper;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.module.banding.dto.AddBandingTaskClassDto;
 import com.xjrsoft.module.banding.dto.BandingTaskClassPageDto;
@@ -89,6 +90,17 @@ public class BandingTaskClassController {
     @ApiOperation(value = "新增新生分班")
     @SaCheckPermission("bandingTaskClass:add")
     public RT<Boolean> add(@Valid @RequestBody AddBandingTaskClassDto dto){
+        if(dto.getSortCode() != null){
+            List<BandingTaskClass> list = bandingTaskClassService.list(
+                    new QueryWrapper<BandingTaskClass>().lambda()
+                            .eq(BandingTaskClass::getSortCode, dto.getSortCode())
+                            .eq(BandingTaskClass::getBandingTaskId, dto.getBandingTaskId())
+            );
+            if(!list.isEmpty()){
+                return RT.error("班级编号重复");
+            }
+        }
+
         BandingTaskClass bandingTask = BeanUtil.toBean(dto, BandingTaskClass.class);
         boolean isSuccess = bandingTaskClassService.add(bandingTask);
         return RT.ok(isSuccess);
@@ -98,7 +110,16 @@ public class BandingTaskClassController {
     @ApiOperation(value = "修改新生分班")
     @SaCheckPermission("bandingTaskClass:edit")
     public RT<Boolean> update(@Valid @RequestBody UpdateBandingClassDto dto){
-
+        if(dto.getSortCode() != null){
+            List<BandingTaskClass> list = bandingTaskClassService.list(
+                    new QueryWrapper<BandingTaskClass>().lambda()
+                            .eq(BandingTaskClass::getSortCode, dto.getSortCode())
+                            .eq(BandingTaskClass::getBandingTaskId, dto.getBandingTaskId())
+            );
+            if(!list.isEmpty()){
+                return RT.error("班级编号重复");
+            }
+        }
         BandingTaskClass bandingTask = BeanUtil.toBean(dto, BandingTaskClass.class);
         return RT.ok(bandingTaskClassService.update(bandingTask));
     }

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

@@ -2,6 +2,7 @@ package com.xjrsoft.module.banding.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.model.result.RT;
@@ -104,6 +105,11 @@ public class BandingTaskController {
     @ApiOperation(value = "设置规则")
     @SaCheckPermission("bandingtask:set-rule")
     public RT<Boolean> setRule(@Valid @RequestBody AddBandingTaskRuleDto dto){
+        taskRuleService.remove(
+                new QueryWrapper<BandingTaskRule>().lambda()
+                        .eq(BandingTaskRule::getBandingTaskId, dto.getBandingTaskId())
+        );
+
         List<BandingTaskRule> ruleList = new ArrayList<>();
         for (Long bandingRuleId : dto.getBandingRuleIds()) {
             BandingTaskRule taskRule = new BandingTaskRule();

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

@@ -65,4 +65,7 @@ public class AddBandingTaskClassDto implements Serializable {
     @ApiModelProperty("体重")
     private BigDecimal weight;
 
+    @ApiModelProperty("分班任务id")
+    private Long bandingTaskId;
+
 }