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

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

@@ -11,6 +11,7 @@ import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -55,10 +56,14 @@ public class ExtracurricularExercisesReplyController extends BaseController {
     }
 
     @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) {
+    public HttpResponseResult exercisesSituationStatistics(String monday){
+        if(StringUtils.isNotBlank(monday)){
             extracurricularExercisesReplyService.exercisesSituationStatistics2(monday);
+        }else{
+            String[] mondays=new String[]{"2020-03-30","2020-04-06","2020-04-13","2020-04-20","2020-04-27"};
+            for (String mondayStr : mondays) {
+                extracurricularExercisesReplyService.exercisesSituationStatistics2(mondayStr);
+            }
         }
         return succeed();
     }