1提交、修改用车申请；

2估算用车成本采用年数总和法折旧

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

@@ -1,21 +1,22 @@
 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.*;
+import com.ruoyi.oa.service.ICmcCarService;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysUserService;
 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;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.oa.domain.CmcCarApproval;
 import com.ruoyi.oa.service.ICmcCarApprovalService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -33,6 +34,15 @@ public class CmcCarApprovalController extends BaseController
     @Autowired
     private ICmcCarApprovalService cmcCarApprovalService;
 
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private ISysDeptService deptService;
+
+    @Autowired
+    private ICmcCarService cmcCarService;
+
     /**
      * 查询cmc用车审批列表
      */
@@ -62,7 +72,28 @@ public class CmcCarApprovalController extends BaseController
     @GetMapping(value = "/{carApplyId}")
     public AjaxResult getInfo(@PathVariable("carApplyId") String carApplyId)
     {
-        return success(cmcCarApprovalService.selectCmcCarApprovalByCarApplyId(carApplyId));
+        JSONObject formData = new JSONObject();
+        CmcCarApproval cmcCarApproval = cmcCarApprovalService.selectCmcCarApprovalByCarApplyId(carApplyId);
+        formData.put("user", userService.selectUserById(cmcCarApproval.getApplier()).getNickName());
+        formData.put("deptName", deptService.selectDeptById(userService.selectUserById(cmcCarApproval.getApplier()).getDeptId()).getDeptName());
+        formData.put("date", cmcCarApproval.getApplyDate());
+        formData.put("startTime", cmcCarApproval.getBeginDate());
+        formData.put("endTime", cmcCarApproval.getEndDate());
+        formData.put("day", cmcCarApproval.getDays());
+        formData.put("passengers", cmcCarApproval.getPassengers());
+        formData.put("projectNumber", cmcCarApproval.getProjectNumber());
+        formData.put("applyReason", cmcCarApproval.getApplyReason());
+        formData.put("deptUser", userService.selectUserById(cmcCarApproval.getDeptUserId()).getNickName());
+        formData.put("deptComment", cmcCarApproval.getDeptComment());
+        formData.put("managerUser", userService.selectUserById(cmcCarApproval.getManagerUserId()).getNickName());
+        formData.put("managerComment", cmcCarApproval.getManagerComment());
+        formData.put("unionUser", userService.selectUserById(cmcCarApproval.getUnionUserId()).getNickName());
+        formData.put("unionComment", cmcCarApproval.getUnionComment());
+        formData.put("dispatcher", userService.selectUserById(cmcCarApproval.getDispatcher()).getNickName());
+        formData.put("dispatchComment", cmcCarApproval.getDispatchComment());
+        formData.put("cars", cmcCarApproval.getCars());
+        formData.put("drivers", cmcCarApproval.getDrivers());
+        return success(formData);
     }
 
     /**
@@ -75,6 +106,28 @@ public class CmcCarApprovalController extends BaseController
         return toAjax(cmcCarApprovalService.insertCmcCarApproval(cmcCarApproval));
     }
 
+    /**
+     * 提交用车审批表
+     */
+    @Log(title = "用车审批表", businessType = BusinessType.INSERT)
+    @PostMapping( "/submit")
+    public AjaxResult submit(@RequestParam("form")String formData)
+    {
+        JSONObject formDataJson = JSONObject.parse(formData);
+        CmcCarApproval cmcCarApproval = new CmcCarApproval();
+        cmcCarApproval.setCarApplyId(formDataJson.getString("formId"));
+        cmcCarApproval.setApplier(getLoginUser().getUserId());
+        cmcCarApproval.setApplyDate(DateUtils.getNowDate());
+        cmcCarApproval.setProjectNumber(formDataJson.getString("projectNumber"));
+        cmcCarApproval.setApplyReason(formDataJson.getString("applyReason"));
+        cmcCarApproval.setPassengers(formDataJson.getInteger("passengers"));
+        cmcCarApproval.setBeginDate(formDataJson.getDate("startTime"));
+        cmcCarApproval.setEndDate(formDataJson.getDate("endTime"));
+        cmcCarApproval.setDays(formDataJson.getLong("day"));
+        cmcCarApprovalService.insertCmcCarApproval(cmcCarApproval);
+        return AjaxResult.success("提交用车审批表成功");
+    }
+
     /**
      * 修改cmc用车审批
      */
@@ -85,6 +138,54 @@ public class CmcCarApprovalController extends BaseController
         return toAjax(cmcCarApprovalService.updateCmcCarApproval(cmcCarApproval));
     }
 
