车辆设备使用次数统计

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

@@ -1,13 +1,18 @@
 package com.ruoyi.web.controller.oa;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.List;
+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;
 
@@ -42,7 +47,8 @@ public class CmcCarController extends BaseController
     private ICmcCarService cmcCarService;
 
     @Autowired
-    private ISysUserService userService;
+    private ICmcCarApprovalService cmcCarApprovalService;
+
     /**
      * 查询cmc车辆信息列表
      */
@@ -79,24 +85,49 @@ public class CmcCarController extends BaseController
      * 获取设备统计信息
      */
     @GetMapping(value = "/statistic")
-    public AjaxResult getCarStatistic()
+    public AjaxResult getCarStatistic(CmcCarApproval cmcCarApproval) throws ParseException
     {
         JSONObject jsonObject = new JSONObject();
+        JSONArray yearArray = new JSONArray();
+        JSONObject yearObject = new JSONObject();
         JSONArray statusArray = new JSONArray();
         JSONObject statusObject = new JSONObject();
+        JSONArray approvalArray = new JSONArray();
+        JSONObject approvalObject = new JSONObject();
         CmcCar cmcCar = new CmcCar();
         cmcCar.setStatus("0");
-        statusObject.put("被领用", cmcCarService.selectCmcCarList(cmcCar).size());
+        statusObject.put("已派出", cmcCarService.selectCmcCarList(cmcCar).size());
         cmcCar.setStatus("1");
-        statusObject.put("可领用", cmcCarService.selectCmcCarList(cmcCar).size());
+        statusObject.put("可使用", cmcCarService.selectCmcCarList(cmcCar).size());
         cmcCar.setStatus("2");
         statusObject.put("维修中", cmcCarService.selectCmcCarList(cmcCar).size());
         cmcCar.setStatus("3");
-        statusObject.put("已停用", cmcCarService.selectCmcCarList(cmcCar).size());
+        statusObject.put("已还车", cmcCarService.selectCmcCarList(cmcCar).size());
         cmcCar.setStatus("4");
         statusObject.put("已报废", cmcCarService.selectCmcCarList(cmcCar).size());
+        //整体
+        if (cmcCarApproval.getApplyDate() == null) {
+            //每年派车次数
+            for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
+                //总数
+                cmcCarApproval.setApplyDate(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
+                List<CmcCarApproval> yearList = cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval);
+                yearObject.put(String.valueOf(i), yearList.size());
+            }
+            cmcCarApproval.setApplyDate(null);
+        }
+        //年度
+        else {
+            //输入年份派车次数
+            yearObject.put(new SimpleDateFormat("yyyy").format(cmcCarApproval.getApplyDate()), cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval).size());
+        }
+        getCarApprovalStatistic(cmcCarApproval, approvalObject);
+        yearArray.add(yearObject);
         statusArray.add(statusObject);
+        approvalArray.add(approvalObject);
+        jsonObject.put("year", yearArray);
         jsonObject.put("status",statusArray);
+        jsonObject.put("approval",approvalArray);
         return success(jsonObject);
     }
 
@@ -158,4 +189,17 @@ public class CmcCarController extends BaseController
     {
         return success(cmcCarService.deleteCmcCarByCarIds(carIds));
     }
+
+    //各车辆派出次数
+    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());
+        });
+    }
+
 }

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

@@ -83,7 +83,6 @@ public class CmcContractController extends BaseController
 
             }
             cmcContract.setSignDate(null);
-            getProjectSourceStatistic(cmcContract, sourceObject, cwAmountObject);
         }
         else {
             //输入年份合同数量及金额
@@ -93,8 +92,8 @@ public class CmcContractController extends BaseController
                 amount = amount.add(contract.getAmount());
             }
             amountObject.put(new SimpleDateFormat("yyyy").format(cmcContract.getSignDate()), amount);
-            getProjectSourceStatistic(cmcContract, sourceObject, cwAmountObject);
         }
+        getProjectSourceStatistic(cmcContract, sourceObject, cwAmountObject);
         yearArray.add(yearObject);
         sourceArray.add(sourceObject);
         amountArray.add(amountObject);

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

@@ -1,15 +1,18 @@
 package com.ruoyi.web.controller.oa;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.List;
-import java.util.Map;
+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 liquibase.pro.packaged.C;
+import com.ruoyi.oa.domain.CmcDeviceApproval;
+import com.ruoyi.oa.domain.CmcDevice;
+import com.ruoyi.oa.service.ICmcDeviceApprovalService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +26,6 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.oa.domain.CmcDevice;
 import com.ruoyi.oa.service.ICmcDeviceService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -41,6 +43,9 @@ public class CmcDeviceController extends BaseController
     @Autowired
     private ICmcDeviceService cmcDeviceService;
 
