稽查报告,接口使用时间段

server/src/main/java/edp/davinci/controller/QualityTaskController.java

@@ -265,16 +265,21 @@ public class QualityTaskController extends BaseController {
      */
     @ApiOperation(value = "get qualityReport")
     @GetMapping(value = "/qualityReport")
-    public ResponseEntity qualityReport(@RequestParam(value = "systemId", required = true) Long systemId, @RequestParam(value = "time", required = true) String time, @ApiIgnore @CurrentUser User user,
+    public ResponseEntity qualityReport(@RequestParam(value = "systemId", required = true) Long systemId, @RequestParam(value = "starTime", required = true) String starTime, @RequestParam(value = "endTime", required = true) String endTime, @ApiIgnore @CurrentUser User user,
                                         HttpServletRequest request) {
 
         // 查询
-        List<QualityTaskDto> qualityTasks = qualityTaskService.getQualityTaskListCondition(systemId, time);
+        List<QualityTaskDto> qualityTasks = qualityTaskService.getQualityTaskListCondition(systemId, null);
 
+        List<QualityTaskDto> resultTask = new ArrayList<>();
 
         for (QualityTaskDto qualityTaskDto : qualityTasks) {
 
-            List<QualityAuditor> qualityAuditorList = qualityAuditorService.getQualityAuditorListByTaskId(qualityTaskDto.getId(), null, null);
+            List<QualityAuditor> qualityAuditorList = qualityAuditorService.getQualityAuditorListByTaskId(qualityTaskDto.getId(), starTime, endTime);
+
+            if(null == qualityAuditorList && qualityAuditorList.size() == 0){
+                continue;
+            }
 
             DecimalFormat df = new DecimalFormat("0.00");//格式化小数
 
@@ -327,9 +332,11 @@ public class QualityTaskController extends BaseController {
                 qualityTaskDto.setAccuracyCorrectProbability(df.format((float) averagingAccuracyCorrect / (averagingAccuracyCorrect + averagingAccuracyError)));
                 qualityTaskDto.setAccuracyErrorProbability(df.format((float) averagingAccuracyError / (averagingAccuracyCorrect + averagingAccuracyError)));
             }
+
+            resultTask.add(qualityTaskDto);
         }
 
-        return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payloads(qualityTasks));
+        return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payloads(resultTask));
     }
 
     /**