Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -16,6 +16,8 @@ public class CourseScheduleEndDto extends CourseSchedule {
 
     private String organName;
 
+    private String remark;
+
     private int isSignIn;
 
     private int isSignOut;
@@ -26,6 +28,14 @@ public class CourseScheduleEndDto extends CourseSchedule {
 
     private Date signOutTime;
 
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     public Date getSignInTime() {
         return signInTime;
     }

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

@@ -1,16 +1,15 @@
 package com.ym.mec.biz.dal.dto;
 
 
-import com.ym.mec.biz.dal.entity.ClassGroup;
-
 import java.util.Date;
-import java.util.List;
 
 public class StudentCourseHomeworkDto {
     private String phone;
 
     private String username;
 
+    private String subjectName;
+
     private String url;
 
     private Date createTime;
@@ -19,6 +18,14 @@ public class StudentCourseHomeworkDto {
 
     private Integer isView;
 
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
     public String getPhone() {
         return phone;
     }

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

@@ -2335,6 +2335,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                     result.setIsSignOut(Objects.isNull(teacherAttendance.getSignOutStatus())?3:teacherAttendance.getSignOutStatus().getCode());
                     result.setSignInTime(teacherAttendance.getSignInTime());
                     result.setSignOutTime(teacherAttendance.getSignOutTime());
+                    result.setRemark(teacherAttendance.getRemark());
                 }
                 Long studentNum = studentNumCourseMap.get(result.getId());
                 if (Objects.nonNull(studentNum)) {

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

@@ -364,9 +364,16 @@ public class StudentManageServiceImpl implements StudentManageService {
     @Override
     public Map<String, Integer> sumStudentAttendance(Integer courseScheduleId) {
         Map<String, Integer> sum = new HashMap<>(5);
-        sum.put("studentNum",scheduleStudentPaymentDao.countStudentNum(courseScheduleId));
-        sum.put("signInNum",studentManageDao.countStudentSignInNum(courseScheduleId,"NORMAL"));
-        sum.put("leaveNum",studentManageDao.countStudentSignInNum(courseScheduleId,"LEAVE"));
+        Integer studentNum = scheduleStudentPaymentDao.countStudentNum(courseScheduleId);
+        sum.put("studentNum",studentNum);
+        Integer signInNum = studentManageDao.countStudentSignInNum(courseScheduleId, "NORMAL");
+        sum.put("signInNum",signInNum);
+        Integer leaveNum = studentManageDao.countStudentSignInNum(courseScheduleId, "LEAVE");
+        sum.put("leaveNum",leaveNum);
+        studentNum = studentNum==null?0:studentNum;
+        signInNum = signInNum==null?0:signInNum;
+        leaveNum = leaveNum==null?0:leaveNum;
+        sum.put("truantNum",studentNum-signInNum-leaveNum);
         sum.put("homeworkNum",studentManageDao.countHomeworkNum(courseScheduleId));
         sum.put("repliedNum",studentManageDao.countRepliedNum(courseScheduleId));
         return sum;

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

@@ -360,6 +360,7 @@
             AND cg.name_ LIKE CONCAT('%',#{search},'%')
         </if>
     </select>
+
     <select id="findNoClassSubjects" resultMap="ClassGroup">
         SELECT cg.* FROM class_group cg LEFT JOIN class_group_relation cgr ON cgr.sub_class_group_id_=cg.id_
         WHERE cg.music_group_id_=#{musicGroupId} AND cg.type_ = 'NORMAL'

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

@@ -829,9 +829,9 @@
 
     <sql id="queryStudentCourseScheduleRecordCondition">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-            AND cssp.user_id_=#{userId}
+            cssp.user_id_=#{userId}
             AND cs.status_ != 'NOT_START'
+            AND cs.del_flag_ = 0
             <if test="teachMode!=null and teachMode!=''">
                 AND cs.teach_mode_=#{teachMode}
             </if>

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

@@ -271,16 +271,19 @@
     <resultMap id="StudentCourseHomeworkDtoMap" type="com.ym.mec.biz.dal.dto.StudentCourseHomeworkDto">
         <result column="username_" property="username"/>
         <result column="phone_" property="phone"/>
+        <result column="subject_name_" property="subjectName"/>
         <result column="attachments_" property="url"/>
         <result column="is_replied_" property="isReplied"/>
         <result column="is_view_" property="isView"/>
         <result column="create_time_" property="createTime"/>
     </resultMap>
     <select id="findStudentCourseHomeworks" resultMap="StudentCourseHomeworkDtoMap">
-        SELECT sch.attachments_,sch.is_replied_,sch.is_view_,sch.create_time_,su.username_,su.phone_
+        SELECT sch.attachments_,sch.is_replied_,sch.is_view_,sch.create_time_,su.username_,su.phone_,s.name_ subject_name_
         FROM course_schedule_student_payment cssp
         LEFT JOIN student_course_homework sch ON sch.course_schedule_id_ = cssp.course_schedule_id_
         LEFT JOIN sys_user su ON cssp.user_id_ = su.id_
+        LEFT JOIN student_registration sr ON cssp.music_group_id_ = sr.music_group_id_ AND cssp.user_id_ = sr.user_id_
+        LEFT JOIN `subject` s ON s.id_ = sr.actual_subject_id_
         WHERE cssp.course_schedule_id_ = #{search}
         ORDER BY sch.id_ DESC
         <include refid="global.limit"/>