1、用户模块新增修改状态接口

2、招生计划列表新增gradeId查询条件

src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.organization.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.secure.BCrypt;
 import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.stp.StpUtil;
@@ -29,7 +30,9 @@ import com.xjrsoft.common.utils.RedisUtil;
 import com.xjrsoft.common.utils.TreeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.config.CommonPropertiesConfig;
+import com.xjrsoft.module.base.dto.BaseClassroomChangeStatusDto;
 import com.xjrsoft.module.base.entity.BaseClass;
+import com.xjrsoft.module.base.entity.BaseClassroom;
 import com.xjrsoft.module.base.entity.BaseGrade;
 import com.xjrsoft.module.base.service.IBaseClassService;
 import com.xjrsoft.module.base.service.IBaseGradeService;
@@ -43,6 +46,7 @@ import com.xjrsoft.module.organization.dto.UpdateInfoDto;
 import com.xjrsoft.module.organization.dto.UpdatePasswordDto;
 import com.xjrsoft.module.organization.dto.UpdateUserDto;
 import com.xjrsoft.module.organization.dto.UploadSignDto;
+import com.xjrsoft.module.organization.dto.UserChangeStatusDto;
 import com.xjrsoft.module.organization.dto.UserPageDto;
 import com.xjrsoft.module.organization.dto.UserStudentAddDto;
 import com.xjrsoft.module.organization.dto.UserStudentBindDto;
@@ -604,6 +608,21 @@ public class UserController {
         return R.ok(userService.deleteBatch(ids));
     }
 
+    @PostMapping(value = "/change-status")
+    @ApiOperation(value="修改状态")
+    @SaCheckPermission("classroom:detail")
+    public RT<Boolean> changeStatus(@Valid @RequestBody UserChangeStatusDto dto) throws Exception {
+        List<User> list = userService.list(new QueryWrapper<User>().lambda()
+                .in(User::getId, dto.getUserIds())
+        );
+
+        for (User user : list) {
+            user.setEnabledMark(dto.getStatus());
+            userService.updateById(user);
+        }
+        return RT.ok(true);
+    }
+
     @GetMapping("/info/multi")
     @ApiOperation(value = "批量获取用户信息")
     public R usersInfo(@RequestParam String ids) {

src/main/java/com/xjrsoft/module/organization/dto/UserChangeStatusDto.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.organization.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class UserChangeStatusDto {
+
+
+    @ApiModelProperty("用户ids")
+    private List<Long> userIds;
+
+    @ApiModelProperty("启用状态(0:停用 1:启用)")
+    private Integer status;
+}

src/main/java/com/xjrsoft/module/student/controller/EnrollmentPlanController.java

@@ -80,6 +80,7 @@ public class EnrollmentPlanController {
                 .like(dto.getName() != null && !dto.getName().isEmpty(), EnrollmentPlan::getName, dto.getName())
                 .eq(dto.getEnrollType() != null && !dto.getEnrollType().isEmpty(), EnrollmentPlan::getEnrollType, dto.getEnrollType())
                 .eq(EnrollmentPlan::getDeleteMark, DeleteMark.NODELETE)
+                .eq(dto.getGradeId() != null, EnrollmentPlan::getGradeId, dto.getGradeId())
                 .orderByDesc(EnrollmentPlan::getStartDate)
                 ;
         IPage<EnrollmentPlanPageVo> page = enrollmentPlanService.selectJoinListPage(ConventPage.getPage(dto), EnrollmentPlanPageVo.class, queryWrapper);

src/main/java/com/xjrsoft/module/student/dto/EnrollmentPlanPageDto.java

@@ -27,4 +27,7 @@ public class EnrollmentPlanPageDto extends PageInput {
     @ApiModelProperty("招生类型(xjr_dictionary_detail[enroll_type])")
     private String enrollType;
 
+    @ApiModelProperty("所属年级id")
+    private Long gradeId;
+
 }