新增是否租车、单日成本字段

根据申请人id获取部门主任

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

@@ -165,22 +165,12 @@ public class CmcCarApprovalController extends BaseController
             cmcCarApproval.setCars(formDataJson.getString("cars"));
             cmcCarApproval.setDrivers(formDataJson.getString("drivers"));
             String[] cars = formDataJson.getString("cars").split(",");
+            BigDecimal estimateCost = new BigDecimal(0);
             for (String car : cars) {
                 CmcCar cmcCar = cmcCarService.selectCmcCarByCarId(Integer.parseInt(car));
-                if (cmcCar.getAcquisitionTime() != null && cmcCar.getCost() != null) {
-                    // 年数总和法折旧
-                    int acquisitionYear = Integer.parseInt(new SimpleDateFormat("yyyy").format(cmcCar.getAcquisitionTime()));
-                    int life = cmcCar.getExpectLife() == null ? 0 : cmcCar.getExpectLife();
-                    int total = 0;
-                    for (int i = 0; i < life + 1; i++)
-                        total += i;
-                    if (total > 0) {
-                        int currentYear = Integer.parseInt(new SimpleDateFormat("yyyy").format(DateUtils.getNowDate()));
-                        int num = life - (currentYear - acquisitionYear) + 1;
-                        cmcCarApproval.setEstimateCost(new BigDecimal(num  * 0.95 / total).multiply(cmcCar.getCost()));
-                    }
-                }
+                estimateCost = estimateCost.add(cmcCar.getDayCost().multiply(new BigDecimal(cmcCarApproval.getDays())));
             }
+            cmcCarApproval.setEstimateCost(estimateCost);
         }
         cmcCarApprovalService.updateCmcCarApproval(cmcCarApproval);
         return AjaxResult.success("修改用车审批表成功");

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

@@ -1,8 +1,11 @@
 package com.ruoyi.web.controller.oa;
 
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -72,6 +75,21 @@ public class CmcCarController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcCar cmcCar)
     {
+        if (cmcCar.getIsRent())
+        if (cmcCar.getAcquisitionTime() != null && cmcCar.getCost() != null && cmcCar.getDayCost() != null) {
+            // 年数总和法折旧
+            int acquisitionYear = Integer.parseInt(new SimpleDateFormat("yyyy").format(cmcCar.getAcquisitionTime()));
+            int life = cmcCar.getExpectLife() == null ? 0 : cmcCar.getExpectLife();
+            int total = 0;
+            for (int i = 0; i < life + 1; i++)
+                total += i;
+            if (total > 0) {
+                int currentYear = Integer.parseInt(new SimpleDateFormat("yyyy").format(DateUtils.getNowDate()));
+                int num = life - (currentYear - acquisitionYear) + 1;
+                BigDecimal estimateCost = new BigDecimal(num  * 0.95 * 10000 / total / 365).multiply(cmcCar.getCost());
+                cmcCar.setDayCost(estimateCost);
+            }
+        }
         return toAjax(cmcCarService.insertCmcCar(cmcCar));
     }
 

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

@@ -1,17 +1,19 @@
 package com.ruoyi.web.controller.oa;
 
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.oa.domain.CmcCar;
+import com.ruoyi.oa.domain.CmcDevice;
+import com.ruoyi.oa.domain.CmcDeviceApproval;
+import com.ruoyi.oa.service.ICmcDeviceService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -34,6 +36,9 @@ public class CmcDeviceApprovalController extends BaseController
     @Autowired
     private ICmcDeviceApprovalService cmcDeviceApprovalService;
 
+    @Autowired
+    private ICmcDeviceService cmcDeviceService;
+
     /**
      * 查询cmc设备审批列表
      */
@@ -76,6 +81,27 @@ public class CmcDeviceApprovalController extends BaseController
         return toAjax(cmcDeviceApprovalService.insertCmcDeviceApproval(cmcDeviceApproval));
     }
 
