From 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 七月 2023 10:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-report/src/main/java/com/java110/report/cmd/dataReport/QueryOrderDataReportCmd.java |   41 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryOrderDataReportCmd.java b/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryOrderDataReportCmd.java
index 8076237..ed29251 100644
--- a/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryOrderDataReportCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryOrderDataReportCmd.java
@@ -99,20 +99,57 @@
         data.put("value", inspectionOrderCount);
         datas.add(data);
 
-        // todo 鏌ヨ 鎶ヤ慨鍗�
+        // todo 鏌ヨ 鏈畬鎴愬贰妫�
         double undoInspectionOrderCount = orderStatisticsImpl.getUndoInspectionOrderCount(queryStatisticsDto);
         data = new JSONObject();
         data.put("name","鏈畬鎴愬贰妫�");
         data.put("value", undoInspectionOrderCount);
         datas.add(data);
 
-        // todo 鏌ヨ 鎶ヤ慨鍗�
+        // todo 鏌ヨ 瀹屾垚宸℃
         double finishInspectionOrderCount = orderStatisticsImpl.getFinishInspectionOrderCount(queryStatisticsDto);
         data = new JSONObject();
         data.put("name","瀹屾垚宸℃");
         data.put("value", finishInspectionOrderCount);
         datas.add(data);
 
+        // todo 鏌ヨ 淇濆吇
+        double maintainanceOrderCount = orderStatisticsImpl.getMaintainanceOrderCount(queryStatisticsDto);
+        data = new JSONObject();
+        data.put("name","淇濆吇");
+        data.put("value", maintainanceOrderCount);
+        datas.add(data);
+
+        // todo 鏌ヨ 鏈畬鎴� 淇濆吇
+        double undoMaintainanceOrderCount = orderStatisticsImpl.getUndoMaintainanceOrderCount(queryStatisticsDto);
+        data = new JSONObject();
+        data.put("name","鏈畬鎴愪繚鍏�");
+        data.put("value", undoMaintainanceOrderCount);
+        datas.add(data);
+
+        // todo 鏌ヨ 宸插畬鎴� 淇濆吇
+        double finishMaintainanceOrderCount = orderStatisticsImpl.getFinishMaintainanceOrderCount(queryStatisticsDto);
+        data = new JSONObject();
+        data.put("name","瀹屾垚淇濆吇");
+        data.put("value", finishMaintainanceOrderCount);
+        datas.add(data);
+
+        // todo 鏌ヨ 涓氫富鍙嶉
+        double notepadOrderCount = orderStatisticsImpl.getNotepadOrderCount(queryStatisticsDto);
+        data = new JSONObject();
+        data.put("name","涓氫富鍙嶉");
+        data.put("value", notepadOrderCount);
+        datas.add(data);
+
+        // todo 鏌ヨ 鍏呯數璁㈠崟
+        double chargeMachineOrderCount = orderStatisticsImpl.getChargeMachineOrderCount(queryStatisticsDto);
+        data = new JSONObject();
+        data.put("name","鍏呯數璁㈠崟");
+        data.put("value", chargeMachineOrderCount);
+        datas.add(data);
+
+
+
 
         context.setResponseEntity(ResultVo.createResponseEntity(datas));
     }

--
Gitblit v1.8.0