Merge branch 'zx_online_update_1218' of http://git.dayaedu.com/yonge/cooleshow into test

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/CourseHomeworkController.java

@@ -86,6 +86,6 @@ public class CourseHomeworkController extends BaseController {
 	@GetMapping(value = "/studentList")
 	@PreAuthorize("@pcs.hasPermissions('homework/studentList')")
 	public HttpResponseResult<List<StudentCourseHomework>> studentList(Long homeworkId) {
-		return succeed(studentCourseHomeworkService.lambdaQuery().eq(StudentCourseHomework::getId, homeworkId).list());
+		return succeed(studentCourseHomeworkService.lambdaQuery().eq(StudentCourseHomework::getCourseHomeworkId, homeworkId).list());
 	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/CourseHomeworkDao.java

@@ -123,4 +123,6 @@ public interface CourseHomeworkDao extends BaseMapper<CourseHomework> {
 	List<CourseHomeworkVo> selectAbsenteeism(@Param("practiceRecord") List<Long> practiceRecord, @Param("studentId") Long studentId);
 
     List<HomeworkWrapper.GroupHomework> selectGroupHomeworkList(@Param("param") HomeworkWrapper.GroupHomeworkSearch query);
+
+	void updateSubmitNum(@Param("homeworkId") Long homeworkId);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseHomeworkServiceImpl.java

@@ -402,13 +402,8 @@ public class CourseHomeworkServiceImpl extends ServiceImpl<CourseHomeworkDao, Co
         boolean submitCourseHome = studentCourseHomeworkService
                 .submitCourseHome(courseHomeworkDetailVo, submitDto.getSubmit(),submitDto.getStudentId());
         if (submitCourseHome) {
-            CourseHomework courseHomework = this.getById(courseHomeworkDetailVo.getId());
-            if (courseHomework.getCompletedNum() == null) {
-                courseHomework.setCompletedNum(0);
-            }
-            courseHomework.setCompletedNum(courseHomework.getCompletedNum() + 1);
-            this.updateById(courseHomework);
-
+            // 更新作业提交人数
+            this.getBaseMapper().updateSubmitNum(courseHomeworkDetailVo.getId());
             try {
                 sendSubmitMessage(submitDto, courseHomeworkDetailVo);
             }catch (Exception e) {

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseGroupMapper.xml

@@ -1077,6 +1077,7 @@
                 AND cg.name_ LIKE concat('%',#{param.search},'%')
             </if>
         </where>
+        GROUP BY cg.id_ DESC
     </select>
     <select id="studentCourseGroup"
             resultType="com.yonge.cooleshow.biz.dal.wrapper.course.CourseGroupWrapper$StudentCourseGroupDto">
@@ -1117,7 +1118,7 @@
                 AND (cg.name_ LIKE concat('%',#{param.search},'%') OR su.username_ LIKE concat('%',#{param.search},'%'))
             </if>
         </where>
-        GROUP BY cg.id_
+        GROUP BY cg.id_ DESC
     </select>
 
     <update id="updateLockNum">

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseHomeworkMapper.xml

@@ -29,6 +29,10 @@
         , t.create_time_
         , t.update_time_
         </sql>
+    <update id="updateSubmitNum">
+        update course_homework set completed_num_ =
+        (select COUNT(1) from student_course_homework where course_homework_id_ = #{homeworkId}) WHERE id_ = #{homeworkId}
+    </update>
 
     <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo">
         SELECT
@@ -400,7 +404,7 @@
             resultType="com.yonge.cooleshow.biz.dal.wrapper.HomeworkWrapper$GroupHomework">
         select ch.id_ homeworkId,ch.course_schedule_id_ courseId,cs.class_num_ classNum,ch.content_ content,
                ch.completed_num_ completedNum,cg.pre_student_num_ studentNum,
-               COUNT(CASE WHEN sch.id_ IS NULL OR sch.teacher_replied_ IS NULL THEN NULL ELSE 1 END) repliedNum
+               COUNT(CASE WHEN sch.id_ IS NULL OR sch.teacher_replied_ IS NULL OR sch.teacher_replied_ = '' THEN NULL ELSE 1 END) repliedNum
         from course_homework ch
                  left join course_schedule cs ON cs.id_ = ch.course_schedule_id_
                  left join student_course_homework sch ON sch.course_homework_id_ = ch.id_