借款用途、车辆用途增删

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

@@ -202,6 +202,15 @@ public class CmcBorrowController extends BaseController
                 oAmount = oAmount.add(borrow.getManagerAmount());
         }
         usageAmountObject.put("非项目借款", oAmount);
+        cmcBorrow.setBorrowUsage("3");
+        usageList = cmcBorrowService.selectCmcBorrowList(cmcBorrow);
+        usageObject.put("党委借款", usageList.size());
+        BigDecimal dAmount = new BigDecimal(0);
+        for (CmcBorrow borrow : usageList) {
+            if (borrow.getManagerAmount() != null)
+                dAmount = dAmount.add(borrow.getManagerAmount());
+        }
+        usageAmountObject.put("党委借款", dAmount);
     }
 
 }

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

@@ -94,14 +94,15 @@ public class CmcCarController extends BaseController
         JSONArray approvalArray = new JSONArray();
         JSONArray dayArray = new JSONArray();
         CmcCar cmcCar = new CmcCar();
+        cmcCar.setIsRent("0");
         cmcCar.setStatus("0");
         statusObject.put("已派出", cmcCarService.selectCmcCarList(cmcCar).size());
         cmcCar.setStatus("1");
         statusObject.put("可使用", cmcCarService.selectCmcCarList(cmcCar).size());
         cmcCar.setStatus("2");
         statusObject.put("维修中", cmcCarService.selectCmcCarList(cmcCar).size());
-        cmcCar.setStatus("3");
-        statusObject.put("已还车", cmcCarService.selectCmcCarList(cmcCar).size());
+//        cmcCar.setStatus("3");
+//        statusObject.put("已还车", cmcCarService.selectCmcCarList(cmcCar).size());
         cmcCar.setStatus("4");
         statusObject.put("已报废", cmcCarService.selectCmcCarList(cmcCar).size());
         //整体
@@ -199,15 +200,13 @@ public class CmcCarController extends BaseController
     //各车辆派出次数
     public void getCarApprovalStatistic(CmcCarApproval cmcCarApproval, JSONArray approvalArray) {
         for (CmcCar cmcCar : cmcCarService.selectCmcCarList(new CmcCar())) {
-            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);
-                }
+            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);
             }
         }
     }
@@ -215,20 +214,18 @@ public class CmcCarController extends BaseController
     //各车辆派出天数
     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();
+            cmcCarApproval.setCars(cmcCar.getCarId().toString());
+            long days = 0;
+            for (CmcCarApproval carApproval : cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval)) {
+                if (carApproval.getDays() < 1) {
+                    carApproval.setDays(1L);
                 }
-                JSONObject dayObject = new JSONObject();
-                dayObject.put("name", cmcCar.getLicensePlate());
-                dayObject.put("count", days);
-                dayArray.add(dayObject);
+                days = days + carApproval.getDays();
             }
+            JSONObject dayObject = new JSONObject();
+            dayObject.put("name", cmcCar.getLicensePlate());
+            dayObject.put("count", days);
+            dayArray.add(dayObject);
         }
     }
 

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

@@ -42,7 +42,7 @@
             <if test="expectKm != null "> and c.expect_km = #{expectKm}</if>
             <if test="series != null  and series != ''"> and c.series like concat('%', #{series}, '%')</if>
             <if test="brand != null  and brand != ''"> and c.brand like concat('%', #{brand}, '%')</if>
-            <if test="isRent != null  and isRent != ''"> and c.isRent = #{isRent}</if>
+            <if test="isRent != null  and isRent != ''"> and c.is_rent = #{isRent}</if>
             <if test="dayCost != null  and dayCost != ''"> and c.day_cost = #{dayCost}</if>
             <if test="remark != null  and remark != ''"> and c.remark = #{remark}</if>
             <if test="status != null  and status != ''"> and c.status = #{status}</if>

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 YEAR(s.manager_time) = YEAR(#{managerTime})</if>
+            <if test="managerTime != null "> and s.manager_time = #{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>