美术阅卷11月新增需求-新增档位落差报表

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/api/QualityAnalyseController.java

@@ -54,13 +54,15 @@ public class QualityAnalyseController {
 //    @ApiOperation(value = "档位占比报表接口")
     @RequestMapping(value = "levelsPropReport", method = RequestMethod.GET)
     public Object levelsPropReport(
+//            @ApiParam(value = "workId", required = true)
             @RequestParam Long workId,
-//            @ApiParam(value = "科目", required = true)
+//            @ApiParam(value = "科目", required = false)
             @RequestParam(required = false) Subject subject,
-//            @ApiParam(value = "考点", required = true)
+//            @ApiParam(value = "考点", required = false)
             @RequestParam(required = false) String areaCode,
 //            @ApiParam(value = "开始时间", required = false)
             @RequestParam(required = false) String startTime,
+//            @ApiParam(value = "结束时间", required = false)
             @RequestParam(required = false) String endTime) {
         List fList = new ArrayList();
         List<Level> levels = levelRepo.findByWorkId(workId);
@@ -123,9 +125,7 @@ public class QualityAnalyseController {
             map.put("data", data);
             fList.add(map);
         });
-
         return fList;
-
     }
 
     /**
@@ -151,6 +151,7 @@ public class QualityAnalyseController {
             @RequestParam(required = false) String startTime,
 //            @ApiParam(value = "结束时间", required = false)
             @RequestParam(required = false) String endTime) {
+        List fList = new ArrayList();
         List list = null;
         Specification<MarkTask> specification = (root, query, builder) -> {
             List<Predicate> predicates = new ArrayList<>();
@@ -177,7 +178,13 @@ public class QualityAnalyseController {
             sql = sqlUtil.sqlGroupBy(sql, "t.create_user_id");
             list = sqlUtil.execSqlForMap(sql);
         }
-        return list;
+        if (Objects.nonNull(list)) {
+            Map map = new HashMap();
+            map.put("data", list);
+            map.put("size", list.size());
+            fList.add(map);
+        }
+        return fList;
     }
 
     /**
@@ -202,6 +209,7 @@ public class QualityAnalyseController {
             @RequestParam(required = false) String startTime,
 //            @ApiParam(value = "结束时间", required = false)
             @RequestParam(required = false) String endTime) {
+        List fList = new ArrayList();
         List list = null;
         Specification<MarkTask> specification = (root, query, builder) -> {
             List<Predicate> predicates = new ArrayList<>();
@@ -228,6 +236,12 @@ public class QualityAnalyseController {
             sql = sqlUtil.sqlGroupBy(sql, "t.create_user_id");
             list = sqlUtil.execSqlForMap(sql);
         }
-        return list;
+        if (Objects.nonNull(list)) {
+            Map map = new HashMap();
+            map.put("data", list);
+            map.put("size", list.size());
+            fList.add(map);
+        }
+        return fList;
     }
 }