运维管理-工作量统计-列表查询2

fiveep-controller/src/main/java/com/bizmatics/controller/web/DevopsWorkOrderController.java

@@ -170,7 +170,7 @@ public class DevopsWorkOrderController {
      * @return
      */
     @GetMapping("workloadStatisticsLits")
-    public ApiResult<CommonPage<Object>> workloadStatisticsLits(@RequestParam(required = false) Integer siteId,
+    public ApiResult<CommonPage<ProcessingTimeVo>> workloadStatisticsLits(@RequestParam(required = false) Integer siteId,
                                                           @RequestParam(required = false) String startTime,
                                                           @RequestParam(required = false) String endTime,
                                                           @RequestParam(value = "size", required = false, defaultValue = "15") Integer size,

fiveep-service/src/main/java/com/bizmatics/service/DevopsWorkOrderService.java

@@ -35,5 +35,5 @@ public interface DevopsWorkOrderService extends CrudService<DevopsWorkOrder> {
 
     List<OpexStatisticsVo> operationCensus(String type);
 
-    CommonPage<Object> workloadStatisticsLits(Integer siteId, String startTime, String endTime,Integer size , Integer current);
+    CommonPage<ProcessingTimeVo> workloadStatisticsLits(Integer siteId, String startTime, String endTime,Integer size , Integer current);
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/DevopsWorkOrderServiceImpl.java

@@ -627,17 +627,18 @@ public class DevopsWorkOrderServiceImpl extends AbstractCrudService<DevopsWorkOr
     }
 
     @Override
-    public CommonPage<Object> workloadStatisticsLits(Integer siteId,String startTime,String endTime,Integer size , Integer current){
+    public CommonPage<ProcessingTimeVo> workloadStatisticsLits(Integer siteId,String startTime,String endTime,Integer size , Integer current){
         List<ProcessingTime> processingTimeList = baseMapper.workloadStatisticsLits(siteId, startTime, endTime);
 
         LambdaQueryWrapper<PatrolInspectors> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(PatrolInspectors::getStatus, 1);
         List<PatrolInspectors> patrolInspectorsList =  patrolInspectorsService.list(queryWrapper);
-        List<Object> processingTimeVoList = new ArrayList<>();
-        List<Object> Active = new ArrayList<Object>(); // 存放页面需要展示的数据
+        List<ProcessingTimeVo> Active1 = new ArrayList<ProcessingTimeVo>(); // 存放页面需要展示的数据
+        List<ProcessingTimeVo> processingTimeVoList1 = new ArrayList<>();
 
         if (patrolInspectorsList.size()>0){
             for (int i = 0; i < patrolInspectorsList.size(); i++) {
+                ProcessingTimeVo processingTimeVo1 = new ProcessingTimeVo();
                 Map<String, Object> map = new HashMap<>();
                 Integer orderQuantity = 0;
                 Integer completedQuantity = 0;
@@ -665,31 +666,35 @@ public class DevopsWorkOrderServiceImpl extends AbstractCrudService<DevopsWorkOr
                             }
                         }
                     }
-                    map.put("inspectorsName", patrolInspectorsList.get(i).getInspectorsName());
-                    map.put("orderQuantity", orderQuantity);
-                    map.put("completedQuantity", completedQuantity);
-                    map.put("incomplete", incomplete);
-                    map.put("responseTime", responseTime);
-                    map.put("processingTime", processingTime);
-                    map.put("testimonials", "");
+
+                    processingTimeVo1.setId(patrolInspectorsList.get(i).getId());
+                    processingTimeVo1.setInspectorsName(patrolInspectorsList.get(i).getInspectorsName());
+                    processingTimeVo1.setOrderQuantity(orderQuantity);
+                    processingTimeVo1.setCompletedQuantity(completedQuantity);
+                    processingTimeVo1.setIncomplete(incomplete);
+                    processingTimeVo1.setResponseTime(responseTime);
+                    processingTimeVo1.setProcessingTime(processingTime);
+                    processingTimeVo1.setTestimonials("");
                 }else {
-                    map.put("inspectorsName", patrolInspectorsList.get(i).getInspectorsName());
-                    map.put("orderQuantity", orderQuantity);
-                    map.put("completedQuantity", completedQuantity);
-                    map.put("incomplete", incomplete);
-                    map.put("responseTime", responseTime);
-                    map.put("processingTime", processingTime);
-                    map.put("testimonials", "");
+                    processingTimeVo1.setId(patrolInspectorsList.get(i).getId());
+                    processingTimeVo1.setInspectorsName(patrolInspectorsList.get(i).getInspectorsName());
+                    processingTimeVo1.setOrderQuantity(orderQuantity);
+                    processingTimeVo1.setCompletedQuantity(completedQuantity);
+                    processingTimeVo1.setIncomplete(incomplete);
+                    processingTimeVo1.setResponseTime(responseTime);
+                    processingTimeVo1.setProcessingTime(processingTime);
+                    processingTimeVo1.setTestimonials("");
                 }
-                processingTimeVoList.add(map);
+
+                processingTimeVoList1.add(processingTimeVo1);
             }
             int currIdx = (current > 1 ? (current -1) * size: 0);
-            for (int i = 0; i < size && i < processingTimeVoList.size() - currIdx; i++) { // 判断条件十分巧妙，防止List取值越界
-                Object active = processingTimeVoList.get(currIdx + i);
-                Active.add(active);
+            for (int i = 0; i < size && i < processingTimeVoList1.size() - currIdx; i++) { // 判断条件十分巧妙，防止List取值越界
+                ProcessingTimeVo active = processingTimeVoList1.get(currIdx + i);
+                Active1.add(active);
             }
         }
-        return new CommonPage<>(Active, processingTimeVoList.size(), size, current);
+        return new CommonPage<>(Active1, processingTimeVoList1.size(), size, current);
     }
 
 }