用车类型统计

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcCarController.java

@@ -4,16 +4,13 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.oa.domain.CmcCarApproval;
-import com.ruoyi.oa.domain.CmcProject;
 import com.ruoyi.oa.service.ICmcCarApprovalService;
-import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.web.bind.annotation.GetMapping;
@@ -92,8 +89,9 @@ public class CmcCarController extends BaseController
         JSONObject yearObject = new JSONObject();
         JSONArray statusArray = new JSONArray();
         JSONObject statusObject = new JSONObject();
+        JSONArray usageArray = new JSONArray();
+        JSONObject usageObject = new JSONObject();
         JSONArray approvalArray = new JSONArray();
-        JSONObject approvalObject = new JSONObject();
         CmcCar cmcCar = new CmcCar();
         cmcCar.setStatus("0");
         statusObject.put("已派出", cmcCarService.selectCmcCarList(cmcCar).size());
@@ -113,6 +111,7 @@ public class CmcCarController extends BaseController
                 cmcCarApproval.setApplyDate(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
                 List<CmcCarApproval> yearList = cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval);
                 yearObject.put(String.valueOf(i), yearList.size());
+                getCarUsageStatistic(cmcCarApproval, usageObject);
             }
             cmcCarApproval.setApplyDate(null);
         }
@@ -121,13 +120,16 @@ public class CmcCarController extends BaseController
             //输入年份派车次数
             yearObject.put(new SimpleDateFormat("yyyy").format(cmcCarApproval.getApplyDate()), cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval).size());
         }
-        getCarApprovalStatistic(cmcCarApproval, approvalObject);
+        getCarUsageStatistic(cmcCarApproval, usageObject);
+        getCarApprovalStatistic(cmcCarApproval, approvalArray);
         yearArray.add(yearObject);
         statusArray.add(statusObject);
-        approvalArray.add(approvalObject);
+        usageArray.add(usageObject);
         jsonObject.put("year", yearArray);
-        jsonObject.put("status",statusArray);
-        jsonObject.put("approval",approvalArray);
+        jsonObject.put("status", statusArray);
+        jsonObject.put("usage", usageArray);
+        jsonObject.put("approval", approvalArray);
+        jsonObject.getJSONArray("approval").sort((a,b)->((JSONObject)b).getIntValue("count") - ((JSONObject)a).getIntValue("count"));
         return success(jsonObject);
     }
 
@@ -191,15 +193,32 @@ public class CmcCarController extends BaseController
     }
 
     //各车辆派出次数
-    public void getCarApprovalStatistic(CmcCarApproval cmcCarApproval, JSONObject approvalObject) {
-        //类型太多，循环效率不高-直接用Java特性进行分组统计
-        Map<Object, Long> typeGroup = cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval).stream().collect(Collectors.groupingBy(item -> Optional.ofNullable(item.getCars()), Collectors.counting()));
-        List<Map.Entry<Object, Long>> typeList = new ArrayList<>(typeGroup.entrySet());
-        typeList.sort(Map.Entry.comparingByValue());
-        typeList.forEach((item) -> {
-            if (item.getKey() != Optional.empty())
-                approvalObject.put(item.toString().substring(item.toString().indexOf("[") + 1, item.toString().indexOf("]")), item.getValue());
-        });
+    public void getCarApprovalStatistic(CmcCarApproval cmcCarApproval, JSONArray approvalArray) {
+        for (CmcCar cmcCar : cmcCarService.selectCmcCarList(new CmcCar())) {
+            cmcCarApproval.setCars(cmcCar.getCarId().toString());
+            int count = cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval).size();
+            if (count > 0) {
+                JSONObject approvalObject = new JSONObject();
+                approvalObject.put("name", cmcCar.getLicensePlate());
+                approvalObject.put("count", count);
+                approvalArray.add(approvalObject);
+            }
+        }
+    }
+
+    //各车辆派出次数
+    public void getCarUsageStatistic(CmcCarApproval cmcCarApproval, JSONObject usageObject) {
+        cmcCarApproval.setCarUsage("0");
+        usageObject.put("项目用车", cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval).size());
+        cmcCarApproval.setCarUsage("1");
+        usageObject.put("非项目用车", cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval).size());
+        cmcCarApproval.setCarUsage("2");
+        usageObject.put("工会用车", cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval).size());
+        cmcCarApproval.setCarUsage("3");
+        usageObject.put("党委用车", cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval).size());
+        cmcCarApproval.setCarUsage("4");
+        usageObject.put("团委用车", cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval).size());
+        cmcCarApproval.setCarUsage(null);
     }
 
 }

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceController.java