+    /**
+     * 修改用车审批表
+     */
+    @Log(title = "用车审批表", businessType = BusinessType.UPDATE)
+    @PutMapping( "/modify")
+    public AjaxResult modify(@RequestParam("form")String formData)
+    {
+        JSONObject formDataJson = JSONObject.parse(formData);
+        CmcCarApproval cmcCarApproval = cmcCarApprovalService.selectCmcCarApprovalByCarApplyId(formDataJson.getString("carApplyId"));
+        if (formDataJson.getString("deptComment") != null) {
+            cmcCarApproval.setDeptUserId(getLoginUser().getUserId());
+            cmcCarApproval.setDeptComment(formDataJson.getString("deptComment"));
+        }
+        if (formDataJson.getString("managerComment") != null) {
+            cmcCarApproval.setManagerUserId(getLoginUser().getUserId());
+            cmcCarApproval.setManagerComment(formDataJson.getString("managerComment"));
+        }
+        if (formDataJson.getString("unionComment") != null) {
+            cmcCarApproval.setUnionUserId(getLoginUser().getUserId());
+            cmcCarApproval.setUnionComment(formDataJson.getString("unionComment"));
+        }
+        if (formDataJson.getString("dispatchComment") != null) {
+            cmcCarApproval.setDispatcher(getLoginUser().getUserId());
+            cmcCarApproval.setDispatchComment(formDataJson.getString("dispatchComment"));
+            cmcCarApproval.setCars(formDataJson.getString("cars"));
+            cmcCarApproval.setDrivers(formDataJson.getString("drivers"));
+            String[] cars = formDataJson.getString("cars").split(",");
+            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()));
+                    }
+                }
+            }
+        }
+        cmcCarApprovalService.updateCmcCarApproval(cmcCarApproval);
+        return AjaxResult.success("修改用车审批表成功");
+    }
+
     /**
      * 删除cmc用车审批
      */

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

@@ -60,7 +60,7 @@ public class CmcCarController extends BaseController
      * 获取cmc车辆信息详细信息
      */
     @GetMapping(value = "/{carId}")
-    public AjaxResult getInfo(@PathVariable("carId") Long carId)
+    public AjaxResult getInfo(@PathVariable("carId") Integer carId)
     {
         return success(cmcCarService.selectCmcCarByCarId(carId));
     }

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

@@ -37,7 +37,6 @@ public class CmcDeviceApprovalController extends BaseController
     /**
      * 查询cmc设备审批列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:approval:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcDeviceApproval cmcDeviceApproval)
     {
@@ -49,7 +48,6 @@ public class CmcDeviceApprovalController extends BaseController
     /**
      * 导出cmc设备审批列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:approval:export')")
     @Log(title = "cmc设备审批", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcDeviceApproval cmcDeviceApproval)
@@ -62,7 +60,6 @@ public class CmcDeviceApprovalController extends BaseController
     /**
      * 获取cmc设备审批详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:approval:query')")
     @GetMapping(value = "/{deviceApplyId}")
     public AjaxResult getInfo(@PathVariable("deviceApplyId") String deviceApplyId)
     {
@@ -72,7 +69,6 @@ public class CmcDeviceApprovalController extends BaseController
     /**
      * 新增cmc设备审批
      */
-    @PreAuthorize("@ss.hasPermi('oa:approval:add')")
     @Log(title = "cmc设备审批", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcDeviceApproval cmcDeviceApproval)
@@ -83,7 +79,6 @@ public class CmcDeviceApprovalController extends BaseController
     /**
      * 修改cmc设备审批
      */
-    @PreAuthorize("@ss.hasPermi('oa:approval:edit')")
     @Log(title = "cmc设备审批", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcDeviceApproval cmcDeviceApproval)
@@ -94,7 +89,6 @@ public class CmcDeviceApprovalController extends BaseController
     /**
      * 删除cmc设备审批
      */
