班级 考勤参数转换为枚举获取

mec-education/src/main/java/com/ym/mec/education/controller/ClassGroupController.java

@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import java.util.Objects;
 
 /**
@@ -33,7 +32,7 @@ public class ClassGroupController {
     @PostMapping("/info")
     @ApiOperation("班级详情")
     public BaseResponse getInfo(@RequestBody ClassGroupReq classGroupReq) {
-        if (Objects.nonNull(classGroupReq.getClassGroupId())) {
+        if (Objects.nonNull(classGroupReq.getGroupId())) {
             BaseResponse baseResponse = new BaseResponse();
             baseResponse.setReturnCode(ReturnCodeEnum.CODE_206.getCode());
             baseResponse.setMessage(ReturnCodeEnum.CODE_206.getValue());

mec-education/src/main/java/com/ym/mec/education/enums/StudentAttendanceStatusEnum.java

@@ -0,0 +1,40 @@
+package com.ym.mec.education.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+/**
+ * 学生考勤状态
+ */
+public enum StudentAttendanceStatusEnum implements BaseEnum<String,StudentAttendanceStatusEnum> {
+    NORMAL("NORMAL","正常"),
+    TRUANT("TRUANT","旷课"),
+    LEAVE("LEAVE","请假"),
+    QUIT_SCHOOL("QUIT_SCHOOL","休学"),
+    DROP_OUT("DROP_OUT","退学");
+
+    private String code;
+
+    private String msg;
+
+    StudentAttendanceStatusEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public String getCode() {
+        return this.code;
+    }
+}

mec-education/src/main/java/com/ym/mec/education/req/ClassGroupReq.java

@@ -2,6 +2,7 @@ package com.ym.mec.education.req;
 
 import com.ym.mec.education.base.BaseQuery;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
 
@@ -14,5 +15,7 @@ import java.io.Serializable;
 @Data
 @ApiModel(description = "班级入参")
 public class ClassGroupReq extends BaseQuery implements Serializable {
+
+    @ApiModelProperty(value = "班级id",required = true)
     private Integer groupId;
 }

mec-education/src/main/java/com/ym/mec/education/service/impl/ClassGroupServiceImpl.java

@@ -6,6 +6,7 @@ import com.ym.mec.education.base.BaseResponse;
 import com.ym.mec.education.entity.ClassGroup;
 import com.ym.mec.education.entity.ClassGroupTeacherMapper;
 import com.ym.mec.education.enums.ReturnCodeEnum;
+import com.ym.mec.education.enums.TeachTypeEnum;
 import com.ym.mec.education.mapper.ClassGroupMapper;
 import com.ym.mec.education.req.ClassGroupReq;
 import com.ym.mec.education.resp.ClassGroupResp;
@@ -15,7 +16,6 @@ import com.ym.mec.education.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-
 import java.util.List;
 import java.util.Objects;
 
@@ -38,21 +38,21 @@ public class ClassGroupServiceImpl extends ServiceImpl<ClassGroupMapper, ClassGr
     @Override
     public BaseResponse<ClassGroupResp> getInfo(ClassGroupReq classGroupReq) {
         BaseResponse<ClassGroupResp> baseResponse = new BaseResponse<>();
-        ClassGroup classGroup = getById(classGroupReq.getClassGroupId());
+        ClassGroup classGroup = getById(classGroupReq.getGroupId());
         if (Objects.isNull(classGroup)) {
             baseResponse.setReturnCode(ReturnCodeEnum.CODE_207.getCode());
             baseResponse.setMessage(ReturnCodeEnum.CODE_207.getValue());
             return baseResponse;
         }
         QueryWrapper<ClassGroupTeacherMapper> teacherMapperQueryWrapper = new QueryWrapper<>();
-        teacherMapperQueryWrapper.lambda().eq(true, ClassGroupTeacherMapper::getClassGroupId, classGroupReq.getClassGroupId());
+        teacherMapperQueryWrapper.lambda().eq(true, ClassGroupTeacherMapper::getClassGroupId, classGroupReq.getGroupId());
         ClassGroupResp classGroupResp = new ClassGroupResp();
         List<ClassGroupTeacherMapper> teacherMapperList = classGroupTeacherMapperService.list(teacherMapperQueryWrapper);
         if (!CollectionUtils.isEmpty(teacherMapperList)) {
-            teacherMapperList.stream().filter(item -> "TEACHING".equals(item.getTeacherRole())).findFirst().
+            teacherMapperList.stream().filter(item -> TeachTypeEnum.TEACHING.getCode().equals(item.getTeacherRole())).findFirst().
                     ifPresent(classGroupTeacherMapper -> classGroupResp.
                             setTeacher(userService.getById(classGroupTeacherMapper.getUserId()).getUsername()));
-            teacherMapperList.stream().filter(item -> "BISHOP".equals(item.getTeacherRole())).findFirst().
+            teacherMapperList.stream().filter(item -> TeachTypeEnum.BISHOP.getCode().equals(item.getTeacherRole())).findFirst().
                     ifPresent(classGroupTeacherMapper -> classGroupResp.
                             setAssistant(userService.getById(classGroupTeacherMapper.getUserId()).getUsername()));
         }

mec-education/src/main/java/com/ym/mec/education/service/impl/StudentAttendanceServiceImpl.java

@@ -9,6 +9,7 @@ import com.ym.mec.education.base.PageResponse;
 import com.ym.mec.education.entity.ClassGroup;
 import com.ym.mec.education.entity.CourseSchedule;
 import com.ym.mec.education.entity.StudentAttendance;
+import com.ym.mec.education.enums.StudentAttendanceStatusEnum;
 import com.ym.mec.education.mapper.StudentAttendanceMapper;
 import com.ym.mec.education.req.StudentAttendanceReq;
 import com.ym.mec.education.resp.StudentAttendanceResq;
@@ -56,12 +57,12 @@ public class StudentAttendanceServiceImpl extends ServiceImpl<StudentAttendanceM
         //请假
         leaveWrapper.lambda().eq(true, StudentAttendance::getMusicGroupId, studentAttendanceReq.getMusicGroupId())
                 .eq(true, StudentAttendance::getClassGroupId, studentAttendanceReq.getClassGroupId())
-                .eq(true, StudentAttendance::getStatus, "LEAVE");
+                .eq(true, StudentAttendance::getStatus, StudentAttendanceStatusEnum.LEAVE.getCode());
         Integer leaveCount = count(leaveWrapper);
         //正常
         normalWrapper.lambda().eq(true, StudentAttendance::getMusicGroupId, studentAttendanceReq.getMusicGroupId())
                 .eq(true, StudentAttendance::getClassGroupId, studentAttendanceReq.getClassGroupId())
-                .eq(true, StudentAttendance::getStatus, "NORMAL");
+                .eq(true, StudentAttendance::getStatus, StudentAttendanceStatusEnum.NORMAL.getCode());
         Integer normalCount = count(normalWrapper);
         page.getRecords().forEach(item ->{
             StudentAttendanceResq studentAttendanceResq = new StudentAttendanceResq();