@@ -4,14 +4,14 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.oa.domain.CmcDeviceApproval;
+import com.ruoyi.oa.domain.CmcCarApproval;
 import com.ruoyi.oa.domain.CmcDevice;
+import com.ruoyi.oa.domain.CmcDeviceApproval;
 import com.ruoyi.oa.service.ICmcDeviceApprovalService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -100,7 +100,6 @@ public class CmcDeviceController extends BaseController
         JSONArray statusArray = new JSONArray();
         JSONObject statusObject = new JSONObject();
         JSONArray approvalArray = new JSONArray();
-        JSONObject approvalObject = new JSONObject();
         CmcDevice cmcDevice = new CmcDevice();
         cmcDevice.setStatus("0");
         statusObject.put("被领用", cmcDeviceService.selectCmcDeviceList(cmcDevice).size());
@@ -128,13 +127,13 @@ public class CmcDeviceController extends BaseController
             //输入年份派车次数
             yearObject.put(new SimpleDateFormat("yyyy").format(cmcDeviceApproval.getApplyDate()), cmcDeviceApprovalService.selectCmcDeviceApprovalList(cmcDeviceApproval).size());
         }
-        getDeviceApprovalStatistic(cmcDeviceApproval, approvalObject);
+        getDeviceApprovalStatistic(cmcDeviceApproval, approvalArray);
         yearArray.add(yearObject);
         statusArray.add(statusObject);
-        approvalArray.add(approvalObject);
         jsonObject.put("year", yearArray);
-        jsonObject.put("status",statusArray);
-        jsonObject.put("approval",approvalArray);
+        jsonObject.put("status", statusArray);
+        jsonObject.put("approval", approvalArray);
+        jsonObject.getJSONArray("approval").sort((a,b)->((JSONObject)b).getIntValue("count") - ((JSONObject)a).getIntValue("count"));
         return success(jsonObject);
     }
 
@@ -225,15 +224,22 @@ public class CmcDeviceController extends BaseController
     }
 
     //各设备领用次数
-    public void getDeviceApprovalStatistic(CmcDeviceApproval cmcDeviceApproval, JSONObject approvalObject) {
-        //类型太多，循环效率不高-直接用Java特性进行分组统计
-        Map<Object, Long> typeGroup = cmcDeviceApprovalService.selectCmcDeviceApprovalList(cmcDeviceApproval).stream().collect(Collectors.groupingBy(item -> Optional.ofNullable(item.getDevices()), Collectors.counting()));
-        List<Map.Entry<Object, Long>> typeList = new ArrayList<>(typeGroup.entrySet());
-        typeList.sort(Map.Entry.comparingByValue());
-        typeList.forEach((item) -> {
-            if (item.getKey() != Optional.empty())
-                approvalObject.put(item.toString().substring(item.toString().indexOf("[") + 1, item.toString().indexOf("]")), item.getValue());
-        });
+    public void getDeviceApprovalStatistic(CmcDeviceApproval cmcDeviceApproval, JSONArray approvalArray) {
+
+        for (CmcDevice cmcDevice : cmcDeviceService.selectCmcDeviceList(new CmcDevice())) {
+            cmcDeviceApproval.setDevices(cmcDevice.getDeviceId().toString());
+            int count = cmcDeviceApprovalService.selectCmcDeviceApprovalList(cmcDeviceApproval).size();
+            StringBuilder deviceNames = new StringBuilder();
+            deviceNames.append(cmcDevice.getName()).append("【").append(cmcDevice.getBrand() != null ? cmcDevice.getBrand() : "")
+                    .append(cmcDevice.getSeries() != null ? "-" + cmcDevice.getSeries() + "】" : "")
+                    .append(cmcDevice.getCode() != null ? "（设备编号：" + cmcDevice.getCode() + "）" : "").append(",");
+            if (count > 0) {
+                JSONObject approvalObject = new JSONObject();
+                approvalObject.put("name", deviceNames);
+                approvalObject.put("count", count);
+                approvalArray.add(approvalObject);
+            }
+        }
     }
 
-}
+}