+    /**
+     * 新增cmc设备审批
+     */
+    @Log(title = "cmc设备审批", businessType = BusinessType.INSERT)
+    @PostMapping("/submit")
+    public AjaxResult submit(@RequestParam("form")String formData)
+    {
+        JSONObject formDataJson = JSONObject.parse(formData);
+        CmcDeviceApproval cmcDeviceApproval = new CmcDeviceApproval();
+        cmcDeviceApproval.setDeviceId(formDataJson.getString("formId"));
+        cmcDeviceApproval.setApplier(getLoginUser().getUserId());
+        cmcDeviceApproval.setApplyDate(DateUtils.getNowDate());
+        cmcDeviceApproval.setProjectNumber(formDataJson.getString("projectNumber"));
+        cmcDeviceApproval.setApplyReason(formDataJson.getString("applyReason"));
+        cmcDeviceApproval.setBeginDate(formDataJson.getDate("startTime"));
+        cmcDeviceApproval.setEndDate(formDataJson.getDate("endTime"));
+        cmcDeviceApproval.setDays(formDataJson.getLong("day"));
+        cmcDeviceApprovalService.insertCmcDeviceApproval(cmcDeviceApproval);
+        return AjaxResult.success("提交设备审批表成功");
+    }
+
     /**
      * 修改cmc设备审批
      */
@@ -86,6 +112,42 @@ public class CmcDeviceApprovalController extends BaseController
         return toAjax(cmcDeviceApprovalService.updateCmcDeviceApproval(cmcDeviceApproval));
     }
 
+    /**
+     * 修改cmc设备审批
+     */
+    @Log(title = "cmc设备审批", businessType = BusinessType.UPDATE)
+    @PutMapping("/modify")
+    public AjaxResult modify(@RequestParam("form")String formData)
+    {
+        JSONObject formDataJson = JSONObject.parse(formData);
+        CmcDeviceApproval cmcDeviceApproval = cmcDeviceApprovalService.selectCmcDeviceApprovalByDeviceApplyId(formDataJson.getString("deviceApplyId"));
+        if (formDataJson.getString("deptComment") != null) {
+            cmcDeviceApproval.setDeptUserId(getLoginUser().getUserId());
+            cmcDeviceApproval.setDeptComment(formDataJson.getString("deptComment"));
+        }
+        if (formDataJson.getString("managerComment") != null) {
+            cmcDeviceApproval.setManagerUserId(getLoginUser().getUserId());
+            cmcDeviceApproval.setManagerComment(formDataJson.getString("managerComment"));
+        }
+
+        if (formDataJson.getDate("returnDate") != null) {
+            cmcDeviceApproval.setReturnDate(formDataJson.getDate("returnDate"));
+        }
+        if (formDataJson.getString("dispatchComment") != null) {
+            cmcDeviceApproval.setDispatcher(getLoginUser().getUserId());
+            cmcDeviceApproval.setDispatchComment(formDataJson.getString("dispatchComment"));
+            String[] devices = formDataJson.getString("devices").split(",");
+            BigDecimal estimateCost = new BigDecimal(0);
+            for (String device : devices) {
+                CmcDevice cmcDevice = cmcDeviceService.selectCmcDeviceByDeviceId(Integer.parseInt(device));
+                estimateCost = estimateCost.add(cmcDevice.getDayCost().multiply(new BigDecimal(cmcDeviceApproval.getDays())));
+            }
+            cmcDeviceApproval.setEstimateCost(estimateCost);
+        }
+        cmcDeviceApprovalService.updateCmcDeviceApproval(cmcDeviceApproval);
+        return AjaxResult.success("修改设备审批表成功");
+    }
+
     /**
      * 删除cmc设备审批
      */

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

@@ -1,7 +1,11 @@
 package com.ruoyi.web.controller.oa;
 
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.DateUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -61,7 +65,7 @@ public class CmcDeviceController extends BaseController
      * 获取cmc设备信息详细信息
      */
     @GetMapping(value = "/{deviceId}")
-    public AjaxResult getInfo(@PathVariable("deviceId") Long deviceId)
+    public AjaxResult getInfo(@PathVariable("deviceId") Integer deviceId)
     {
         return success(cmcDeviceService.selectCmcDeviceByDeviceId(deviceId));
     }
