Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/ExtracurricularExercisesReplyService.java

@@ -66,5 +66,5 @@ public interface ExtracurricularExercisesReplyService extends BaseService<Long,
      * @return void
      */
     void exercisesSituationStatistics();
-    void exercisesSituationStatistics2();
+    void exercisesSituationStatistics2(String monday);
 }

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

@@ -283,9 +283,11 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void exercisesSituationStatistics2() {
+	public void exercisesSituationStatistics2(String monday) {
 		LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
-//		LocalDate nowDate = LocalDate.parse("2020-04-20", DateUtil.dateFormatter);
+		if(StringUtils.isNotBlank(monday)){
+			nowDate=LocalDate.parse(monday, DateUtil.dateFormatter);
+		}
 		LocalDate monDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
 		LocalDate sunDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue());
 

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

@@ -56,34 +56,19 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 			params.put("offset", pageInfo.getOffset());
 			dataList = studentExtracurricularExercisesSituationDao.findExercisesSituations(params);
 			long until = LocalDateTime.ofInstant(queryInfo.getMonday().toInstant(), DateUtil.zoneId).until(LocalDateTime.ofInstant(queryInfo.getSunday().toInstant(), DateUtil.zoneId), ChronoUnit.WEEKS);
-			if(Objects.isNull(queryInfo.getExistVipCourse())||Objects.isNull(queryInfo.getExistPracticeCourse())){
-				List<Integer> studentIds = dataList.stream().map(StudentExtracurricularExercisesSituation::getStudentId).collect(Collectors.toList());
-				Map<Integer, Long> studentVipCourseMap=new HashMap<>();
-				if(Objects.isNull(queryInfo.getExistVipCourse())){
-					List<Map<Integer, Long>> studentVipCoursesMaps = courseScheduleDao.countStudentVipCoursesWithDate(studentIds, queryInfo.getMonday(), queryInfo.getSunday(), GroupType.VIP);
-					studentVipCourseMap = MapUtil.convertIntegerMap(studentVipCoursesMaps);
-				}
 
-				Map<Integer, Long> studentPracticeCourseMap=new HashMap<>();
-				if(Objects.isNull(queryInfo.getExistPracticeCourse())){
-					List<Map<Integer, Long>> studentPracticeCoursesMaps = courseScheduleDao.countStudentPayPracticeCoursesWithDate(studentIds, queryInfo.getMonday(), queryInfo.getSunday());
-					studentPracticeCourseMap = MapUtil.convertIntegerMap(studentPracticeCoursesMaps);
-				}
-				for (StudentExercisesSituationDto exercisesSituationDto : dataList) {
-					if(Objects.isNull(queryInfo.getExistVipCourse())){
-						Long vipCourses=studentVipCourseMap.get(exercisesSituationDto.getStudentId());
-						exercisesSituationDto.setExistVipCourse(Objects.isNull(vipCourses)?0:vipCourses.intValue());
-					}
-					if(Objects.isNull(queryInfo.getExistPracticeCourse())){
-						Long practiceCourses=studentPracticeCourseMap.get(exercisesSituationDto.getStudentId());
-						exercisesSituationDto.setExistPracticeCourse(Objects.isNull(practiceCourses)?0:practiceCourses.intValue());
-					}
-					exercisesSituationDto.setExpectExercisesNum((int) until+1);
-				}
-			}else{
-				for (StudentExercisesSituationDto exercisesSituationDto : dataList) {
-					exercisesSituationDto.setExpectExercisesNum((int) until+1);
-				}
+			List<Integer> studentIds = dataList.stream().map(StudentExtracurricularExercisesSituation::getStudentId).collect(Collectors.toList());
+			List<Map<Integer, Long>> studentVipCoursesMaps = courseScheduleDao.countStudentVipCoursesWithDate(studentIds, queryInfo.getMonday(), queryInfo.getSunday(), GroupType.VIP);
+			Map<Integer, Long> studentVipCourseMap = MapUtil.convertIntegerMap(studentVipCoursesMaps);
+
+			List<Map<Integer, Long>> studentPracticeCoursesMaps = courseScheduleDao.countStudentPayPracticeCoursesWithDate(studentIds, queryInfo.getMonday(), queryInfo.getSunday());
+			Map<Integer, Long> studentPracticeCourseMap = MapUtil.convertIntegerMap(studentPracticeCoursesMaps);
+			for (StudentExercisesSituationDto exercisesSituationDto : dataList) {
+				Long vipCourses=studentVipCourseMap.get(exercisesSituationDto.getStudentId());
+				exercisesSituationDto.setExistVipCourse(Objects.isNull(vipCourses)?0:vipCourses.intValue());
+				Long practiceCourses=studentPracticeCourseMap.get(exercisesSituationDto.getStudentId());
+				exercisesSituationDto.setExistPracticeCourse(Objects.isNull(practiceCourses)?0:practiceCourses.intValue());
+				exercisesSituationDto.setExpectExercisesNum((int) until+1);
 			}
 		}
 		if (count == 0) {

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

@@ -169,6 +169,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         studentRepair.setRepairStatus(1);
         studentRepair.setUpdateTime(new Date());
         studentRepair.setDescription(description);
+        studentRepair.setFinishTime(new Date());
         studentRepairDao.update(studentRepair);
         log.info("操作人 :" + sysUser.getId());
     }

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

@@ -125,16 +125,13 @@
 			MAX(sees.id_) id_,
 			student_id_,
 			stu.username_ student_name_,
-			GROUP_CONCAT(tea.real_name_) teacher_name_,
+			GROUP_CONCAT(DISTINCT tea.real_name_ ORDER BY tea.id_) teacher_name_,
 			o.name_ organ_name_,
 			SUM( expect_exercises_num_ ) expect_exercises_num_,
 			SUM( actual_exercises_num_ ) actual_exercises_num_,
 			SUM( exercises_reply_num_ ) exercises_reply_num_,
 			SUM( exercises_message_num_ ) exercises_message_num_,
 			SUM( exercises_message_timely_num_ ) exercises_message_timely_num_
-			<if test="existVipCourse!=null">
-				,#{existVipCourse} exist_vip_course_
-			</if>
 		FROM
 			student_extracurricular_exercises_situation_ sees
 			LEFT JOIN sys_user stu ON stu.id_=sees.student_id_

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

@@ -173,7 +173,7 @@
 		SELECT tpo.*,su.real_name_,su.phone_ FROM tenant_payment_order tpo
 		LEFT JOIN sys_user su ON su.id_ = tpo.user_id_
         <include refid="queryPaymentOrder"/>
-		ORDER BY tpo.id_
+		ORDER BY tpo.id_ desc
 		<include refid="global.limit" />
 	</select>
 

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

@@ -53,4 +53,13 @@ public class ExtracurricularExercisesReplyController extends BaseController {
         }
         return succeed(extracurricularExercisesReplyService.findExtraExercises(queryInfo));
     }
+
+    @GetMapping("/exercisesSituationStatistics")
+    public HttpResponseResult exercisesSituationStatistics(){
+        String[] mondays=new String[]{"2020-03-30","2020-04-06","2020-04-13","2020-04-20","2020-04-27"};
+        for (String monday : mondays) {
+            extracurricularExercisesReplyService.exercisesSituationStatistics2(monday);
+        }
+        return succeed();
+    }
 }

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

@@ -214,7 +214,7 @@ public class TaskController extends BaseController {
 	//学生服务信息统计
 	@GetMapping("/exercisesSituationStatistics")
 	public void exercisesSituationStatistics(){
-		extracurricularExercisesReplyService.exercisesSituationStatistics2();
+		extracurricularExercisesReplyService.exercisesSituationStatistics2(null);
 	}
 
 	//更新学生运营指标