新生账号激活

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

@@ -3,9 +3,13 @@ package com.xjrsoft.module.student.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xjrsoft.common.enums.EnabledMark;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.module.organization.entity.User;
+import com.xjrsoft.module.organization.service.IUserService;
+import com.xjrsoft.module.student.dto.ActiveAccountDto;
 import com.xjrsoft.module.student.dto.AddBaseNewStudentDto;
 import com.xjrsoft.module.student.dto.BaseNewStudentPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseNewStudentDto;
@@ -32,6 +36,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
 import java.io.IOException;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.LinkedHashMap;
@@ -50,7 +55,7 @@ import java.util.Map;
 @AllArgsConstructor
 public class BaseNewStudentController {
 
-
+    private final IUserService userService;
     private final IBaseNewStudentService baseNewStudentService;
 
     @GetMapping(value = "/page")
@@ -187,7 +192,10 @@ public class BaseNewStudentController {
 
     @PostMapping("/active-account")
     @ApiOperation(value = "激活账号")
-    public RT<Boolean> activeAccount(@Valid @RequestBody AddBaseNewStudentDto dto) throws IOException {
+    public RT<Boolean> activeAccount(@Valid @RequestBody ActiveAccountDto dto) {
+        User user = userService.getById(dto.getId());
+        user.setEnabledMark(EnabledMark.ENABLED.getCode());
+        user.setModifyDate(LocalDateTime.now());
         return RT.ok(true);
     }
 

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

@@ -105,10 +105,4 @@ public class BaseStudentInfoController {
         return RT.ok(infos);
     }
 
-    @PostMapping("/change-class")
-    @ApiOperation(value = "调整班级")
-    @SaCheckPermission("bandingTaskClass:change-class")
-    public RT<Boolean> changeClass(@Valid @RequestBody ChangeClassDto dto){
-        return RT.ok(true);
-    }
 }

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

@@ -18,91 +18,15 @@ public class ActiveAccountDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private Integer sortCode;
-    /**
-    * 毕业学校
-    */
-    @ApiModelProperty("毕业学校")
-    private String graduateSchool;
-    /**
-    * 学生姓名
-    */
-    @ApiModelProperty("学生姓名")
-    private String name;
-    /**
-    * 性别
-    */
-    @ApiModelProperty("性别")
-    private String gender;
-    /**
-    * 身份证号
-    */
-    @ApiModelProperty("身份证号")
-    private String credentialNumber;
-    /**
-    * 身高
-    */
-    @ApiModelProperty("身高")
-    private BigDecimal height;
-    /**
-    * 体重
-    */
-    @ApiModelProperty("体重")
-    private BigDecimal weight;
-    /**
-    * 成绩
-    */
-    @ApiModelProperty("成绩")
-    private BigDecimal score;
-    /**
-    * 毕业班级
-    */
-    @ApiModelProperty("毕业班级")
-    private String graduateClass;
-    /**
-    * 学生来源
-    */
-    @ApiModelProperty("学生来源")
-    private String source;
-    /**
-    * 住宿类型
-    */
-    @ApiModelProperty("住宿类型")
-    private String stduyStatus;
-    /**
-    * 手机号
-    */
+    @ApiModelProperty("主键")
+    private Long id;
+
     @ApiModelProperty("手机号")
     private String mobile;
-    /**
-    * 第一志愿
-    */
-    @ApiModelProperty("第一志愿")
-    private String firstAmbition;
-    /**
-    * 第二志愿
-    */
-    @ApiModelProperty("第二志愿")
-    private String secondAmbition;
-    /**
-    * 班级状态（0：未分配， 1：已分配）
-    */
-    @ApiModelProperty("班级状态（0：未分配， 1：已分配）")
-    private Integer status;
-
-    @ApiModelProperty("是否可调配（0：否，1：是）")
-    private Integer isAdjust;
-
-    @ApiModelProperty("招生计划id(enrollment_plan)")
-    private Long enrollmentPlanId;
 
-    @ApiModelProperty("家庭电话")
-    private String familyMobile;
+    @ApiModelProperty("家长姓名")
+    private String parentName;
 
-    @ApiModelProperty("家庭地址")
-    private String familyAddress;
+    @ApiModelProperty("家长手机号")
+    private String parentMobile;
 }