Merge branch 'master' into review-zjh

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

@@ -3348,11 +3348,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             teacherAttendanceDao.updateViPSignOutStatus(courseScheduleIdList.stream().map(a -> a.toString()).collect(Collectors.joining(",")));
         }*/
 
-//		try {
-//			practiceGroupService.practiceGroupRenewRemind();
-//		} catch (Exception e) {
-//			e.printStackTrace();
-//		}
+		try {
+			practiceGroupService.practiceGroupRenewRemind();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 
 		return true;
     }

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

@@ -160,7 +160,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 			dataList = extracurricularExercisesReplyDao.findStudentHomeworkDetailsInTimeZone(params);
 			Map<String, List<StudentServiceDetailDto>> weekHomeworks=new HashMap<>();
 			for (StudentServiceDetailDto studentServiceDetailDto : dataList) {
-				LocalDate homeworkCreateTime = LocalDateTime.ofInstant(studentServiceDetailDto.getHomeworkCreateTime().toInstant(), DateUtil.zoneId).toLocalDate();
+				LocalDate homeworkCreateTime = LocalDateTime.ofInstant(studentServiceDetailDto.getCourseStartTime().toInstant(), DateUtil.zoneId).toLocalDate();
 				String mondayStr = homeworkCreateTime.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue()).toString();
 				if(!weekHomeworks.containsKey(mondayStr)){
 					weekHomeworks.put(mondayStr, new ArrayList<>());

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

@@ -185,10 +185,10 @@ public class StudentServeServiceImpl implements StudentServeService {
                 int exercisesMessageNum=0;
                 int exercisesMessageTimelyNum=0;
                 for (ExtracurricularExercisesReply studentHomework : studentExercises) {
-                    if(!YesOrNoEnum.YES.equals(studentHomework.getStatus())){
+                    if(!new Integer(1).equals(studentHomework.getStatus())){
                         continue;
                     }
-                    if(!YesOrNoEnum.YES.equals(studentHomework.getIsReplied())){
+                    if(!new Integer(1).equals(studentHomework.getIsReplied())){
                         continue;
                     }
                     exercisesMessageNum+=1;

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

@@ -413,7 +413,7 @@
 			NULL group_id_,
 			NULL group_type_,
 			NULL group_name_,
-			NULL course_start_time_,
+			ee.create_time_ course_start_time_,
 			NULL course_end_time_,
 			ee.content_,
 			ee.create_time_ homework_create_time_,
@@ -453,7 +453,7 @@
 		LEFT JOIN course_schedule cs ON cs.id_=ch.course_schedule_id_
 		LEFT JOIN sys_user tea ON cs.actual_teacher_id_=tea.id_
 		WHERE
-			sch.user_id_=#{studentId} AND DATE_FORMAT( sch.create_time_, '%Y-%m-%d' ) BETWEEN #{monday} AND #{sunday})
+			sch.user_id_=#{studentId} AND cs.class_date_ BETWEEN #{monday} AND #{sunday})
 		ORDER BY homework_create_time_ DESC
 		<include refid="global.limit"/>
 	</select>
@@ -471,8 +471,9 @@
 				sch.id_
 			FROM
 				student_course_homework sch
+				LEFT JOIN course_schedule cs ON cs.id_=sch.course_schedule_id_
 			WHERE
-				sch.user_id_=#{studentId} AND DATE_FORMAT( sch.create_time_, '%Y-%m-%d' ) BETWEEN #{monday} AND #{sunday})
+				sch.user_id_=#{studentId} AND cs.class_date_ BETWEEN #{monday} AND #{sunday})
 		) t
 	</select>
 	<select id="getStudentExercisesWithTimeZone" resultMap="ExtracurricularExercisesReply">

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

@@ -160,7 +160,7 @@
 				AND (stu.id_=#{search} OR stu.username_ LIKE CONCAT('%', #{search}, '%'))
 			</if>
 			<if test="organIdList != null">
-				AND FIND_IN_SET(stu.organ_id_,#{organIdList})
+				AND FIND_IN_SET(t.organ_id_,#{organIdList})
 			</if>
 			<if test="existVipCourse!=null and existVipCourse==1">
 				AND EXISTS (SELECT cssp.id_ FROM course_schedule_student_payment cssp LEFT JOIN course_schedule cs ON cs.id_=cssp.course_schedule_id_ WHERE cssp.user_id_=sees.student_id_ AND cssp.group_type_='VIP' AND class_date_ BETWEEN #{monday} AND #{sunday})
@@ -227,7 +227,7 @@
 				AND (stu.id_=#{search} OR stu.username_ LIKE CONCAT('%', #{search}, '%'))
 			</if>
 			<if test="organIdList != null">
-				AND FIND_IN_SET(stu.organ_id_, #{organIdList})
+				AND FIND_IN_SET(t.organ_id_, #{organIdList})
 			</if>
 			<if test="existVipCourse!=null and existVipCourse==1">
 				AND EXISTS (SELECT cssp.id_ FROM course_schedule_student_payment cssp LEFT JOIN course_schedule cs ON cs.id_=cssp.course_schedule_id_ WHERE cssp.user_id_=sees.student_id_ AND cssp.group_type_='VIP' AND class_date_ BETWEEN #{monday} AND #{sunday})

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

@@ -386,7 +386,7 @@
     <sql id="queryMusicGroupStudentSql">
         <where>
             <if test="search != null and search != ''">
-                AND (su.username_ like CONCAT("%",#{search},"%") OR su.phone_ like CONCAT("%",#{search},"%"))
+                AND (su.id_ = #{search} OR su.username_ like CONCAT("%",#{search},"%") OR su.phone_ like CONCAT("%",#{search},"%"))
             </if>
             <if test="subjectId != null">
                 AND sr.actual_subject_id_ = #{subjectId}

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

@@ -400,6 +400,7 @@
             student s
             LEFT JOIN course_schedule_student_payment cssp ON cssp.user_id_ = s.user_id_
             LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
+            AND cs.group_type_ IN ('VIP', 'PRACTICE')
             AND CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) > #{monday}
         WHERE
             s.service_tag_ = 1

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -113,7 +113,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "老师编号", "老师姓名", "课程编号", "课程名称", "上课日期",
                     "课程开始时间","课程结束时间","课程类型","签到时间","签到状态","签退时间","签退状态","备注"}, new String[]{
                     "organName", "teacherId", "teacherName", "courseScheduleId", "courseScheduleName", "classDate",
-                    "startClassTime", "endClassTime", "courseScheduleType", "signInTime", "signInStatus", "signOutTime", "signOutStatus",
+                    "startClassTime", "endClassTime", "courseScheduleType.msg", "signInTime", "signInStatus.msg", "signOutTime", "signOutStatus.msg",
                     "remark"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");

mec-web/src/main/java/com/ym/mec/web/controller/StudentExtracurricularExercisesSituationController.java

@@ -13,6 +13,7 @@ import com.ym.mec.biz.service.StudentExtracurricularExercisesSituationService;
 import com.ym.mec.biz.service.StudentServeService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.util.date.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -22,6 +23,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.DayOfWeek;
+import java.time.LocalDate;
 import java.util.Arrays;
 import java.util.List;
 
@@ -94,13 +97,19 @@ public class StudentExtracurricularExercisesSituationController extends BaseCont
     }
 
     @GetMapping("/exercisesSituationStatistics")
-    public HttpResponseResult exercisesSituationStatistics(String monday){
+    public HttpResponseResult exercisesSituationStatistics(String startDay, String monday){
         if(StringUtils.isNotBlank(monday)){
             studentServeService.exercisesSituationStatistics(monday);
-        }else{
-            String[] mondays=new String[]{"2020-05-13","2020-05-20","2020-05-27"};
-            for (String mondayStr : mondays) {
-                studentServeService.exercisesSituationStatistics(mondayStr);
+        }
+        if(StringUtils.isNotBlank(startDay)){
+            LocalDate date=LocalDate.now();
+            if(StringUtils.isNotBlank(startDay)){
+                date= LocalDate.parse(startDay, DateUtil.dateFormatter);
+            }
+            while (date.isBefore(LocalDate.now())){
+                date = date.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
+                studentServeService.exercisesSituationStatistics(date.format(DateUtil.dateFormatter));
+                date = date.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue()).plusDays(1);
             }
         }
         return succeed();