车辆派出天数统计

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

@@ -92,6 +92,7 @@ public class CmcCarController extends BaseController
         JSONArray usageArray = new JSONArray();
         JSONObject usageObject = new JSONObject();
         JSONArray approvalArray = new JSONArray();
+        JSONArray dayArray = new JSONArray();
         CmcCar cmcCar = new CmcCar();
         cmcCar.setStatus("0");
         statusObject.put("已派出", cmcCarService.selectCmcCarList(cmcCar).size());
@@ -122,6 +123,7 @@ public class CmcCarController extends BaseController
         }
         getCarUsageStatistic(cmcCarApproval, usageObject);
         getCarApprovalStatistic(cmcCarApproval, approvalArray);
+        getCarDayStatistic(cmcCarApproval, dayArray);
         yearArray.add(yearObject);
         statusArray.add(statusObject);
         usageArray.add(usageObject);
@@ -129,7 +131,9 @@ public class CmcCarController extends BaseController
         jsonObject.put("status", statusArray);
         jsonObject.put("usage", usageArray);
         jsonObject.put("approval", approvalArray);
+        jsonObject.put("day", dayArray);
         jsonObject.getJSONArray("approval").sort((a,b)->((JSONObject)b).getIntValue("count") - ((JSONObject)a).getIntValue("count"));
+        jsonObject.getJSONArray("day").sort((a,b)->((JSONObject)b).getIntValue("count") - ((JSONObject)a).getIntValue("count"));
         return success(jsonObject);
     }
 
@@ -195,13 +199,35 @@ public class CmcCarController extends BaseController
     //各车辆派出次数
     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);
+            if (cmcCar.getCarId() < 16) {
+                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 getCarDayStatistic(CmcCarApproval cmcCarApproval, JSONArray dayArray) {
+        for (CmcCar cmcCar : cmcCarService.selectCmcCarList(new CmcCar())) {
+            if (cmcCar.getCarId() < 16) {
+                cmcCarApproval.setCars(cmcCar.getCarId().toString());
+                long days = 0;
+                for (CmcCarApproval carApproval : cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval)) {
+                    if (carApproval.getDays() < 1) {
+                        carApproval.setDays(1L);
+                    }
+                    days = days + carApproval.getDays();
+                }
+                JSONObject dayObject = new JSONObject();
+                dayObject.put("name", cmcCar.getLicensePlate());
+                dayObject.put("count", days);
+                dayArray.add(dayObject);
             }
         }
     }

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

@@ -232,7 +232,7 @@ public class CmcDeviceController extends BaseController
             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(",");
+                    .append(cmcDevice.getCode() != null ? "（设备编号：" + cmcDevice.getCode() + "）" : "");
             if (count > 0) {
                 JSONObject approvalObject = new JSONObject();
                 approvalObject.put("name", deviceNames);

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSettleMapper.xml

@@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jyTime != null "> and s.jy_time = #{jyTime}</if>
             <if test="jyComment != null  and jyComment != ''"> and s.jy_comment = #{jyComment}</if>
             <if test="managerUserId != null "> and s.manager_user_id = #{managerUserId}</if>
-            <if test="managerTime != null "> and s.manager_time = #{managerTime}</if>
+            <if test="managerTime != null "> and YEAR(s.manager_time) = YEAR(#{managerTime})</if>
             <if test="managerComment != null  and managerComment != ''"> and s.manager_comment = #{managerComment}</if>
             <if test="gmUserId != null "> and s.gm_user_id = #{gmUserId}</if>
             <if test="gmTime != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', gmTime) == '2000' "> and s.gm_time is not null</if>