@@ -73,6 +77,20 @@ public class CmcDeviceController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcDevice cmcDevice)
     {
+        if (cmcDevice.getAcquisitionTime() != null && cmcDevice.getCost() != null && cmcDevice.getDayCost() != null) {
+            // 年数总和法折旧
+            int acquisitionYear = Integer.parseInt(new SimpleDateFormat("yyyy").format(cmcDevice.getAcquisitionTime()));
+            int life = cmcDevice.getExpectLife() == null ? 0 : cmcDevice.getExpectLife();
+            int total = 0;
+            for (int i = 0; i < life + 1; i++)
+                total += i;
+            if (total > 0) {
+                int currentYear = Integer.parseInt(new SimpleDateFormat("yyyy").format(DateUtils.getNowDate()));
+                int num = life - (currentYear - acquisitionYear) + 1;
+                BigDecimal estimateCost = new BigDecimal(num  * 0.95 * 10000 / total / 365).multiply(cmcDevice.getCost());
+                cmcDevice.setDayCost(estimateCost);
+            }
+        }
         return toAjax(cmcDeviceService.insertCmcDevice(cmcDevice));
     }
 

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

@@ -56,10 +56,20 @@ public class SysPostController extends BaseController
     public TableDataInfo driverList()
     {
         startPage();
-        List<SysUser> list = postService.driverList();
+        List<SysUser> list = postService.selectDriverList();
         return getDataTable(list);
     }
 
+    /**
+     * 获取部门主任
+     */
+    @GetMapping("/deptLeader")
+    public AjaxResult getDeptLeader(String userId)
+    {
+        SysUser deptLeader = postService.selectDeptLeaderByUserId(userId);
+        return success(deptLeader);
+    }
+
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:post:export')")
     @PostMapping("/export")

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcCar.java

@@ -50,6 +50,14 @@ public class CmcCar extends BaseEntity
     @Excel(name = "车级")
     private String level;
 
