修改

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderStatisticsController.java

@@ -58,7 +58,7 @@ public class WorkOrderStatisticsController {
             endDate = subMonth(startDate, 1);
 
             sameStartDate = subYear(startDate, -1);
-            sameEndDate = subYear(sameStartDate, 1);
+            sameEndDate = subMonth(sameStartDate, 1);
 
             chainStartDate = subMonth(startDate, -1);
             chainEndDate = subMonth(chainStartDate, 1);
@@ -96,10 +96,22 @@ public class WorkOrderStatisticsController {
         workOrderManageDto.setEndDate(sameEndDate);
         //同比
         Map<String, Object> sameStatistic = workOrderManageService.workOrderStatistics(workOrderManageDto);
+        if(!sameStatistic.containsKey("工单完成数")){
+            sameStatistic.put("工单完成数",0);
+        }
+        if(!sameStatistic.containsKey("工单完成率")){
+            sameStatistic.put("工单完成率",0);
+        }
         //环比
         workOrderManageDto.setStartDate(chainStartDate);
         workOrderManageDto.setEndDate(chainEndDate);
         Map<String, Object> chainStatistic = workOrderManageService.workOrderStatistics(workOrderManageDto);
+        if(!chainStatistic.containsKey("工单完成数")){
+            chainStatistic.put("工单完成数",0);
+        }
+        if(!chainStatistic.containsKey("工单完成率")){
+            chainStatistic.put("工单完成率",0);
+        }
 
         DecimalFormat df = new DecimalFormat("#0.00");