update:学生考勤优化

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

@@ -4,7 +4,9 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.common.enums.BaseEnum;
+
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -148,6 +150,8 @@ public class CourseSchedule {
 	private Integer isLock;
 
 	private Integer organId;
+	
+	private Organization organization = new Organization();
 
 	private YesOrNoEnum isCallNames;
 
@@ -191,6 +195,14 @@ public class CourseSchedule {
 		this.organId = organId;
 	}
 
+	public Organization getOrganization() {
+		return organization;
+	}
+
+	public void setOrganization(Organization organization) {
+		this.organization = organization;
+	}
+
 	public int getIsSignIn() {
 		return isSignIn;
 	}

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

@@ -31,6 +31,8 @@ public class StudentAttendance {
 	/** 课程计划 */
 	@ApiModelProperty(value = "课程计划",required = false)
 	private Long courseScheduleId;
+	
+	private CourseSchedule courseSchedule = new CourseSchedule();
 
 	/** 课程计划 */
 	@ApiModelProperty(value = "课程计划",required = false)
@@ -203,6 +205,14 @@ public class StudentAttendance {
 		return this.courseScheduleId;
 	}
 			
+	public CourseSchedule getCourseSchedule() {
+		return courseSchedule;
+	}
+
+	public void setCourseSchedule(CourseSchedule courseSchedule) {
+		this.courseSchedule = courseSchedule;
+	}
+
 	public void setUserId(Integer userId){
 		this.userId = userId;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentAttendanceQueryInfo.java

@@ -16,6 +16,9 @@ public class StudentAttendanceQueryInfo extends QueryInfo {
 
     @ApiModelProperty(value = "乐团ID")
     private Long musicGroupId;
+    
+    @ApiModelProperty(value = "课程组类型")
+    private String groupType;
 
     @ApiModelProperty(value = "班级ID")
     private Long classGroupId;
@@ -61,7 +64,15 @@ public class StudentAttendanceQueryInfo extends QueryInfo {
         this.musicGroupId = musicGroupId;
     }
 
-    public Long getClassGroupId() {
+    public String getGroupType() {
+		return groupType;
+	}
+
+	public void setGroupType(String groupType) {
+		this.groupType = groupType;
+	}
+
+	public Long getClassGroupId() {
         return classGroupId;
     }
 

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

@@ -1,11 +1,64 @@
 package com.ym.mec.biz.service.impl;
 
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.util.CollectionUtils;
+
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.*;
-import com.ym.mec.biz.dal.dto.*;
-import com.ym.mec.biz.dal.entity.*;
-import com.ym.mec.biz.dal.enums.*;
+import com.ym.mec.biz.dal.dao.ClassGroupDao;
+import com.ym.mec.biz.dal.dao.ClassGroupStudentMapperDao;
+import com.ym.mec.biz.dal.dao.CourseScheduleDao;
+import com.ym.mec.biz.dal.dao.CourseScheduleStudentPaymentDao;
+import com.ym.mec.biz.dal.dao.CourseScheduleTeacherSalaryDao;
+import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
+import com.ym.mec.biz.dal.dao.MusicGroupQuitDao;
+import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
+import com.ym.mec.biz.dal.dao.SchoolDao;
+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.dto.CourseScheduleResponse;
+import com.ym.mec.biz.dal.dto.ExportStudentAttendanceDto;
+import com.ym.mec.biz.dal.dto.StudentAttendanceDto;
+import com.ym.mec.biz.dal.dto.StudentAttendanceResponse;
+import com.ym.mec.biz.dal.dto.StudentAttendanceStatisticsResponse;
+import com.ym.mec.biz.dal.dto.StudentAttendanceStatusCountDto;
+import com.ym.mec.biz.dal.dto.StudentPersonalAttendanceDto;
+import com.ym.mec.biz.dal.dto.StudentStatusCountUtilEntity;
+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;
+import com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum;
+import com.ym.mec.biz.dal.enums.TeachModeEnum;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
 import com.ym.mec.biz.dal.page.ExportStudentAttendanceQueryInfo;
 import com.ym.mec.biz.dal.page.StudentAttendanceQueryInfo;
@@ -20,20 +73,6 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.transaction.interceptor.TransactionalProxy;
-import org.springframework.util.CollectionUtils;
-
-import java.util.*;
-import java.util.stream.Collectors;
 
 @Service
 public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentAttendance> implements StudentAttendanceService {
@@ -620,17 +659,18 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
             dataList = studentAttendanceDao.findStudentAttendance(params);
-            CourseSchedule schedule = courseScheduleDao.get(Long.parseLong(queryInfo.getSearch()));
-            if(schedule.getGroupType() == GroupType.MUSIC){
-                Set<Integer> collect = dataList.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
-                Map<Integer,String> paymentStatusMap = MapUtil.convertIntegerMap(musicGroupPaymentCalenderDao.queryUserCoursePaymentStatus(collect,schedule.getMusicGroupId()));
-                dataList.forEach(e -> {
-                    e.setPaymentStatus(paymentStatusMap.get(e.getUserId()));
-                });
+            if (dataList == null) {
+                dataList = new ArrayList<>();
+            }
+            
+            for(StudentAttendance sa : dataList){
+            	if(sa.getGroupType() == GroupType.MUSIC){
+            		Set<Integer> userId = new HashSet<Integer>();
+            		userId.add(sa.getUserId());
+            		Map<Integer,String> paymentStatusMap = MapUtil.convertIntegerMap(musicGroupPaymentCalenderDao.queryUserCoursePaymentStatus(userId,sa.getMusicGroupId()));
+            		sa.setPaymentStatus(paymentStatusMap.get(sa.getUserId()));
+                }
             }
-        }
-        if (count == 0) {
-            dataList = new ArrayList<>();
         }
         pageInfo.setRows(dataList);
         return pageInfo;

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

@@ -27,6 +27,15 @@
         <result column="current_class_times_" property="currentClassTimes"/>
         <result column="current_class_times_" property="currentClassTimes"/>
         <result column="current_schedule_id_" property="currentScheduleId"/>
+        <result column="organ_name_" property="courseSchedule.organization.name"/>
+        <result column="teacher_name_" property="courseSchedule.teacherName"/>
+        <result column="teach_mode_" property="courseSchedule.teachMode"/>
+        <result column="course_type_" property="courseSchedule.type"/>
+        <result column="current_schedule_id_" property="courseSchedule.id"/>
+        <result column="course_schedule_name_" property="courseSchedule.name"/>
+        <result column="class_date_" property="courseSchedule.classDate"/>
+        <result column="start_class_time_" property="courseSchedule.startClassTime"/>
+        <result column="end_class_time_" property="courseSchedule.endClassTime"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -472,25 +481,58 @@
             </foreach>
             GROUP BY sa.course_schedule_id_
     </select>
+    
     <select id="findStudentAttendance" resultMap="StudentAttendance">
-        SELECT cssp.user_id_,sa.*,su.username_,su.phone_,IF(s.name_ IS NULL,s1.name_,s.name_) subject_name_,su.avatar_
-        FROM course_schedule_student_payment cssp
-        LEFT JOIN student_attendance sa ON cssp.course_schedule_id_ = sa.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
-        LEFT JOIN sys_user su ON cssp.user_id_ = su.id_
-        LEFT JOIN class_group cg ON cg.id_ = cssp.class_group_id_ AND cg.group_type_ = 'VIP'
-        LEFT JOIN student_registration sr ON sr.user_id_ = cssp.user_id_ AND cssp.music_group_id_ = sr.music_group_id_
-        LEFT JOIN `subject` s ON s.id_ = cg.subject_id_list_
-        LEFT JOIN `subject` s1 ON s1.id_ = sr.actual_subject_id_
-        LEFT JOIN class_group_student_mapper cgsm ON cssp.class_group_id_=cgsm.class_group_id_ AND cssp.user_id_=cgsm.user_id_
-        WHERE cssp.course_schedule_id_ = #{search}
+        SELECT sa.*,su.username_,su.phone_,su.avatar_,cs.teach_mode_,cs.type_ course_type_,o.name_ organ_name_,tu.real_name_ teacher_name_,cs.name_ course_schedule_name_,
+        cs.class_date_ ,cs.start_class_time_,cs.end_class_time_ 
+        FROM student_attendance sa
+        LEFT JOIN sys_user su ON sa.user_id_ = su.id_
+        left join course_schedule cs on cs.id_ = sa.course_schedule_id_
+        left join sys_user tu on tu.id_ = cs.actual_teacher_id_
+        left join organization o on o.id_ = cs.organ_id_
+        <where>
+        	<if test="courseScheduleId != null">
+        		sa.course_schedule_id_ = #{courseScheduleId}
+        	</if>
+        	<if test="search != null">
+        		sa.course_schedule_id_ = #{search}
+        	</if>
+        	<if test="studentID != null">
+        		and sa.user_id_ = #{studentID}
+        	</if>
+        	<if test="status != null">
+        		and sa.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+        	</if>
+        	<if test="groupType != null">
+        		and sa.group_type_ = #{groupType}
+        	</if>
+        	<if test="musicGroupId != null">
+        		and sa.music_group_id_ = #{musicGroupId}
+        	</if>
+        </where>
         ORDER BY sa.id_ DESC
         <include refid="global.limit"/>
     </select>
+    
     <select id="countStudentAttendance" resultType="java.lang.Integer">
-        SELECT COUNT(cssp.id_)
-        FROM course_schedule_student_payment cssp
-        LEFT JOIN class_group_student_mapper cgsm ON cssp.class_group_id_=cgsm.class_group_id_ AND cssp.user_id_=cgsm.user_id_
-        WHERE course_schedule_id_ = #{search}
+        SELECT COUNT(sa.id_) FROM student_attendance sa
+        <where>
+        	<if test="courseScheduleId != null">
+        		sa.course_schedule_id_ = #{courseScheduleId}
+        	</if>
+        	<if test="studentID != null">
+        		and sa.user_id_ = #{studentID}
+        	</if>
+        	<if test="status != null">
+        		and sa.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+        	</if>
+        	<if test="groupType != null">
+        		and sa.group_type_ = #{groupType}
+        	</if>
+        	<if test="musicGroupId != null">
+        		and sa.music_group_id_ = #{musicGroupId}
+        	</if>
+        </where>
     </select>
     <select id="findByCourseId" resultMap="StudentAttendance">
         SELECT * FROM student_attendance WHERE course_schedule_id_=#{courseId}

mec-web/src/main/java/com/ym/mec/web/controller/education/EduStudentStudentController.java

@@ -1,16 +1,17 @@
 package com.ym.mec.web.controller.education;
 
-import com.ym.mec.biz.service.StudentAttendanceService;
-import com.ym.mec.biz.service.StudentRegistrationService;
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.ym.mec.biz.dal.page.StudentAttendanceQueryInfo;
+import com.ym.mec.biz.service.StudentAttendanceService;
+import com.ym.mec.biz.service.StudentRegistrationService;
+import com.ym.mec.common.controller.BaseController;
+
 /**
  * @Author Joburgess
  * @Date 2020.09.14
@@ -25,7 +26,7 @@ public class EduStudentStudentController extends BaseController {
 
     @ApiOperation(value = "获取某节课学生签到列表")
     @GetMapping("eduStudentAttendance/findStudentAttendance")
-    public Object findStudentAttendance(QueryInfo queryInfo){
+    public Object findStudentAttendance(StudentAttendanceQueryInfo queryInfo){
         return succeed(studentAttendanceService.findStudentAttendance(queryInfo));
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/student/StudentAttendanceController.java

@@ -1,5 +1,16 @@
 package com.ym.mec.web.controller.student;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+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 com.ym.mec.biz.dal.dto.StudentAttendanceDto;
 import com.ym.mec.biz.dal.page.CourseScheduleQueryInfo;
 import com.ym.mec.biz.dal.page.StudentAttendanceQueryInfo;
@@ -7,12 +18,6 @@ import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.StudentAttendanceService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.exception.BizException;
-import com.ym.mec.common.page.QueryInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
 
 @RequestMapping("studentAttendance")
 @Api(tags = "学生考勤服务")
@@ -49,7 +54,7 @@ public class StudentAttendanceController extends BaseController {
     @ApiOperation(value = "获取某节课学生签到列表")
     @GetMapping("/findStudentAttendance")
     @PreAuthorize("@pcs.hasPermissions('studentAttendance/findStudentAttendance')")
-    public Object findStudentAttendance(QueryInfo queryInfo){
+    public Object findStudentAttendance(StudentAttendanceQueryInfo queryInfo){
         return succeed(studentAttendanceService.findStudentAttendance(queryInfo));
     }