乐团档案老师签退批量修改年级

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentAttendanceViewDto.java

@@ -30,6 +30,9 @@ public class StudentAttendanceViewDto {
     @ApiModelProperty(value = "科目名称",required = false)
     private String subjectName;
 
+    @ApiModelProperty(value = "年级",required = false)
+    private Integer currentGradeNum;
+
     @ApiModelProperty(value = "学生姓名",required = false)
     private String userName;
 
@@ -47,6 +50,14 @@ public class StudentAttendanceViewDto {
 
     private Boolean beMerged;
 
+    public Integer getCurrentGradeNum() {
+        return currentGradeNum;
+    }
+
+    public void setCurrentGradeNum(Integer currentGradeNum) {
+        this.currentGradeNum = currentGradeNum;
+    }
+
     public Boolean getBeMerged() {
         return beMerged;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentAttendance.java

@@ -44,6 +44,10 @@ public class StudentAttendance {
 	private Integer userId;
 
 	/**  */
+	@ApiModelProperty(value = "年级",required = false)
+	private Integer currentGradeNum;
+
+	/**  */
 	@ApiModelProperty(value = "学生姓名",required = false)
 	private String username;
 
@@ -92,6 +96,14 @@ public class StudentAttendance {
 
 	private int normalRemind;
 
+	public Integer getCurrentGradeNum() {
+		return currentGradeNum;
+	}
+
+	public void setCurrentGradeNum(Integer currentGradeNum) {
+		this.currentGradeNum = currentGradeNum;
+	}
+
 	public int getNormalRemind() {
 		return normalRemind;
 	}

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

@@ -12,6 +12,7 @@ import java.util.stream.Collectors;
 
 import com.alibaba.fastjson.JSON;
 import com.ym.mec.biz.dal.dto.*;
+import com.ym.mec.biz.dal.entity.*;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,14 +38,6 @@ import com.ym.mec.biz.dal.dao.StudentAttendanceDao;
 import com.ym.mec.biz.dal.dao.StudentDao;
 import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.dao.TeacherAttendanceDao;
-import com.ym.mec.biz.dal.entity.ClassGroup;
-import com.ym.mec.biz.dal.entity.ClassGroupStudentMapper;
-import com.ym.mec.biz.dal.entity.CourseSchedule;
-import com.ym.mec.biz.dal.entity.CourseScheduleTeacherSalary;
-import com.ym.mec.biz.dal.entity.School;
-import com.ym.mec.biz.dal.entity.StudentAttendance;
-import com.ym.mec.biz.dal.entity.SysConfig;
-import com.ym.mec.biz.dal.entity.TeacherAttendance;
 import com.ym.mec.biz.dal.enums.CourseStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
@@ -160,7 +153,14 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
         int remindNum = studentAttendanceDao.countNormalRemindNum(courseScheduleId);
         studentAttendanceDao.deleteStudentAttendancesByCourse(courseScheduleId);
         int classTimes = courseScheduleDao.countClassTimes(courseSchedule.getClassGroupId().longValue(), courseSchedule.getStartClassTime());
+        List<Student> students = new ArrayList<>();
         studentAttendances.forEach(studentAttendance -> {
+            if(studentAttendance.getCurrentGradeNum() != null){
+                Student student = new Student();
+                student.setUserId(studentAttendance.getUserId());
+                student.setCurrentGradeNum(studentAttendance.getCurrentGradeNum());
+                students.add(student);
+            }
             studentAttendance.setTeacherId(sysUser.getId());
             studentAttendance.setCurrentClassTimes(classTimes + 1);
             StudentAttendance studentAttendanceInfo = studentAttendanceDao.getStudentAttendanceInfo(studentAttendance);
@@ -200,6 +200,9 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
                         YesOrNoEnum.NO.getCode());
             }
         });
+        if(students.size() > 0){
+            studentDao.batchUpdate(students);
+        }
         //获取正常签到的学生信息
 //        List<StudentAttendance> normal = studentAttendances.stream().filter(studentAttendance -> studentAttendance.getStatus() == StudentAttendanceStatusEnum.NORMAL).collect(Collectors.toList());
 //        if (normal != null && normal.size() > 0) {

mec-biz/src/main/resources/config/mybatis/ClassGroupStudentMapperMapper.xml

@@ -197,10 +197,12 @@
             su.username_,
             su.avatar_,
             cssp.be_merged_,
+            st.current_grade_num_,
             IF(sa.status_ IS NULL,'TRUANT',sa.status_) status_
         FROM
             course_schedule_student_payment cssp
             LEFT JOIN sys_user su ON cssp.user_id_ = su.id_
+            LEFT JOIN student st ON st.user_id_ = su.id_
             LEFT JOIN student_attendance sa ON cssp.course_schedule_id_ = sa.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
         WHERE
             cssp.course_schedule_id_ =#{courseScheduleId}

mec-biz/src/main/resources/config/mybatis/StudentAttendanceMapper.xml

@@ -177,6 +177,7 @@
         <result property="groupType" column="group_type_"/>
         <result property="subjectId" column="subject_id_"/>
         <result property="subjectName" column="subject_name_"/>
+        <result property="currentGradeNum" column="current_grade_num_"/>
         <result property="avatar" column="avatar_"/>
         <result property="phone" column="phone_"/>
         <result property="beMerged" column="be_merged_"/>

mec-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -191,6 +191,9 @@
                 <if test="item.subjectIdList != null">
                     subject_id_list_ = #{item.subjectIdList},
                 </if>
+                <if test="item.currentGradeNum != null">
+                    current_grade_num_=#{item.currentGradeNum},
+                </if>
                 <if test="item.serviceTag != null">
                     service_tag_ = #{item.serviceTag},
                 </if>

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherAttendanceController.java

@@ -54,6 +54,8 @@ public class TeacherAttendanceController extends BaseController {
     private CourseScheduleService courseScheduleService;
     @Autowired
     private MusicGroupService musicGroupService;
+    @Autowired
+    private OrganizationService organizationService;
 
     @ApiOperation(value = "新增教师签到")
     @PostMapping("/add")
@@ -74,6 +76,17 @@ public class TeacherAttendanceController extends BaseController {
         return succeed(classGroupService.findAttendanceStudentByCourse(courseScheduleId));
     }
 
+    @ApiOperation(value = "获取用户所在分部的年级列表）")
+    @GetMapping("/getGradeList")
+    public HttpResponseResult<Map<Integer,String>> getGradeList(Long courseScheduleId) {
+        CourseSchedule courseSchedule = courseScheduleService.get(courseScheduleId);
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            return failed("请重新登录");
+        }
+        return succeed(organizationService.getGradeList(courseSchedule.getOrganId()));
+    }
+
     @ApiOperation(value = "点名")
     @PostMapping("/addStudentAttendances")
     @AuditLogAnnotation(operateName = "点名")