+    @Autowired
+    private ICmcDeviceApprovalService cmcDeviceApprovalService;
+
     /**
      * 查询cmc设备信息列表
      */
@@ -87,11 +92,15 @@ public class CmcDeviceController extends BaseController
      * 获取设备统计信息
      */
     @GetMapping(value = "/statistic")
-    public AjaxResult getDeviceStatistic()
+    public AjaxResult getDeviceStatistic(CmcDeviceApproval cmcDeviceApproval) throws ParseException
     {
         JSONObject jsonObject = new JSONObject();
+        JSONArray yearArray = new JSONArray();
+        JSONObject yearObject = new JSONObject();
         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());
@@ -103,8 +112,29 @@ public class CmcDeviceController extends BaseController
         statusObject.put("已停用", cmcDeviceService.selectCmcDeviceList(cmcDevice).size());
         cmcDevice.setStatus("4");
         statusObject.put("已报废", cmcDeviceService.selectCmcDeviceList(cmcDevice).size());
+        //整体
+        if (cmcDeviceApproval.getApplyDate() == null) {
+            //每年派车次数
+            for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
+                //总数
+                cmcDeviceApproval.setApplyDate(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
+                List<CmcDeviceApproval> yearList = cmcDeviceApprovalService.selectCmcDeviceApprovalList(cmcDeviceApproval);
+                yearObject.put(String.valueOf(i), yearList.size());
+            }
+            cmcDeviceApproval.setApplyDate(null);
+        }
+        //年度
+        else {
+            //输入年份派车次数
+            yearObject.put(new SimpleDateFormat("yyyy").format(cmcDeviceApproval.getApplyDate()), cmcDeviceApprovalService.selectCmcDeviceApprovalList(cmcDeviceApproval).size());
+        }
+        getDeviceApprovalStatistic(cmcDeviceApproval, approvalObject);
+        yearArray.add(yearObject);
         statusArray.add(statusObject);
+        approvalArray.add(approvalObject);
+        jsonObject.put("year", yearArray);
         jsonObject.put("status",statusArray);
+        jsonObject.put("approval",approvalArray);
         return success(jsonObject);
     }
 
@@ -193,4 +223,17 @@ public class CmcDeviceController extends BaseController
     {
         return success(cmcDeviceService.deleteCmcDeviceByDeviceIds(deviceIds));
     }
+
+    //各设备领用次数
+    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());
+        });
+    }
+
 }

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

@@ -168,7 +168,7 @@ public class CmcProjectController extends BaseController
         JSONArray settleArray = new JSONArray();
         JSONObject settleObject = new JSONObject();
         //整体
-        if (cmcProject.getProjectNumber() == null && cmcProject.getProjectSource() == null && cmcProject.getProjectType() == null && cmcProject.getUndertakingDept() == null) {
+        if (cmcProject.getProjectNumber() == null) {
             //每年项目数量
             for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
                 //总数
@@ -194,13 +194,10 @@ public class CmcProjectController extends BaseController
                 settleObject.put(String.valueOf(i), settleList.size());
             }
             cmcProject.setProjectNumber(null);
-            getProjectSourceStatistic(cmcProject, sourceObject);
-            getProjectTypeStatistic(cmcProject, typeObject);
-            getProjectDeptStatistic(cmcProject, deptObject);
 
         }
         //年度
-        else if (cmcProject.getProjectNumber() != null && cmcProject.getProjectSource() == null && cmcProject.getProjectType() == null && cmcProject.getUndertakingDept() == null) {
+        else {
             //输入年份项目数量
             List<CmcProject> yearList = cmcProjectService.selectCmcAllProjectList(cmcProject);
             //总数
@@ -223,10 +220,10 @@ public class CmcProjectController extends BaseController
             List<CmcSettle> settleList = cmcSettleService.selectCmcSettleList(cmcSettle);
             settleObject.put(cmcProject.getProjectNumber(), settleList.size());
 
-            getProjectSourceStatistic(cmcProject, sourceObject);
-            getProjectTypeStatistic(cmcProject, typeObject);
-            getProjectDeptStatistic(cmcProject, deptObject);
         }
+        getProjectSourceStatistic(cmcProject, sourceObject);
+        getProjectTypeStatistic(cmcProject, typeObject);
+        getProjectDeptStatistic(cmcProject, deptObject);
         yearArray.add(yearObject);
         sourceArray.add(sourceObject);
         deptArray.add(deptObject);

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

@@ -104,7 +104,7 @@ public class CmcSubContractController extends BaseController
                 }
                 amountObject.put(String.valueOf(i), amount);
             }
