Forráskód Böngészése

统计报表改为日期范围查询

yanliming 1 éve
szülő
commit
274513323a

+ 7 - 5
web/src/main/java/com/jpsoft/employment/modules/base/controller/ReportController.java

@@ -64,7 +64,7 @@ public class ReportController {
 
     @ApiOperation(value = "日报表")
     @RequestMapping(value = "dailyReport", method = RequestMethod.POST)
-    public MessageResult<Object> dailyReport(String date,@RequestParam(value = "exportFlag", defaultValue = "false") Boolean exportFlag) {
+    public MessageResult<Object> dailyReport(String dateRange,@RequestParam(value = "exportFlag", defaultValue = "false") Boolean exportFlag) {
 
         MessageResult<Object> msgResult = new MessageResult<>();
 
@@ -74,9 +74,10 @@ public class ReportController {
 
             Map<String, Object> searchParams1 = new HashMap<>();
 
-            if (StringUtils.isNotEmpty(date)) {
-                String startTime = date + " 00:00:00";
-                String endTime = date + " 23:59:59";
+            if (StringUtils.isNotEmpty(dateRange)) {
+                String[] date = dateRange.split(",");
+                String startTime = date[0] + " 00:00:00";
+                String endTime = date[1] + " 23:59:59";
                 searchParams.put("startTime", startTime);
                 searchParams.put("endTime", endTime);
 
@@ -143,7 +144,8 @@ public class ReportController {
             //今日报名人数
             searchParams = new HashMap<>();
 
-            if (StringUtils.isNotEmpty(date)) {
+            if (StringUtils.isNotEmpty(dateRange)) {
+                String[] date = dateRange.split(",");
                 String startTime = date + " 00:00:00";
                 String endTime = date + " 23:59:59";
                 searchParams.put("startTime", startTime);