-    @PreAuthorize("@ss.hasPermi('oa:approval:remove')")
     @Log(title = "cmc设备审批", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{deviceApplyIds}")
     public AjaxResult remove(@PathVariable String[] deviceApplyIds)

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

@@ -37,7 +37,6 @@ public class CmcDeviceController extends BaseController
     /**
      * 查询cmc设备信息列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:device:list')")
     @GetMapping("/list")
     public TableDataInfo list(CmcDevice cmcDevice)
     {
@@ -49,7 +48,6 @@ public class CmcDeviceController extends BaseController
     /**
      * 导出cmc设备信息列表
      */
-    @PreAuthorize("@ss.hasPermi('oa:device:export')")
     @Log(title = "cmc设备信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CmcDevice cmcDevice)
@@ -62,7 +60,6 @@ public class CmcDeviceController extends BaseController
     /**
      * 获取cmc设备信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:device:query')")
     @GetMapping(value = "/{deviceId}")
     public AjaxResult getInfo(@PathVariable("deviceId") Long deviceId)
     {
@@ -72,7 +69,6 @@ public class CmcDeviceController extends BaseController
     /**
      * 新增cmc设备信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:device:add')")
     @Log(title = "cmc设备信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CmcDevice cmcDevice)
@@ -83,7 +79,6 @@ public class CmcDeviceController extends BaseController
     /**
      * 修改cmc设备信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:device:edit')")
     @Log(title = "cmc设备信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CmcDevice cmcDevice)
@@ -94,7 +89,6 @@ public class CmcDeviceController extends BaseController
     /**
      * 删除cmc设备信息
      */
-    @PreAuthorize("@ss.hasPermi('oa:device:remove')")
     @Log(title = "cmc设备信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{deviceIds}")
     public AjaxResult remove(@PathVariable Long[] deviceIds)

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

@@ -19,7 +19,7 @@ public class CmcCar extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 车辆id */
-    private Long carId;
+    private Integer carId;
 
     /** 车牌号 */
     @Excel(name = "车牌号")
@@ -50,12 +50,12 @@ public class CmcCar extends BaseEntity
     @Excel(name = "车级")
     private String level;
 
-    public void setCarId(Long carId)
+    public void setCarId(Integer carId)
     {
         this.carId = carId;
     }
 
-    public Long getCarId()
+    public Integer getCarId()
     {
         return carId;
     }

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

@@ -43,7 +43,7 @@ public class CmcCarApproval extends BaseEntity
 
     /** 人数 */
     @Excel(name = "人数")
-    private Long passengers;
+    private Integer passengers;
 
     /** 开始日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -103,6 +103,11 @@ public class CmcCarApproval extends BaseEntity
     @Excel(name = "预计用车成本")
     private BigDecimal estimateCost;
 
+    /** 申请日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "申请日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date applyDate;
+
     public void setCarApplyId(String carApplyId)
     {
         this.carApplyId = carApplyId;
@@ -157,12 +162,12 @@ public class CmcCarApproval extends BaseEntity
     {
         return applyReason;
     }
-    public void setPassengers(Long passengers)
+    public void setPassengers(Integer passengers)
     {
         this.passengers = passengers;
     }
 
-    public Long getPassengers()
+    public Integer getPassengers()
     {
         return passengers;
     }
@@ -292,6 +297,15 @@ public class CmcCarApproval extends BaseEntity
     {
         return estimateCost;
     }
+    public void setApplyDate(Date applyDate)
+    {
+        this.applyDate = applyDate;
+    }
+
+    public Date getApplyDate()
+    {
+        return applyDate;
+    }
 
     @Override
     public String toString() {
@@ -317,6 +331,7 @@ public class CmcCarApproval extends BaseEntity
                 .append("dispatcher", getDispatcher())
                 .append("dispatchComment", getDispatchComment())
                 .append("estimateCost", getEstimateCost())
+                .append("applyDate", getApplyDate())
                 .toString();
     }
 }

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

@@ -87,6 +87,11 @@ public class CmcDeviceApproval extends BaseEntity
     @Excel(name = "预计设备成本")
     private BigDecimal estimateCost;
 
+    /** 申请日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "申请日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date applyDate;
+
     public void setDeviceApplyId(String deviceApplyId) 
     {
         this.deviceApplyId = deviceApplyId;
@@ -240,7 +245,15 @@ public class CmcDeviceApproval extends BaseEntity
     {
         return estimateCost;
     }
+    public void setApplyDate(Date applyDate)
+    {
+        this.applyDate = applyDate;
+    }
 
+    public Date getApplyDate()
+    {
+        return applyDate;
+    }
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -261,6 +274,7 @@ public class CmcDeviceApproval extends BaseEntity
             .append("dispatcher", getDispatcher())
             .append("dispatchComment", getDispatchComment())
             .append("estimateCost", getEstimateCost())
+            .append("applyDate", getApplyDate())
             .toString();
     }
 }

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

@@ -17,7 +17,7 @@ public interface CmcCarMapper
      * @param carId cmc车辆信息主键
      * @return cmc车辆信息
      */
-    public CmcCar selectCmcCarByCarId(Long carId);
+    public CmcCar selectCmcCarByCarId(Integer carId);
 
     /**
      * 查询cmc车辆信息列表

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

@@ -17,7 +17,7 @@ public interface ICmcCarService
      * @param carId cmc车辆信息主键
      * @return cmc车辆信息
      */
-    public CmcCar selectCmcCarByCarId(Long carId);
+    public CmcCar selectCmcCarByCarId(Integer carId);
 
     /**
      * 查询cmc车辆信息列表

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

@@ -26,7 +26,7 @@ public class CmcCarServiceImpl implements ICmcCarService
      * @return cmc车辆信息
      */
     @Override
-    public CmcCar selectCmcCarByCarId(Long carId)
+    public CmcCar selectCmcCarByCarId(Integer carId)
     {
         return cmcCarMapper.selectCmcCarByCarId(carId);
     }

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

@@ -12,6 +12,7 @@
         <result property="projectNumber"    column="project_number"    />
         <result property="applyReason"    column="apply_reason"    />
         <result property="passengers"    column="passengers"    />
+        <result property="applyDate"    column="apply_date"    />
         <result property="beginDate"    column="begin_date"    />
         <result property="beginHalfday"    column="begin_halfday"    />
         <result property="endDate"    column="end_date"    />
@@ -29,7 +30,7 @@
     </resultMap>
 
     <sql id="selectCmcCarApprovalVo">
-        select car_apply_id, applier, cars, drivers, project_number, apply_reason, passengers, begin_date, begin_halfday, end_date, end_halfday, days, dept_user_id, dept_comment, manager_user_id, manager_comment, union_user_id, union_comment, dispatcher, dispatch_comment, estimate_cost from cmc_car_approval
+        select car_apply_id, applier, cars, drivers, project_number, apply_reason, passengers, apply_date, begin_date, begin_halfday, end_date, end_halfday, days, dept_user_id, dept_comment, manager_user_id, manager_comment, union_user_id, union_comment, dispatcher, dispatch_comment, estimate_cost from cmc_car_approval
     </sql>
 
     <select id="selectCmcCarApprovalList" parameterType="CmcCarApproval" resultMap="CmcCarApprovalResult">
@@ -41,6 +42,7 @@
             <if test="projectNumber != null  and projectNumber != ''"> and project_number = #{projectNumber}</if>
             <if test="applyReason != null  and applyReason != ''"> and apply_reason = #{applyReason}</if>
             <if test="passengers != null "> and passengers = #{passengers}</if>
+            <if test="applyDate != null "> and apply_date = #{beginDate}</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>
@@ -73,6 +75,7 @@
             <if test="projectNumber != null">project_number,</if>
             <if test="applyReason != null">apply_reason,</if>
             <if test="passengers != null">passengers,</if>
+            <if test="applyDate != null">apply_date,</if>
             <if test="beginDate != null">begin_date,</if>
             <if test="beginHalfday != null">begin_halfday,</if>
             <if test="endDate != null">end_date,</if>
@@ -96,6 +99,7 @@
             <if test="projectNumber != null">#{projectNumber},</if>
             <if test="applyReason != null">#{applyReason},</if>
             <if test="passengers != null">#{passengers},</if>
+            <if test="applyDate != null">#{applyDate},</if>
             <if test="beginDate != null">#{beginDate},</if>
             <if test="beginHalfday != null">#{beginHalfday},</if>
             <if test="endDate != null">#{endDate},</if>
@@ -122,6 +126,7 @@
             <if test="projectNumber != null">project_number = #{projectNumber},</if>
             <if test="applyReason != null">apply_reason = #{applyReason},</if>
             <if test="passengers != null">passengers = #{passengers},</if>
+            <if test="applyDate != null">apply_date = #{applyDate},</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/CmcCarMapper.xml

@@ -22,17 +22,17 @@
     <select id="selectCmcCarList" parameterType="CmcCar" resultMap="CmcCarResult">
         <include refid="selectCmcCarVo"/>
         <where>
-            <if test="licensePlate != null  and licensePlate != ''"> and license_plate = #{licensePlate}</if>
+            <if test="licensePlate != null  and licensePlate != ''"> and license_plate like concat('%', #{licensePlate}, '%')</if>
             <if test="driver != null "> and driver = #{driver}</if>
             <if test="acquisitionTime != null "> and acquisition_time = #{acquisitionTime}</if>
             <if test="cost != null "> and cost = #{cost}</if>
             <if test="expectLife != null "> and expect_life = #{expectLife}</if>
-            <if test="series != null  and series != ''"> and series = #{series}</if>
-            <if test="level != null  and level != ''"> and level = #{level}</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>
         </where>
     </select>
 
-    <select id="selectCmcCarByCarId" parameterType="Long" resultMap="CmcCarResult">
+    <select id="selectCmcCarByCarId" parameterType="Integer" resultMap="CmcCarResult">
         <include refid="selectCmcCarVo"/>
         where car_id = #{carId}
     </select>

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

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deviceId"    column="device_id"    />
         <result property="projectNumber"    column="project_number"    />
         <result property="applyReason"    column="apply_reason"    />
+        <result property="applyDate"    column="apply_date"    />
         <result property="beginDate"    column="begin_date"    />
         <result property="beginHalfday"    column="begin_halfday"    />
         <result property="endDate"    column="end_date"    />
@@ -25,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcDeviceApprovalVo">
-        select device_apply_id, applier, device_id, project_number, apply_reason, 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, 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">
@@ -35,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceId != null  and deviceId != ''"> and device_id = #{deviceId}</if>
             <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="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>
@@ -63,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceId != null">device_id,</if>
             <if test="projectNumber != null">project_number,</if>
             <if test="applyReason != null">apply_reason,</if>
+            <if test="applyDate != null">apply_date,</if>
             <if test="beginDate != null">begin_date,</if>
             <if test="beginHalfday != null">begin_halfday,</if>
             <if test="endDate != null">end_date,</if>
@@ -82,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceId != null">#{deviceId},</if>
             <if test="projectNumber != null">#{projectNumber},</if>
             <if test="applyReason != null">#{applyReason},</if>
+            <if test="applyDate != null">#{applyDate},</if>
             <if test="beginDate != null">#{beginDate},</if>
             <if test="beginHalfday != null">#{beginHalfday},</if>
             <if test="endDate != null">#{endDate},</if>
@@ -104,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceId != null">device_id = #{deviceId},</if>
             <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="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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.oa.mapper.CmcDeviceMapper">
-    
+
     <resultMap type="CmcDevice" id="CmcDeviceResult">
         <result property="deviceId"    column="device_id"    />
         <result property="code"    column="code"    />
@@ -20,21 +20,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCmcDeviceList" parameterType="CmcDevice" resultMap="CmcDeviceResult">
         <include refid="selectCmcDeviceVo"/>
-        <where>  
-            <if test="code != null  and code != ''"> and code = #{code}</if>
-            <if test="type != null  and type != ''"> and type = #{type}</if>
+        <where>
+            <if test="code != null  and code != ''"> and code like concat('%', #{code}, '%')</if>
+            <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="expectLife != null "> and expect_life = #{expectLife}</if>
-            <if test="series != null  and series != ''"> and series = #{series}</if>
+            <if test="series != null  and series != ''"> and series like concat('%', #{series}, '%')</if>
         </where>
     </select>
-    
+
     <select id="selectCmcDeviceByDeviceId" parameterType="Long" resultMap="CmcDeviceResult">
         <include refid="selectCmcDeviceVo"/>
         where device_id = #{deviceId}
     </select>
-        
+
     <insert id="insertCmcDevice" parameterType="CmcDevice" useGeneratedKeys="true" keyProperty="deviceId">
         insert into cmc_device
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cost != null">cost,</if>
             <if test="expectLife != null">expect_life,</if>
             <if test="series != null">series,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="code != null">#{code},</if>
             <if test="type != null">#{type},</if>
@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cost != null">#{cost},</if>
             <if test="expectLife != null">#{expectLife},</if>
             <if test="series != null">#{series},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateCmcDevice" parameterType="CmcDevice">
@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCmcDeviceByDeviceIds" parameterType="String">
-        delete from cmc_device where device_id in 
+        delete from cmc_device where device_id in
         <foreach item="deviceId" collection="array" open="(" separator="," close=")">
             #{deviceId}
         </foreach>

oa-ui/src/api/oa/car/carApproval.js

@@ -1,3 +1,9 @@
+/*
+ * @Author: wrh
+ * @Date: 2024-03-05 17:26:42
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-03-06 13:43:59
+ */
 import request from '@/utils/request'
 
 // 查询cmc用车审批列表
@@ -26,6 +32,15 @@ export function addCarApproval(data) {
   })
 }
 
+// 新增cmc用车审批
+export function submitCarApproval(data) {
+  return request({
+    url: '/oa/carApproval/submit',
+    method: 'post',
+    data: data
+  })
+}
+
 // 修改cmc用车审批
 export function updateCarApproval(data) {
   return request({
@@ -35,6 +50,15 @@ export function updateCarApproval(data) {
   })
 }
 
+// 修改cmc用车审批
+export function modifyCarApproval(data) {
+  return request({
+    url: '/oa/carApproval/modify',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除cmc用车审批
 export function delCarApproval(carApplyId) {
   return request({