用车申请表单设计

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

@@ -114,7 +114,6 @@ public class CmcAssessController extends BaseController
                 formData.put("projectNumber", cmcProjectService.selectCmcProjectByProjectId(cmcAssess.getProjectId()).getProjectNumber());
                 formData.put("projectName", cmcProjectService.selectCmcProjectByProjectId(cmcAssess.getProjectId()).getProjectName());
             }
-
             formData.put("otherWork", cmcAssess.getOtherWork());
             formData.put("selfAssess", cmcAssess.getSelfAssess());
             formData.put("deptAssesser", cmcAssess.getDeptAssesser());

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

@@ -0,0 +1,104 @@
+package com.ruoyi.oa.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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 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;
+
+/**
+ * cmc用车审批Controller
+ * 
+ * @author cmc
+ * @date 2024-02-23
+ */
+@RestController
+@RequestMapping("/oa/approval")
+public class CmcCarApprovalController extends BaseController
+{
+    @Autowired
+    private ICmcCarApprovalService cmcCarApprovalService;
+
+    /**
+     * 查询cmc用车审批列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:approval:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CmcCarApproval cmcCarApproval)
+    {
+        startPage();
+        List<CmcCarApproval> list = cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc用车审批列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:approval:export')")
+    @Log(title = "cmc用车审批", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcCarApproval cmcCarApproval)
+    {
+        List<CmcCarApproval> list = cmcCarApprovalService.selectCmcCarApprovalList(cmcCarApproval);
+        ExcelUtil<CmcCarApproval> util = new ExcelUtil<CmcCarApproval>(CmcCarApproval.class);
+        util.exportExcel(response, list, "cmc用车审批数据");
+    }
+
+    /**
+     * 获取cmc用车审批详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:approval:query')")
+    @GetMapping(value = "/{carApplyId}")
+    public AjaxResult getInfo(@PathVariable("carApplyId") String carApplyId)
+    {
+        return success(cmcCarApprovalService.selectCmcCarApprovalByCarApplyId(carApplyId));
+    }
+
+    /**
+     * 新增cmc用车审批
+     */
+    @PreAuthorize("@ss.hasPermi('oa:approval:add')")
+    @Log(title = "cmc用车审批", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcCarApproval cmcCarApproval)
+    {
+        return toAjax(cmcCarApprovalService.insertCmcCarApproval(cmcCarApproval));
+    }
+
+    /**
+     * 修改cmc用车审批
+     */
+    @PreAuthorize("@ss.hasPermi('oa:approval:edit')")
+    @Log(title = "cmc用车审批", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcCarApproval cmcCarApproval)
+    {
+        return toAjax(cmcCarApprovalService.updateCmcCarApproval(cmcCarApproval));
+    }
+
+    /**
+     * 删除cmc用车审批
+     */
+    @PreAuthorize("@ss.hasPermi('oa:approval:remove')")
+    @Log(title = "cmc用车审批", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{carApplyIds}")
+    public AjaxResult remove(@PathVariable String[] carApplyIds)
+    {
+        return toAjax(cmcCarApprovalService.deleteCmcCarApprovalByCarApplyIds(carApplyIds));
+    }
+}

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

@@ -0,0 +1,104 @@
+package com.ruoyi.oa.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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 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.CmcCar;
+import com.ruoyi.oa.service.ICmcCarService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc车辆信息Controller
+ * 
+ * @author cmc
+ * @date 2024-02-23
+ */
+@RestController
+@RequestMapping("/oa/car")
+public class CmcCarController extends BaseController
+{
+    @Autowired
+    private ICmcCarService cmcCarService;
+
+    /**
+     * 查询cmc车辆信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:car:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CmcCar cmcCar)
+    {
+        startPage();
+        List<CmcCar> list = cmcCarService.selectCmcCarList(cmcCar);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc车辆信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:car:export')")
+    @Log(title = "cmc车辆信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcCar cmcCar)
+    {
+        List<CmcCar> list = cmcCarService.selectCmcCarList(cmcCar);
+        ExcelUtil<CmcCar> util = new ExcelUtil<CmcCar>(CmcCar.class);
+        util.exportExcel(response, list, "cmc车辆信息数据");
+    }
+
+    /**
+     * 获取cmc车辆信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:car:query')")
+    @GetMapping(value = "/{carId}")
+    public AjaxResult getInfo(@PathVariable("carId") Long carId)
+    {
+        return success(cmcCarService.selectCmcCarByCarId(carId));
+    }
+
+    /**
+     * 新增cmc车辆信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:car:add')")
+    @Log(title = "cmc车辆信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcCar cmcCar)
+    {
+        return toAjax(cmcCarService.insertCmcCar(cmcCar));
+    }
+
+    /**
+     * 修改cmc车辆信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:car:edit')")
+    @Log(title = "cmc车辆信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcCar cmcCar)
+    {
+        return toAjax(cmcCarService.updateCmcCar(cmcCar));
+    }
+
+    /**
+     * 删除cmc车辆信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:car:remove')")
+    @Log(title = "cmc车辆信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{carIds}")
+    public AjaxResult remove(@PathVariable Long[] carIds)
+    {
+        return toAjax(cmcCarService.deleteCmcCarByCarIds(carIds));
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.ruoyi.oa.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * cmc车辆信息对象 cmc_car
+ * 
+ * @author cmc
+ * @date 2024-02-23
+ */
+public class CmcCar extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 车辆id */
+    private Long carId;
+
+    /** 车牌号 */
+    @Excel(name = "车牌号")
+    private String licensePlate;
+
+    /** 驾驶员（常用） */
+    @Excel(name = "驾驶员", readConverterExp = "常=用")
+    private Long driver;
+
+    public void setCarId(Long carId) 
+    {
+        this.carId = carId;
+    }
+
+    public Long getCarId() 
+    {
+        return carId;
+    }
+    public void setLicensePlate(String licensePlate) { this.licensePlate = licensePlate; }
+
+    public String getLicensePlate() { return licensePlate; }
+    public void setDriver(Long driver) 
+    {
+        this.driver = driver;
+    }
+
+    public Long getDriver() 
+    {
+        return driver;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("carId", getCarId())
+            .append("license plate", getLicensePlate())
+            .append("driver", getDriver())
+            .toString();
+    }
+}

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

@@ -0,0 +1,307 @@
+package com.ruoyi.oa.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * cmc用车审批对象 cmc_car_approval
+ * 
+ * @author cmc
+ * @date 2024-02-23
+ */
+public class CmcCarApproval extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用车申请id */
+    private String carApplyId;
+
+    /** 申请人 */
+    @Excel(name = "申请人")
+    private Long applier;
+
+    /** 车辆id */
+    @Excel(name = "车辆id")
+    private String cars;
+
+    /** 驾驶员id */
+    @Excel(name = "驾驶员id")
+    private String drivers;
+
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private String projectNumber;
+
+    /** 用车事由 */
+    @Excel(name = "用车事由")
+    private String applyReason;
+
+    /** 人数 */
+    @Excel(name = "人数")
+    private Long passengers;
+
+    /** 开始日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "开始日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date beginDate;
+
+    /** 开始日期上/下午 */
+    @Excel(name = "开始日期上/下午")
+    private String beginHalfday;
+
+    /** 结束日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "结束日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endDate;
+
+    /** 结束日期上/下午 */
+    @Excel(name = "结束日期上/下午")
+    private String endHalfday;
+
+    /** 天数 */
+    @Excel(name = "天数")
+    private Long days;
+
+    /** 部门审批人 */
+    @Excel(name = "部门审批人")
+    private Long deptUserId;
+
+    /** 部门审批意见 */
+    @Excel(name = "部门审批意见")
+    private String deptComment;
+
+    /** 分管审批人 */
+    @Excel(name = "分管审批人")
+    private Long managerUserId;
+
+    /** 分管审批意见 */
+    @Excel(name = "分管审批意见")
+    private String managerComment;
+
+    /** 工会审批人 */
+    @Excel(name = "工会审批人")
+    private Long unionUserId;
+
+    /** 工会审批意见 */
+    @Excel(name = "工会审批意见")
+    private String unionComment;
+
+    /** 调度员 */
+    @Excel(name = "调度员")
+    private Long dispatcher;
+
+    /** 调度审批意见 */
+    @Excel(name = "调度审批意见")
+    private String dispatchComment;
+
+    public void setCarApplyId(String carApplyId) 
+    {
+        this.carApplyId = carApplyId;
+    }
+
+    public String getCarApplyId() 
+    {
+        return carApplyId;
+    }
+    public void setApplier(Long applier) 
+    {
+        this.applier = applier;
+    }
+
+    public Long getApplier() 
+    {
+        return applier;
+    }
+    public void setCars(String cars) 
+    {
+        this.cars = cars;
+    }
+
+    public String getCars() 
+    {
+        return cars;
+    }
+    public void setDrivers(String drivers) 
+    {
+        this.drivers = drivers;
+    }
+
+    public String getDrivers() 
+    {
+        return drivers;
+    }
+    public void setProjectNumber(String projectNumber) 
+    {
+        this.projectNumber = projectNumber;
+    }
+
+    public String getProjectNumber() 
+    {
+        return projectNumber;
+    }
+    public void setApplyReason(String applyReason) 
+    {
+        this.applyReason = applyReason;
+    }
+
+    public String getApplyReason() 
+    {
+        return applyReason;
+    }
+    public void setPassengers(Long passengers) 
+    {
+        this.passengers = passengers;
+    }
+
+    public Long getPassengers() 
+    {
+        return passengers;
+    }
+    public void setBeginDate(Date beginDate) 
+    {
+        this.beginDate = beginDate;
+    }
+
+    public Date getBeginDate() 
+    {
+        return beginDate;
+    }
+    public void setBeginHalfday(String beginHalfday) 
+    {
+        this.beginHalfday = beginHalfday;
+    }
+
+    public String getBeginHalfday() 
+    {
+        return beginHalfday;
+    }
+    public void setEndDate(Date endDate) 
+    {
+        this.endDate = endDate;
+    }
+
+    public Date getEndDate() 
+    {
+        return endDate;
+    }
+    public void setEndHalfday(String endHalfday) 
+    {
+        this.endHalfday = endHalfday;
+    }
+
+    public String getEndHalfday() 
+    {
+        return endHalfday;
+    }
+    public void setDays(Long days) 
+    {
+        this.days = days;
+    }
+
+    public Long getDays() 
+    {
+        return days;
+    }
+    public void setDeptUserId(Long deptUserId) 
+    {
+        this.deptUserId = deptUserId;
+    }
+
+    public Long getDeptUserId() 
+    {
+        return deptUserId;
+    }
+    public void setDeptComment(String deptComment) 
+    {
+        this.deptComment = deptComment;
+    }
+
+    public String getDeptComment() 
+    {
+        return deptComment;
+    }
+    public void setManagerUserId(Long managerUserId) 
+    {
+        this.managerUserId = managerUserId;
+    }
+
+    public Long getManagerUserId() 
+    {
+        return managerUserId;
+    }
+    public void setManagerComment(String managerComment) 
+    {
+        this.managerComment = managerComment;
+    }
+
+    public String getManagerComment() 
+    {
+        return managerComment;
+    }
+    public void setUnionUserId(Long unionUserId) 
+    {
+        this.unionUserId = unionUserId;
+    }
+
+    public Long getUnionUserId() 
+    {
+        return unionUserId;
+    }
+    public void setUnionComment(String unionComment) 
+    {
+        this.unionComment = unionComment;
+    }
+
+    public String getUnionComment() 
+    {
+        return unionComment;
+    }
+    public void setDispatcher(Long dispatcher) 
+    {
+        this.dispatcher = dispatcher;
+    }
+
+    public Long getDispatcher() 
+    {
+        return dispatcher;
+    }
+    public void setDispatchComment(String dispatchComment) 
+    {
+        this.dispatchComment = dispatchComment;
+    }
+
+    public String getDispatchComment() 
+    {
+        return dispatchComment;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("carApplyId", getCarApplyId())
+            .append("applier", getApplier())
+            .append("cars", getCars())
+            .append("drivers", getDrivers())
+            .append("projectNumber", getProjectNumber())
+            .append("applyReason", getApplyReason())
+            .append("passengers", getPassengers())
+            .append("beginDate", getBeginDate())
+            .append("beginHalfday", getBeginHalfday())
+            .append("endDate", getEndDate())
+            .append("endHalfday", getEndHalfday())
+            .append("days", getDays())
+            .append("deptUserId", getDeptUserId())
+            .append("deptComment", getDeptComment())
+            .append("managerUserId", getManagerUserId())
+            .append("managerComment", getManagerComment())
+            .append("unionUserId", getUnionUserId())
+            .append("unionComment", getUnionComment())
+            .append("dispatcher", getDispatcher())
+            .append("dispatchComment", getDispatchComment())
+            .toString();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcCarApproval;
+
+/**
+ * cmc用车审批Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-02-23
+ */
+public interface CmcCarApprovalMapper 
+{
+    /**
+     * 查询cmc用车审批
+     * 
+     * @param carApplyId cmc用车审批主键
+     * @return cmc用车审批
+     */
+    public CmcCarApproval selectCmcCarApprovalByCarApplyId(String carApplyId);
+
+    /**
+     * 查询cmc用车审批列表
+     * 
+     * @param cmcCarApproval cmc用车审批
+     * @return cmc用车审批集合
+     */
+    public List<CmcCarApproval> selectCmcCarApprovalList(CmcCarApproval cmcCarApproval);
+
+    /**
+     * 新增cmc用车审批
+     * 
+     * @param cmcCarApproval cmc用车审批
+     * @return 结果
+     */
+    public int insertCmcCarApproval(CmcCarApproval cmcCarApproval);
+
+    /**
+     * 修改cmc用车审批
+     * 
+     * @param cmcCarApproval cmc用车审批
+     * @return 结果
+     */
+    public int updateCmcCarApproval(CmcCarApproval cmcCarApproval);
+
+    /**
+     * 删除cmc用车审批
+     * 
+     * @param carApplyId cmc用车审批主键
+     * @return 结果
+     */
+    public int deleteCmcCarApprovalByCarApplyId(String carApplyId);
+
+    /**
+     * 批量删除cmc用车审批
+     * 
+     * @param carApplyIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcCarApprovalByCarApplyIds(String[] carApplyIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcCar;
+
+/**
+ * cmc车辆信息Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-02-23
+ */
+public interface CmcCarMapper 
+{
+    /**
+     * 查询cmc车辆信息
+     * 
+     * @param carId cmc车辆信息主键
+     * @return cmc车辆信息
+     */
+    public CmcCar selectCmcCarByCarId(Long carId);
+
+    /**
+     * 查询cmc车辆信息列表
+     * 
+     * @param cmcCar cmc车辆信息
+     * @return cmc车辆信息集合
+     */
+    public List<CmcCar> selectCmcCarList(CmcCar cmcCar);
+
+    /**
+     * 新增cmc车辆信息
+     * 
+     * @param cmcCar cmc车辆信息
+     * @return 结果
+     */
+    public int insertCmcCar(CmcCar cmcCar);
+
+    /**
+     * 修改cmc车辆信息
+     * 
+     * @param cmcCar cmc车辆信息
+     * @return 结果
+     */
+    public int updateCmcCar(CmcCar cmcCar);
+
+    /**
+     * 删除cmc车辆信息
+     * 
+     * @param carId cmc车辆信息主键
+     * @return 结果
+     */
+    public int deleteCmcCarByCarId(Long carId);
+
+    /**
+     * 批量删除cmc车辆信息
+     * 
+     * @param carIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcCarByCarIds(Long[] carIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcCarApproval;
+
+/**
+ * cmc用车审批Service接口
+ * 
+ * @author cmc
+ * @date 2024-02-23
+ */
+public interface ICmcCarApprovalService 
+{
+    /**
+     * 查询cmc用车审批
+     * 
+     * @param carApplyId cmc用车审批主键
+     * @return cmc用车审批
+     */
+    public CmcCarApproval selectCmcCarApprovalByCarApplyId(String carApplyId);
+
+    /**
+     * 查询cmc用车审批列表
+     * 
+     * @param cmcCarApproval cmc用车审批
+     * @return cmc用车审批集合
+     */
+    public List<CmcCarApproval> selectCmcCarApprovalList(CmcCarApproval cmcCarApproval);
+
+    /**
+     * 新增cmc用车审批
+     * 
+     * @param cmcCarApproval cmc用车审批
+     * @return 结果
+     */
+    public int insertCmcCarApproval(CmcCarApproval cmcCarApproval);
+
+    /**
+     * 修改cmc用车审批
+     * 
+     * @param cmcCarApproval cmc用车审批
+     * @return 结果
+     */
+    public int updateCmcCarApproval(CmcCarApproval cmcCarApproval);
+
+    /**
+     * 批量删除cmc用车审批
+     * 
+     * @param carApplyIds 需要删除的cmc用车审批主键集合
+     * @return 结果
+     */
+    public int deleteCmcCarApprovalByCarApplyIds(String[] carApplyIds);
+
+    /**
+     * 删除cmc用车审批信息
+     * 
+     * @param carApplyId cmc用车审批主键
+     * @return 结果
+     */
+    public int deleteCmcCarApprovalByCarApplyId(String carApplyId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcCar;
+
+/**
+ * cmc车辆信息Service接口
+ * 
+ * @author cmc
+ * @date 2024-02-23
+ */
+public interface ICmcCarService 
+{
+    /**
+     * 查询cmc车辆信息
+     * 
+     * @param carId cmc车辆信息主键
+     * @return cmc车辆信息
+     */
+    public CmcCar selectCmcCarByCarId(Long carId);
+
+    /**
+     * 查询cmc车辆信息列表
+     * 
+     * @param cmcCar cmc车辆信息
+     * @return cmc车辆信息集合
+     */
+    public List<CmcCar> selectCmcCarList(CmcCar cmcCar);
+
+    /**
+     * 新增cmc车辆信息
+     * 
+     * @param cmcCar cmc车辆信息
+     * @return 结果
+     */
+    public int insertCmcCar(CmcCar cmcCar);
+
+    /**
+     * 修改cmc车辆信息
+     * 
+     * @param cmcCar cmc车辆信息
+     * @return 结果
+     */
+    public int updateCmcCar(CmcCar cmcCar);
+
+    /**
+     * 批量删除cmc车辆信息
+     * 
+     * @param carIds 需要删除的cmc车辆信息主键集合
+     * @return 结果
+     */
+    public int deleteCmcCarByCarIds(Long[] carIds);
+
+    /**
+     * 删除cmc车辆信息信息
+     * 
+     * @param carId cmc车辆信息主键
+     * @return 结果
+     */
+    public int deleteCmcCarByCarId(Long carId);
+}

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

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcCarApprovalMapper;
+import com.ruoyi.oa.domain.CmcCarApproval;
+import com.ruoyi.oa.service.ICmcCarApprovalService;
+
+/**
+ * cmc用车审批Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-02-23
+ */
+@Service
+public class CmcCarApprovalServiceImpl implements ICmcCarApprovalService 
+{
+    @Autowired
+    private CmcCarApprovalMapper cmcCarApprovalMapper;
+
+    /**
+     * 查询cmc用车审批
+     * 
+     * @param carApplyId cmc用车审批主键
+     * @return cmc用车审批
+     */
+    @Override
+    public CmcCarApproval selectCmcCarApprovalByCarApplyId(String carApplyId)
+    {
+        return cmcCarApprovalMapper.selectCmcCarApprovalByCarApplyId(carApplyId);
+    }
+
+    /**
+     * 查询cmc用车审批列表
+     * 
+     * @param cmcCarApproval cmc用车审批
+     * @return cmc用车审批
+     */
+    @Override
+    public List<CmcCarApproval> selectCmcCarApprovalList(CmcCarApproval cmcCarApproval)
+    {
+        return cmcCarApprovalMapper.selectCmcCarApprovalList(cmcCarApproval);
+    }
+
+    /**
+     * 新增cmc用车审批
+     * 
+     * @param cmcCarApproval cmc用车审批
+     * @return 结果
+     */
+    @Override
+    public int insertCmcCarApproval(CmcCarApproval cmcCarApproval)
+    {
+        return cmcCarApprovalMapper.insertCmcCarApproval(cmcCarApproval);
+    }
+
+    /**
+     * 修改cmc用车审批
+     * 
+     * @param cmcCarApproval cmc用车审批
+     * @return 结果
+     */
+    @Override
+    public int updateCmcCarApproval(CmcCarApproval cmcCarApproval)
+    {
+        return cmcCarApprovalMapper.updateCmcCarApproval(cmcCarApproval);
+    }
+
+    /**
+     * 批量删除cmc用车审批
+     * 
+     * @param carApplyIds 需要删除的cmc用车审批主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcCarApprovalByCarApplyIds(String[] carApplyIds)
+    {
+        return cmcCarApprovalMapper.deleteCmcCarApprovalByCarApplyIds(carApplyIds);
+    }
+
+    /**
+     * 删除cmc用车审批信息
+     * 
+     * @param carApplyId cmc用车审批主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcCarApprovalByCarApplyId(String carApplyId)
+    {
+        return cmcCarApprovalMapper.deleteCmcCarApprovalByCarApplyId(carApplyId);
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcCarMapper;
+import com.ruoyi.oa.domain.CmcCar;
+import com.ruoyi.oa.service.ICmcCarService;
+
+/**
+ * cmc车辆信息Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-02-23
+ */
+@Service
+public class CmcCarServiceImpl implements ICmcCarService 
+{
+    @Autowired
+    private CmcCarMapper cmcCarMapper;
+
+    /**
+     * 查询cmc车辆信息
+     * 
+     * @param carId cmc车辆信息主键
+     * @return cmc车辆信息
+     */
+    @Override
+    public CmcCar selectCmcCarByCarId(Long carId)
+    {
+        return cmcCarMapper.selectCmcCarByCarId(carId);
+    }
+
+    /**
+     * 查询cmc车辆信息列表
+     * 
+     * @param cmcCar cmc车辆信息
+     * @return cmc车辆信息
+     */
+    @Override
+    public List<CmcCar> selectCmcCarList(CmcCar cmcCar)
+    {
+        return cmcCarMapper.selectCmcCarList(cmcCar);
+    }
+
+    /**
+     * 新增cmc车辆信息
+     * 
+     * @param cmcCar cmc车辆信息
+     * @return 结果
+     */
+    @Override
+    public int insertCmcCar(CmcCar cmcCar)
+    {
+        return cmcCarMapper.insertCmcCar(cmcCar);
+    }
+
+    /**
+     * 修改cmc车辆信息
+     * 
+     * @param cmcCar cmc车辆信息
+     * @return 结果
+     */
+    @Override
+    public int updateCmcCar(CmcCar cmcCar)
+    {
+        return cmcCarMapper.updateCmcCar(cmcCar);
+    }
+
+    /**
+     * 批量删除cmc车辆信息
+     * 
+     * @param carIds 需要删除的cmc车辆信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcCarByCarIds(Long[] carIds)
+    {
+        return cmcCarMapper.deleteCmcCarByCarIds(carIds);
+    }
+
+    /**
+     * 删除cmc车辆信息信息
+     * 
+     * @param carId cmc车辆信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcCarByCarId(Long carId)
+    {
+        return cmcCarMapper.deleteCmcCarByCarId(carId);
+    }
+}

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

@@ -0,0 +1,148 @@
+<?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">
+<mapper namespace="com.ruoyi.oa.mapper.CmcCarApprovalMapper">
+    
+    <resultMap type="CmcCarApproval" id="CmcCarApprovalResult">
+        <result property="carApplyId"    column="car_apply_id"    />
+        <result property="applier"    column="applier"    />
+        <result property="cars"    column="cars"    />
+        <result property="drivers"    column="drivers"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="applyReason"    column="apply_reason"    />
+        <result property="passengers"    column="passengers"    />
+        <result property="beginDate"    column="begin_date"    />
+        <result property="beginHalfday"    column="begin_halfday"    />
+        <result property="endDate"    column="end_date"    />
+        <result property="endHalfday"    column="end_halfday"    />
+        <result property="days"    column="days"    />
+        <result property="deptUserId"    column="dept_user_id"    />
+        <result property="deptComment"    column="dept_comment"    />
+        <result property="managerUserId"    column="manager_user_id"    />
+        <result property="managerComment"    column="manager_comment"    />
+        <result property="unionUserId"    column="union_user_id"    />
+        <result property="unionComment"    column="union_comment"    />
+        <result property="dispatcher"    column="dispatcher"    />
+        <result property="dispatchComment"    column="dispatch_comment"    />
+    </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 from cmc_car_approval
+    </sql>
+
+    <select id="selectCmcCarApprovalList" parameterType="CmcCarApproval" resultMap="CmcCarApprovalResult">
+        <include refid="selectCmcCarApprovalVo"/>
+        <where>  
+            <if test="applier != null "> and applier = #{applier}</if>
+            <if test="cars != null  and cars != ''"> and cars = #{cars}</if>
+            <if test="drivers != null  and drivers != ''"> and drivers = #{drivers}</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="passengers != null "> and passengers = #{passengers}</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>
+            <if test="endHalfday != null  and endHalfday != ''"> and end_halfday = #{endHalfday}</if>
+            <if test="days != null "> and days = #{days}</if>
+            <if test="deptUserId != null "> and dept_user_id = #{deptUserId}</if>
+            <if test="deptComment != null  and deptComment != ''"> and dept_comment = #{deptComment}</if>
+            <if test="managerUserId != null "> and manager_user_id = #{managerUserId}</if>
+            <if test="managerComment != null  and managerComment != ''"> and manager_comment = #{managerComment}</if>
+            <if test="unionUserId != null "> and union_user_id = #{unionUserId}</if>
+            <if test="unionComment != null  and unionComment != ''"> and union_comment = #{unionComment}</if>
+            <if test="dispatcher != null "> and dispatcher = #{dispatcher}</if>
+            <if test="dispatchComment != null  and dispatchComment != ''"> and dispatch_comment = #{dispatchComment}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcCarApprovalByCarApplyId" parameterType="String" resultMap="CmcCarApprovalResult">
+        <include refid="selectCmcCarApprovalVo"/>
+        where car_apply_id = #{carApplyId}
+    </select>
+        
+    <insert id="insertCmcCarApproval" parameterType="CmcCarApproval">
+        insert into cmc_car_approval
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="carApplyId != null">car_apply_id,</if>
+            <if test="applier != null">applier,</if>
+            <if test="cars != null">cars,</if>
+            <if test="drivers != null">drivers,</if>
+            <if test="projectNumber != null">project_number,</if>
+            <if test="applyReason != null">apply_reason,</if>
+            <if test="passengers != null">passengers,</if>
+            <if test="beginDate != null">begin_date,</if>
+            <if test="beginHalfday != null">begin_halfday,</if>
+            <if test="endDate != null">end_date,</if>
+            <if test="endHalfday != null">end_halfday,</if>
+            <if test="days != null">days,</if>
+            <if test="deptUserId != null">dept_user_id,</if>
+            <if test="deptComment != null">dept_comment,</if>
+            <if test="managerUserId != null">manager_user_id,</if>
+            <if test="managerComment != null">manager_comment,</if>
+            <if test="unionUserId != null">union_user_id,</if>
+            <if test="unionComment != null">union_comment,</if>
+            <if test="dispatcher != null">dispatcher,</if>
+            <if test="dispatchComment != null">dispatch_comment,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="carApplyId != null">#{carApplyId},</if>
+            <if test="applier != null">#{applier},</if>
+            <if test="cars != null">#{cars},</if>
+            <if test="drivers != null">#{drivers},</if>
+            <if test="projectNumber != null">#{projectNumber},</if>
+            <if test="applyReason != null">#{applyReason},</if>
+            <if test="passengers != null">#{passengers},</if>
+            <if test="beginDate != null">#{beginDate},</if>
+            <if test="beginHalfday != null">#{beginHalfday},</if>
+            <if test="endDate != null">#{endDate},</if>
+            <if test="endHalfday != null">#{endHalfday},</if>
+            <if test="days != null">#{days},</if>
+            <if test="deptUserId != null">#{deptUserId},</if>
+            <if test="deptComment != null">#{deptComment},</if>
+            <if test="managerUserId != null">#{managerUserId},</if>
+            <if test="managerComment != null">#{managerComment},</if>
+            <if test="unionUserId != null">#{unionUserId},</if>
+            <if test="unionComment != null">#{unionComment},</if>
+            <if test="dispatcher != null">#{dispatcher},</if>
+            <if test="dispatchComment != null">#{dispatchComment},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcCarApproval" parameterType="CmcCarApproval">
+        update cmc_car_approval
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="applier != null">applier = #{applier},</if>
+            <if test="cars != null">cars = #{cars},</if>
+            <if test="drivers != null">drivers = #{drivers},</if>
+            <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="beginDate != null">begin_date = #{beginDate},</if>
+            <if test="beginHalfday != null">begin_halfday = #{beginHalfday},</if>
+            <if test="endDate != null">end_date = #{endDate},</if>
+            <if test="endHalfday != null">end_halfday = #{endHalfday},</if>
+            <if test="days != null">days = #{days},</if>
+            <if test="deptUserId != null">dept_user_id = #{deptUserId},</if>
+            <if test="deptComment != null">dept_comment = #{deptComment},</if>
+            <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
+            <if test="managerComment != null">manager_comment = #{managerComment},</if>
+            <if test="unionUserId != null">union_user_id = #{unionUserId},</if>
+            <if test="unionComment != null">union_comment = #{unionComment},</if>
+            <if test="dispatcher != null">dispatcher = #{dispatcher},</if>
+            <if test="dispatchComment != null">dispatch_comment = #{dispatchComment},</if>
+        </trim>
+        where car_apply_id = #{carApplyId}
+    </update>
+
+    <delete id="deleteCmcCarApprovalByCarApplyId" parameterType="String">
+        delete from cmc_car_approval where car_apply_id = #{carApplyId}
+    </delete>
+
+    <delete id="deleteCmcCarApprovalByCarApplyIds" parameterType="String">
+        delete from cmc_car_approval where car_apply_id in 
+        <foreach item="carApplyId" collection="array" open="(" separator="," close=")">
+            #{carApplyId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,61 @@
+<?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">
+<mapper namespace="com.ruoyi.oa.mapper.CmcCarMapper">
+    
+    <resultMap type="CmcCar" id="CmcCarResult">
+        <result property="carId"    column="car_id"    />
+        <result property="licensePlate"    column="license_plate"    />
+        <result property="driver"    column="driver"    />
+    </resultMap>
+
+    <sql id="selectCmcCarVo">
+        select car_id, license_plate, driver from cmc_car
+    </sql>
+
+    <select id="selectCmcCarList" parameterType="CmcCar" resultMap="CmcCarResult">
+        <include refid="selectCmcCarVo"/>
+        <where>  
+            <if test="licensePlate != null  and licensePlate != ''"> and license_plate = #{licensePlate}</if>
+            <if test="driver != null "> and driver = #{driver}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcCarByCarId" parameterType="Long" resultMap="CmcCarResult">
+        <include refid="selectCmcCarVo"/>
+        where car_id = #{carId}
+    </select>
+        
+    <insert id="insertCmcCar" parameterType="CmcCar" useGeneratedKeys="true" keyProperty="carId">
+        insert into cmc_car
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="licensePlate != null">license_plate,</if>
+            <if test="driver != null">driver,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="licensePlate != null">#{licensePlate},</if>
+            <if test="driver != null">#{driver},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcCar" parameterType="CmcCar">
+        update cmc_car
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="licensePlate != null">license_plate = #{licensePlate},</if>
+            <if test="driver != null">driver = #{driver},</if>
+        </trim>
+        where car_id = #{carId}
+    </update>
+
+    <delete id="deleteCmcCarByCarId" parameterType="Long">
+        delete from cmc_car where car_id = #{carId}
+    </delete>
+
+    <delete id="deleteCmcCarByCarIds" parameterType="String">
+        delete from cmc_car where car_id in 
+        <foreach item="carId" collection="array" open="(" separator="," close=")">
+            #{carId}
+        </foreach>
+    </delete>
+</mapper>

oa-back/sql/ry_20231130.sql

@@ -1327,7 +1327,7 @@ insert into cmc_project values ('1741422566360219650', '2023C96', '藏东南（
 drop table if exists `cmc_car`;
 create table `cmc_car`  (
   `car_id`			int			not null auto_increment		comment '车辆id',
-  `license plate`	char(8)		default null				comment '车牌号',
+  `license_plate`	char(8)		default null				comment '车牌号',
   `driver`			bigint		default null				comment '驾驶员（常用）',
   primary key (`car_id`)
 ) engine = innodb comment = 'cmc车辆信息表';
@@ -1343,9 +1343,9 @@ drop table if exists `cmc_car_approval`;
 create table `cmc_car_approval`  (
   `car_apply_id`		char(19)		not null		comment '用车申请id',
   `applier`				bigint			default null	comment '申请人',
-  `car_id`				int				default null	comment '车辆id',
-  `driver_id`			bigint			default null	comment '驾驶员',
-  `project_id`			char(19)		default null	comment '项目id',
+  `cars`				varchar(10)		default null	comment '车辆id',
+  `drivers`				varchar(20)		default null	comment '驾驶员id',
+  `project_number`		varchar(10)		default null	comment '项目编号',
   `apply_reason`		varchar(255)	default null 	comment '用车事由',
   `passengers`			int				default null 	comment '人数',
   `begin_date`			date			default null 	comment '开始日期',