Merge branch '20220818' into master_saas

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

@@ -1,7 +1,5 @@
 package com.ym.mec.biz.dal.page;
 
-import java.util.Date;
-
 import com.ym.mec.common.page.QueryInfo;
 
 public class StudentExerciseMusicGroupQueryInfo extends QueryInfo {
@@ -10,9 +8,9 @@ public class StudentExerciseMusicGroupQueryInfo extends QueryInfo {
 	
 	private String musicGroupName;
 	
-	private Date mondayDate;
+	private String mondayDate;
 	
-	private Date sundayDate;
+	private String sundayDate;
 
 	public Integer getTeacherId() {
 		return teacherId;
@@ -30,19 +28,19 @@ public class StudentExerciseMusicGroupQueryInfo extends QueryInfo {
 		this.musicGroupName = musicGroupName;
 	}
 
-	public Date getMondayDate() {
+	public String getMondayDate() {
 		return mondayDate;
 	}
 
-	public void setMondayDate(Date mondayDate) {
+	public void setMondayDate(String mondayDate) {
 		this.mondayDate = mondayDate;
 	}
 
-	public Date getSundayDate() {
+	public String getSundayDate() {
 		return sundayDate;
 	}
 
-	public void setSundayDate(Date sundayDate) {
+	public void setSundayDate(String sundayDate) {
 		this.sundayDate = sundayDate;
 	}
 }

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

@@ -1,10 +1,14 @@
 package com.ym.mec.teacher.controller;
 
-import java.util.Objects;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.Objects;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,6 +24,7 @@ import com.ym.mec.biz.service.StudentExtracurricularExercisesSituationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.util.date.DateUtil;
 
 @RequestMapping("studentExtracurricularExercisesSituation")
 @Api(tags = "课外训练统计服务")
@@ -44,6 +49,19 @@ public class StudentExtracurricularExercisesSituationController extends BaseCont
             return failed(HttpStatus.FORBIDDEN,"请登录");
         }
         queryInfo.setTeacherId(sysUser.getId());
+
+        Date date = new Date();
+        LocalDate nowDate = LocalDateTime.ofInstant(date.toInstant(), DateUtil.zoneId).toLocalDate();
+        if(Objects.isNull(date)){
+            nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
+        }
+
+        LocalDate monDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
+        LocalDate sunDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue());
+        
+        queryInfo.setMondayDate(monDayDate.toString());
+        queryInfo.setSundayDate(sunDayDate.toString());
+        
         return succeed(studentExtracurricularExercisesSituationService.queryStudentExerciseMusicGroupList(queryInfo));
     }