+    /** 是否为租车 */
+    @Excel(name = "是否为租车")
+    private String isRent;
+
+    /** 单日成本 */
+    @Excel(name = "单日成本")
+    private BigDecimal dayCost;
+
     public void setCarId(Integer carId)
     {
         this.carId = carId;
@@ -122,6 +130,24 @@ public class CmcCar extends BaseEntity
     {
         return level;
     }
+    public void setIsRent(String isRent)
+    {
+        this.isRent = isRent;
+    }
+
+    public String getIsRent()
+    {
+        return isRent;
+    }
+    public void setDayCost(BigDecimal dayCost)
+    {
+        this.dayCost = dayCost;
+    }
+
+    public BigDecimal getDayCost()
+    {
+        return dayCost;
+    }
 
     @Override
     public String toString() {
@@ -134,6 +160,8 @@ public class CmcCar extends BaseEntity
                 .append("expectLife", getExpectLife())
                 .append("series", getSeries())
                 .append("level", getLevel())
+                .append("isRent", getIsRent())
+                .append("dayCost", getDayCost())
                 .toString();
     }
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDevice.java

@@ -19,7 +19,7 @@ public class CmcDevice extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 设备id */
-    private Long deviceId;
+    private Integer deviceId;
 
     /** 设备编号 */
     @Excel(name = "设备编号")
@@ -46,12 +46,16 @@ public class CmcDevice extends BaseEntity
     @Excel(name = "设备系列")
     private String series;
 
-    public void setDeviceId(Long deviceId) 
+    /** 单日成本 */
+    @Excel(name = "单日成本")
+    private BigDecimal dayCost;
+
+    public void setDeviceId(Integer deviceId)
     {
         this.deviceId = deviceId;
     }
 
-    public Long getDeviceId() 
+    public Integer getDeviceId()
     {
         return deviceId;
     }
@@ -109,6 +113,15 @@ public class CmcDevice extends BaseEntity
     {
         return series;
     }
+    public void setDayCost(BigDecimal dayCost)
+    {
+        this.dayCost = dayCost;
+    }
+
+    public BigDecimal getDayCost()
+    {
+        return dayCost;
+    }
 
     @Override
     public String toString() {
@@ -120,6 +133,7 @@ public class CmcDevice extends BaseEntity
             .append("cost", getCost())
             .append("expectLife", getExpectLife())
             .append("series", getSeries())
+            .append("dayCost", getDayCost())
             .toString();
     }
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDeviceApproval.java

@@ -92,6 +92,11 @@ public class CmcDeviceApproval extends BaseEntity
     @Excel(name = "申请日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date applyDate;
 
+    /** 归还日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "归还日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date returnDate;
+
     public void setDeviceApplyId(String deviceApplyId) 
     {
         this.deviceApplyId = deviceApplyId;
@@ -254,6 +259,16 @@ public class CmcDeviceApproval extends BaseEntity
     {
         return applyDate;
     }
+    public void setReturnDate(Date returnDate)
+    {
+        this.returnDate = returnDate;
+    }
+
+    public Date getReturnDate()
+    {
+        return returnDate;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -275,6 +290,7 @@ public class CmcDeviceApproval extends BaseEntity
             .append("dispatchComment", getDispatchComment())
             .append("estimateCost", getEstimateCost())
             .append("applyDate", getApplyDate())
+            .append("returnDate", getReturnDate())
             .toString();
     }
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcDeviceMapper.java

@@ -17,7 +17,7 @@ public interface CmcDeviceMapper
      * @param deviceId cmc设备信息主键
      * @return cmc设备信息
      */
-    public CmcDevice selectCmcDeviceByDeviceId(Long deviceId);
+    public CmcDevice selectCmcDeviceByDeviceId(Integer deviceId);
 
     /**
      * 查询cmc设备信息列表

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcDeviceService.java

@@ -17,7 +17,7 @@ public interface ICmcDeviceService
      * @param deviceId cmc设备信息主键
      * @return cmc设备信息
      */
-    public CmcDevice selectCmcDeviceByDeviceId(Long deviceId);
+    public CmcDevice selectCmcDeviceByDeviceId(Integer deviceId);
 
     /**
      * 查询cmc设备信息列表

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcDeviceServiceImpl.java

@@ -26,7 +26,7 @@ public class CmcDeviceServiceImpl implements ICmcDeviceService
      * @return cmc设备信息
      */
     @Override
-    public CmcDevice selectCmcDeviceByDeviceId(Long deviceId)
+    public CmcDevice selectCmcDeviceByDeviceId(Integer deviceId)
     {
         return cmcDeviceMapper.selectCmcDeviceByDeviceId(deviceId);
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java

@@ -50,5 +50,13 @@ public interface SysUserPostMapper
      * @param
      * @return 驾驶员列表
      */
-    List<SysUser> selectDriverList();
+    public List<SysUser> selectDriverList();
+
+    /**
+     * 查询部门主任
+     *
+     * @param
+     * @return 查询部门主任
+     */
+    public SysUser selectDeptLeaderByUserId(String userId);
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java

@@ -35,6 +35,7 @@ public interface ISysPostService
      */
     public SysPost selectPostById(Long postId);
 
+
     /**
      * 根据用户ID获取岗位选择框列表
      * 
@@ -105,5 +106,14 @@ public interface ISysPostService
      * @param
      * @return 驾驶员列表
      */
-    List<SysUser> driverList();
+    public List<SysUser> selectDriverList();
+
+    /**
+     * 查询部门主任
+     *
+     * @param
+     * @return 查询部门主任
+     */
+    public SysUser selectDeptLeaderByUserId(String userId);
+
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

@@ -185,7 +185,12 @@ public class SysPostServiceImpl implements ISysPostService
      * @return 驾驶员列表
      */
     @Override
-    public List<SysUser> driverList() {
+    public List<SysUser> selectDriverList() {
         return userPostMapper.selectDriverList();
     }
+
+    @Override
+    public SysUser selectDeptLeaderByUserId(String userId) {
+        return userPostMapper.selectDeptLeaderByUserId(userId);
+    }
 }

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

@@ -13,10 +13,12 @@
         <result property="expectLife"    column="expect_life"    />
         <result property="series"    column="series"    />
         <result property="level"    column="level"    />
+        <result property="isRent"    column="is_rent"    />
+        <result property="dayCost"    column="day_cost"    />
     </resultMap>
 
     <sql id="selectCmcCarVo">
-        select car_id, license_plate, driver, acquisition_time, cost, expect_life, series, level from cmc_car
+        select car_id, license_plate, driver, acquisition_time, cost, expect_life, series, level, is_rent, day_cost from cmc_car
     </sql>
 
     <select id="selectCmcCarList" parameterType="CmcCar" resultMap="CmcCarResult">
@@ -29,6 +31,8 @@
             <if test="expectLife != null "> and expect_life = #{expectLife}</if>
             <if test="series != null  and series != ''"> and series like concat('%', #{series}, '%')</if>
             <if test="level != null  and level != ''"> and level like concat('%', #{level}, '%')</if>
+            <if test="isRent != null  and isRent != ''"> and isRent = #{isRent}</if>
+            <if test="dayCost != null  and dayCost != ''"> and day_cost = #{dayCost}</if>
         </where>
     </select>
 
@@ -47,6 +51,8 @@
             <if test="expectLife != null">expect_life,</if>
             <if test="series != null">series,</if>
             <if test="level != null">level,</if>
+            <if test="isRent != null">is_rent,</if>
+            <if test="dayCost != null">day_cost,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="licensePlate != null">#{licensePlate},</if>
@@ -56,6 +62,8 @@
             <if test="expectLife != null">#{expectLife},</if>
             <if test="series != null">#{series},</if>
             <if test="level != null">#{level},</if>
+            <if test="isRent != null">#{isRent},</if>
+            <if test="dayCost != null">#{dayCost},</if>
         </trim>
     </insert>
 
@@ -69,6 +77,8 @@
             <if test="expectLife != null">expect_life = #{expectLife},</if>
             <if test="series != null">series = #{series},</if>
             <if test="level != null">level = #{level},</if>
+            <if test="isRent != null">is_rent = #{isRent},</if>
+            <if test="dayCost != null">day_cost = #{dayCost},</if>
         </trim>
         where car_id = #{carId}
     </update>

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

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="projectNumber"    column="project_number"    />
         <result property="applyReason"    column="apply_reason"    />
         <result property="applyDate"    column="apply_date"    />
+        <result property="returnDate"    column="return_date"    />
         <result property="beginDate"    column="begin_date"    />
         <result property="beginHalfday"    column="begin_halfday"    />
         <result property="endDate"    column="end_date"    />
@@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcDeviceApprovalVo">
-        select device_apply_id, applier, device_id, project_number, apply_reason, apply_date, begin_date, begin_halfday, end_date, end_halfday, days, dept_user_id, dept_comment, manager_user_id, manager_comment, dispatcher, dispatch_comment, estimate_cost from cmc_device_approval
+        select device_apply_id, applier, device_id, project_number, apply_reason, apply_date, return_date, begin_date, begin_halfday, end_date, end_halfday, days, dept_user_id, dept_comment, manager_user_id, manager_comment, dispatcher, dispatch_comment, estimate_cost from cmc_device_approval
     </sql>
 
     <select id="selectCmcDeviceApprovalList" parameterType="CmcDeviceApproval" resultMap="CmcDeviceApprovalResult">
@@ -37,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectNumber != null  and projectNumber != ''"> and project_number = #{projectNumber}</if>
             <if test="applyReason != null  and applyReason != ''"> and apply_reason = #{applyReason}</if>
             <if test="applyDate != null "> and apply_date = #{applyDate}</if>
+            <if test="returnDate != null "> and return_date = #{returnDate}</if>
             <if test="beginDate != null "> and begin_date = #{beginDate}</if>
             <if test="beginHalfday != null  and beginHalfday != ''"> and begin_halfday = #{beginHalfday}</if>
             <if test="endDate != null "> and end_date = #{endDate}</if>
@@ -66,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectNumber != null">project_number,</if>
             <if test="applyReason != null">apply_reason,</if>
             <if test="applyDate != null">apply_date,</if>
+            <if test="returnDate != null">return_date,</if>
             <if test="beginDate != null">begin_date,</if>
             <if test="beginHalfday != null">begin_halfday,</if>
             <if test="endDate != null">end_date,</if>
@@ -86,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectNumber != null">#{projectNumber},</if>
             <if test="applyReason != null">#{applyReason},</if>
             <if test="applyDate != null">#{applyDate},</if>
+            <if test="returnDate != null">#{returnDate},</if>
             <if test="beginDate != null">#{beginDate},</if>
             <if test="beginHalfday != null">#{beginHalfday},</if>
             <if test="endDate != null">#{endDate},</if>
@@ -109,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectNumber != null">project_number = #{projectNumber},</if>
             <if test="applyReason != null">apply_reason = #{applyReason},</if>
             <if test="applyDate != null">apply_date = #{applyDate},</if>
+            <if test="returnDate != null">return_date = #{returnDate},</if>
             <if test="beginDate != null">begin_date = #{beginDate},</if>
             <if test="beginHalfday != null">begin_halfday = #{beginHalfday},</if>
             <if test="endDate != null">end_date = #{endDate},</if>

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

@@ -12,10 +12,11 @@
         <result property="cost"    column="cost"    />
         <result property="expectLife"    column="expect_life"    />
         <result property="series"    column="series"    />
+        <result property="dayCost"    column="dayCost"    />
     </resultMap>
 
     <sql id="selectCmcDeviceVo">
-        select device_id, code, type, acquisition_time, cost, expect_life, series from cmc_device
+        select device_id, code, type, acquisition_time, cost, expect_life, series, day_cost from cmc_device
     </sql>
 
     <select id="selectCmcDeviceList" parameterType="CmcDevice" resultMap="CmcDeviceResult">
@@ -25,12 +26,13 @@
             <if test="type != null  and type != ''"> and type like concat('%', #{type}, '%')</if>
             <if test="acquisitionTime != null "> and acquisition_time = #{acquisitionTime}</if>
             <if test="cost != null "> and cost = #{cost}</if>
+            <if test="dayCost != null "> and day_cost = #{dayCost}</if>
             <if test="expectLife != null "> and expect_life = #{expectLife}</if>
             <if test="series != null  and series != ''"> and series like concat('%', #{series}, '%')</if>
         </where>
     </select>
 
-    <select id="selectCmcDeviceByDeviceId" parameterType="Long" resultMap="CmcDeviceResult">
+    <select id="selectCmcDeviceByDeviceId" parameterType="Integer" resultMap="CmcDeviceResult">
         <include refid="selectCmcDeviceVo"/>
         where device_id = #{deviceId}
     </select>
@@ -42,6 +44,7 @@
             <if test="type != null">type,</if>
             <if test="acquisitionTime != null">acquisition_time,</if>
             <if test="cost != null">cost,</if>
+            <if test="dayCost != null">day_cost,</if>
             <if test="expectLife != null">expect_life,</if>
             <if test="series != null">series,</if>
         </trim>
@@ -50,6 +53,7 @@
             <if test="type != null">#{type},</if>
             <if test="acquisitionTime != null">#{acquisitionTime},</if>
             <if test="cost != null">#{cost},</if>
+            <if test="dayCost != null">#{dayCost},</if>
             <if test="expectLife != null">#{expectLife},</if>
             <if test="series != null">#{series},</if>
         </trim>
@@ -62,6 +66,7 @@
             <if test="type != null">type = #{type},</if>
             <if test="acquisitionTime != null">acquisition_time = #{acquisitionTime},</if>
             <if test="cost != null">cost = #{cost},</if>
+            <if test="dayCost != null">day_cost = #{dayCost},</if>
             <if test="expectLife != null">expect_life = #{expectLife},</if>
             <if test="series != null">series = #{series},</if>
         </trim>

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

@@ -14,14 +14,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="nickName"     column="nick_name"    />
 	</resultMap>
 
-	<select id="selectDriverList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.pm_level, u.titles, u.update_reason, u.engineer_level, u.entry_date, u.age,
-			   up.post_id
+	<select id="selectDriverList" resultMap="SysUserResult">
+		select u.user_id, u.nick_name
 		from sys_user u
 				 left join sys_user_post up on u.user_id = up.user_id
 		where up.post_id = 27
 	</select>
 
+	<select id="selectDeptLeaderByUserId" parameterType="String" resultMap="SysUserResult">
+		select r.user_id, r.nick_name, up.post_id from
+		(select u1.user_id, u1.nick_name, u.dept_id from
+		sys_user as u, sys_user as u1 where u.user_id = #{param} and u1.dept_id = u.dept_id) as r
+		left join sys_user_post as up
+		on r.user_id = up.user_id
+		where up.post_id = 12
+	</select>
+
 	<delete id="deleteUserPostByUserId" parameterType="Long">
 		delete from sys_user_post where user_id=#{userId}
 	</delete>

oa-back/sql/sql.sql

@@ -1407,6 +1407,8 @@ create table `cmc_car`  (
   `expect_life`			int					default null				comment '预计使用年限',
   `series`				varchar(10)			default null				comment '车系',
   `level`				varchar(10)			default null				comment '车级',
+  `is_rent`				char(1)				default null				comment '是否为租车',
+  `day_cost`			decimal(10,2)		default null				comment '单日成本',
   primary key (`car_id`)
 ) engine = innodb comment = 'cmc车辆信息表';
 
@@ -1490,6 +1492,7 @@ create table `cmc_device_approval`  (
   `dispatch_comment`	varchar(255)	default null 	comment '调度审批意见',
   `estimate_cost`		decimal(10,2)	default null	comment '预计设备成本',
   `apply_date`			date			default null 	comment '申请日期',
+  `return_date`			date			default null 	comment '归还日期',
   primary key (`device_apply_id`)
 ) engine = innodb comment = 'cmc设备审批表';
 

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

@@ -40,21 +40,22 @@
       <!-- <el-table-column label="驾驶员" align="center" prop="driver" /> -->
       <el-table-column label="车系" align="center" prop="series" />
       <el-table-column label="车级" align="center" prop="level" />
-      <el-table-column label="购卖时间" align="center" prop="acquisitionTime" />
+      <el-table-column label="购置时间" align="center" prop="acquisitionTime" />
+      <el-table-column label="是否为租车" align="center" prop="isRent" >{{ idRent == "0" ? "否" : "是" }}</el-table-column>
       <el-table-column label="总价" align="center" prop="cost">
         <template slot-scope="scope">
           {{ scope.row.cost + '万元' }}
         </template>
       </el-table-column>
       <el-table-column label="预计使用年限" align="center" prop="expectLife" />
-      <!-- <el-table-column label="使用成本（天）" align="center" prop="driver" /> -->
+      <el-table-column label="使用成本（天）" align="center" prop="dayCost" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['oa:car:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" style="color: #fc0000;" @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:car:remove']">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" style="color: #fc0000;"
+            @click="handleDelete(scope.row)" v-hasPermi="['oa:car:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -74,7 +75,7 @@
         <el-form-item label="车级" prop="level">
           <el-input v-model="form.level" placeholder="请输入车级" />
         </el-form-item>
-        <el-form-item label="购卖时间" prop="acquisitionTime">
+        <el-form-item label="购置时间" prop="acquisitionTime">
           <el-date-picker v-model="form.acquisitionTime" type="date" placeholder="选择日期" format="yyyy-MM-dd"
             value-format="yyyy-MM-dd">
           </el-date-picker>
@@ -84,7 +85,7 @@
           <span>万元</span>
         </el-form-item>
         <el-form-item label="预计使用年限" prop="expectLife">
-          <el-input v-model="form.expectLife" placeholder="请输入年限"  style="width:130px;margin-right:10px;" />
+          <el-input v-model="form.expectLife" placeholder="请输入年限" style="width:130px;margin-right:10px;" />
           <span>年</span>
         </el-form-item>
         <el-form-item label="驾驶员" prop="driver">
@@ -93,6 +94,16 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="是否为租车" prop="isRent">
+          <el-radio-group v-model="form.isRent">
+            <el-radio label="0">否</el-radio>
+            <el-radio label="1">是</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-if="form.isRent == '1'" label="使用成本（天）" prop="dayCost">
+          <el-input style="width:130px;margin-right:10px;" v-model="form.dayCost" placeholder="请输入金额" />
+          <span>元</span>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>