-            getProjectSourceStatistic(cmcSubContract, sourceObject, cwAmountObject);
+            cmcSubContract.setSignDate(null);
         }
         else {
             //输入年份合同数量及金额
@@ -114,8 +114,8 @@ public class CmcSubContractController extends BaseController
                 amount = amount.add(subContract.getSubAmount());
             }
             amountObject.put(new SimpleDateFormat("yyyy").format(cmcSubContract.getSignDate()), amount);
-            getProjectSourceStatistic(cmcSubContract, sourceObject, cwAmountObject);
         }
+        getProjectSourceStatistic(cmcSubContract, sourceObject, cwAmountObject);
         yearArray.add(yearObject);
         sourceArray.add(sourceObject);
         amountArray.add(amountObject);

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

@@ -124,7 +124,7 @@
             <if test="projectId != null  and projectId != ''"> and ca.project_id = #{projectId}</if>
             <if test="applyReason != null  and applyReason != ''"> and ca.apply_reason = #{applyReason}</if>
             <if test="passengers != null "> and ca.passengers = #{passengers}</if>
-            <if test="applyDate != null "> and ca.apply_date = #{beginDate}</if>
+            <if test="applyDate != null "> and YEAR(ca.apply_date) = YEAR(#{applyDate})</if>
             <if test="beginDate != null "> and ca.begin_date = #{beginDate}</if>
             <if test="endDate != null "> and ca.end_date = #{endDate}</if>
             <if test="days != null "> and ca.days = #{days}</if>
@@ -139,6 +139,7 @@
             <if test="gmComment != null  and gmComment != ''"> and ca.gm_comment = #{gmComment}</if>
             <if test="dispatcher != null "> and ca.dispatcher = #{dispatcher}</if>
             <if test="dispatchComment != null  and dispatchComment != ''"> and ca.dispatch_comment = #{dispatchComment}</if>
+            <if test="dispatchTime != null "> and da.dispatch_time = #{dispatchTime}</if>
             <if test="estimateCost != null "> and ca.estimate_cost = #{estimateCost}</if>
         </where>
         order by ca.apply_date desc

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

@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="repairDevices != null  and repairDevices != ''"> and find_in_set(#{repairDevices}, da.repair_devices)</if>
             <if test="projectId != null  and projectId != ''"> and da.project_id = #{projectId}</if>
             <if test="applyReason != null  and applyReason != ''"> and da.apply_reason = #{applyReason}</if>
-            <if test="applyDate != null "> and da.apply_date = #{applyDate}</if>
+            <if test="applyDate != null "> and YEAR(da.apply_date) = YEAR(#{applyDate})</if>
             <if test="returnDate != null "> and da.return_date = #{returnDate}</if>
             <if test="beginDate != null "> and da.begin_date = #{beginDate}</if>
             <if test="endDate != null "> and da.end_date = #{endDate}</if>

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

@@ -86,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="signRemark != null  and signRemark != ''"> and sc.sign_remark = #{signRemark}</if>
             <if test="signScan != null  and signScan != ''"> and sc.sign_scan = #{signScan}</if>
             <if test="commentType != null  and commentType != ''"> and sc.comment_type = #{commentType}</if>
+            <if test="projectSource != null  and projectSource != ''"> and p.project_source = #{projectSource}</if>
         </where>
         group by sc.sub_contract_id
         order by sc.draft_time desc

oa-ui/src/views/oa/car/detail.vue

@@ -585,16 +585,16 @@ export default {
     },
     statusTypeText(row) {
       if (row == '0') {
-        return '被领用'
+        return '已派出'
       }
       if (row == '1') {
-        return '可领用'
+        return '可使用'
       }
       if (row == '2') {
         return '维修中'
       }
       if (row == '3') {
-        return '已停用'
+        return '已还车'
       }
       if (row == '4') {
         return '已报废'

oa-ui/src/views/oa/car/index.vue

@@ -170,7 +170,7 @@ export default {
       total: 0,
       // cmc车辆信息表格数据
       carList: [],
-      statusList: [{ id: '0', name: '被领用' }, { id: '1', name: '可领用' }, { id: '2', name: '维修中' }, { id: '3', name: '已停用' }, { id: '4', name: '已报废' }],
+      statusList: [{ id: '0', name: '已派出' }, { id: '1', name: '可使用' }, { id: '2', name: '维修中' }, { id: '3', name: '已还车' }, { id: '4', name: '已报废' }],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -305,16 +305,16 @@ export default {
     },
     statusTypeText(row) {
       if (row == '0') {
-        return '被领用'
+        return '已派出'
       }
       if (row == '1') {
-        return '可领用'
+        return '可使用'
       }
       if (row == '2') {
         return '维修中'
       }
       if (row == '3') {
-        return '已停用'
+        return '已还车'
       }
       if (row == '4') {
         return '已报废'