巡检及统计

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/order/IotInspectOrderController.java

@@ -150,6 +150,7 @@ public class IotInspectOrderController {
                     IotInspectRouteDO iotInspectRoute = iotInspectRouteService.getIotInspectRoute(routeId);
                     if (Objects.nonNull(iotInspectRoute)) {
                         orderDetail.setRouteDesc(iotInspectRoute.getRouteDesc());
+                        orderDetail.setRouteName(iotInspectRoute.getRouteName());
                     }
                 }
             }
@@ -177,6 +178,7 @@ public class IotInspectOrderController {
         private Long itemException;
         private Long itemNeed;
         private String routeDesc;
+        private String routeName;
     }
 
     @GetMapping("/page")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/stat/IotStaticController.java

@@ -547,7 +547,7 @@ public class IotStaticController {
             abc.put("createTime", e.getCreateTime());
             return abc;
         }).collect(Collectors.toList());
-        Map<String, Long> fillMap = countRecordsByDate(fills, 7);
+        LinkedHashMap<String, Long> fillMap = countRecordsByDate(fills, 7);
         LinkedList<Object> xAxis = new LinkedList<>();
         LinkedList<Object> fillData = new LinkedList<>();
         fillMap.forEach( (k,v)->{
@@ -624,13 +624,13 @@ public class IotStaticController {
 
     }
 
-    public static Map<String, Long> countRecordsByDate(List<Map<String, Object>> records, int days) {
+    public static LinkedHashMap<String, Long> countRecordsByDate(List<Map<String, Object>> records, int days) {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         LocalDate today = LocalDate.now();
 
         // 生成近七天的日期列表
-        Map<String, Long> dateMap = new HashMap<>();
-        for (int i = 0; i < days; i++) {
+        LinkedHashMap<String, Long> dateMap = new LinkedHashMap<>();
+        for (int i = days-1; i >= 0; i--) {
             LocalDate date = today.minusDays(i);
             dateMap.put(date.format(formatter), 0L);
         }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/inspect/IotInspectOrderMapper.java

@@ -49,7 +49,7 @@ public interface IotInspectOrderMapper extends BaseMapperX<IotInspectOrderDO> {
                 .like(StringUtils.isNotBlank(reqVO.getCommonParam()), IotInspectOrderDO::getInspectOrderTitle, reqVO.getCommonParam())
                 .or()
                 .like(StringUtils.isNotBlank(reqVO.getCommonParam()), IotInspectOrderDO::getPlanCode, reqVO.getCommonParam())
-                .orderByDesc(IotInspectOrderDO::getId);
+                .orderByDesc(IotInspectOrderDO::getStatus).orderByDesc(IotInspectOrderDO::getCreateTime);
         return selectPage(reqVO, wrapper);
     }