新增设备后端代码

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

@@ -27,7 +27,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @date 2024-02-23
  */
 @RestController
-@RequestMapping("/oa/approval")
+@RequestMapping("/oa/carApproval")
 public class CmcCarApprovalController extends BaseController
 {
     @Autowired

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

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.oa;
+
+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.CmcDeviceApproval;
+import com.ruoyi.oa.service.ICmcDeviceApprovalService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc设备审批Controller
+ * 
+ * @author cmc
+ * @date 2024-03-05
+ */
+@RestController
+@RequestMapping("/oa/deviceApproval")
+public class CmcDeviceApprovalController extends BaseController
+{
+    @Autowired
+    private ICmcDeviceApprovalService cmcDeviceApprovalService;
+
+    /**
+     * 查询cmc设备审批列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:approval:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CmcDeviceApproval cmcDeviceApproval)
+    {
+        startPage();
+        List<CmcDeviceApproval> list = cmcDeviceApprovalService.selectCmcDeviceApprovalList(cmcDeviceApproval);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc设备审批列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:approval:export')")
+    @Log(title = "cmc设备审批", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcDeviceApproval cmcDeviceApproval)
+    {
+        List<CmcDeviceApproval> list = cmcDeviceApprovalService.selectCmcDeviceApprovalList(cmcDeviceApproval);
+        ExcelUtil<CmcDeviceApproval> util = new ExcelUtil<CmcDeviceApproval>(CmcDeviceApproval.class);
+        util.exportExcel(response, list, "cmc设备审批数据");
+    }
+
+    /**
+     * 获取cmc设备审批详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:approval:query')")
+    @GetMapping(value = "/{deviceApplyId}")
+    public AjaxResult getInfo(@PathVariable("deviceApplyId") String deviceApplyId)
+    {
+        return success(cmcDeviceApprovalService.selectCmcDeviceApprovalByDeviceApplyId(deviceApplyId));
+    }
+
+    /**
+     * 新增cmc设备审批
+     */
+    @PreAuthorize("@ss.hasPermi('oa:approval:add')")
+    @Log(title = "cmc设备审批", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcDeviceApproval cmcDeviceApproval)
+    {
+        return toAjax(cmcDeviceApprovalService.insertCmcDeviceApproval(cmcDeviceApproval));
+    }
+
+    /**
+     * 修改cmc设备审批
+     */
+    @PreAuthorize("@ss.hasPermi('oa:approval:edit')")
+    @Log(title = "cmc设备审批", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcDeviceApproval cmcDeviceApproval)
+    {
+        return toAjax(cmcDeviceApprovalService.updateCmcDeviceApproval(cmcDeviceApproval));
+    }
+
+    /**
+     * 删除cmc设备审批
+     */
+    @PreAuthorize("@ss.hasPermi('oa:approval:remove')")
+    @Log(title = "cmc设备审批", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{deviceApplyIds}")
+    public AjaxResult remove(@PathVariable String[] deviceApplyIds)
+    {
+        return toAjax(cmcDeviceApprovalService.deleteCmcDeviceApprovalByDeviceApplyIds(deviceApplyIds));
+    }
+}

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

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.oa;
+
+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.CmcDevice;
+import com.ruoyi.oa.service.ICmcDeviceService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc设备信息Controller
+ * 
+ * @author cmc
+ * @date 2024-03-05
+ */
+@RestController
+@RequestMapping("/oa/device")
+public class CmcDeviceController extends BaseController
+{
+    @Autowired
+    private ICmcDeviceService cmcDeviceService;
+
+    /**
+     * 查询cmc设备信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:device:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CmcDevice cmcDevice)
+    {
+        startPage();
+        List<CmcDevice> list = cmcDeviceService.selectCmcDeviceList(cmcDevice);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc设备信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:device:export')")
+    @Log(title = "cmc设备信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcDevice cmcDevice)
+    {
+        List<CmcDevice> list = cmcDeviceService.selectCmcDeviceList(cmcDevice);
+        ExcelUtil<CmcDevice> util = new ExcelUtil<CmcDevice>(CmcDevice.class);
+        util.exportExcel(response, list, "cmc设备信息数据");
+    }
+
+    /**
+     * 获取cmc设备信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:device:query')")
+    @GetMapping(value = "/{deviceId}")
+    public AjaxResult getInfo(@PathVariable("deviceId") Long deviceId)
+    {
+        return success(cmcDeviceService.selectCmcDeviceByDeviceId(deviceId));
+    }
+
+    /**
+     * 新增cmc设备信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:device:add')")
+    @Log(title = "cmc设备信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcDevice cmcDevice)
+    {
+        return toAjax(cmcDeviceService.insertCmcDevice(cmcDevice));
+    }
+
+    /**
+     * 修改cmc设备信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:device:edit')")
+    @Log(title = "cmc设备信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcDevice cmcDevice)
+    {
+        return toAjax(cmcDeviceService.updateCmcDevice(cmcDevice));
+    }
+
+    /**
+     * 删除cmc设备信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:device:remove')")
+    @Log(title = "cmc设备信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{deviceIds}")
+    public AjaxResult remove(@PathVariable Long[] deviceIds)
+    {
+        return toAjax(cmcDeviceService.deleteCmcDeviceByDeviceIds(deviceIds));
+    }
+}

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

@@ -1,5 +1,8 @@
 package com.ruoyi.oa.domain;
 
+import java.math.BigDecimal;
+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;
@@ -7,9 +10,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * cmc车辆信息对象 cmc_car
- * 
+ *
  * @author cmc
- * @date 2024-02-23
+ * @date 2024-03-05
  */
 public class CmcCar extends BaseEntity
 {
@@ -23,37 +26,114 @@ public class CmcCar extends BaseEntity
     private String licensePlate;
 
     /** 驾驶员（常用） */
-    @Excel(name = "驾驶员", readConverterExp = "常=用")
+    @Excel(name = "驾驶员")
     private Long driver;
 
-    public void setCarId(Long carId) 
+    /** 购置时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "购置时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date acquisitionTime;
+
+    /** 总价 */
+    @Excel(name = "总价")
+    private BigDecimal cost;
+
+    /** 预计使用年限 */
+    @Excel(name = "预计使用年限")
+    private Integer expectLife;
+
+    /** 车系 */
+    @Excel(name = "车系")
+    private String series;
+
+    /** 车级 */
+    @Excel(name = "车级")
+    private String level;
+
+    public void setCarId(Long carId)
     {
         this.carId = carId;
     }
 
-    public Long getCarId() 
+    public Long getCarId()
     {
         return carId;
     }
-    public void setLicensePlate(String licensePlate) { this.licensePlate = licensePlate; }
+    public void setLicensePlate(String licensePlate)
+    {
+        this.licensePlate = licensePlate;
+    }
 
-    public String getLicensePlate() { return licensePlate; }
-    public void setDriver(Long driver) 
+    public String getLicensePlate()
+    {
+        return licensePlate;
+    }
+    public void setDriver(Long driver)
     {
         this.driver = driver;
     }
 
-    public Long getDriver() 
+    public Long getDriver()
     {
         return driver;
     }
+    public void setAcquisitionTime(Date acquisitionTime)
+    {
+        this.acquisitionTime = acquisitionTime;
+    }
+
+    public Date getAcquisitionTime()
+    {
+        return acquisitionTime;
+    }
+    public void setCost(BigDecimal cost)
+    {
+        this.cost = cost;
+    }
+
+    public BigDecimal getCost()
+    {
+        return cost;
+    }
+    public void setExpectLife(Integer expectLife)
+    {
+        this.expectLife = expectLife;
+    }
+
+    public Integer getExpectLife()
+    {
+        return expectLife;
+    }
+    public void setSeries(String series)
+    {
+        this.series = series;
+    }
+
+    public String getSeries()
+    {
+        return series;
+    }
+    public void setLevel(String level)
+    {
+        this.level = level;
+    }
+
+    public String getLevel()
+    {
+        return level;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("carId", getCarId())
-            .append("license plate", getLicensePlate())
-            .append("driver", getDriver())
-            .toString();
+                .append("carId", getCarId())
+                .append("licensePlate", getLicensePlate())
+                .append("driver", getDriver())
+                .append("acquisitionTime", getAcquisitionTime())
+                .append("cost", getCost())
+                .append("expectLife", getExpectLife())
+                .append("series", getSeries())
+                .append("level", getLevel())
+                .toString();
     }
 }

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

@@ -1,5 +1,6 @@
 package com.ruoyi.oa.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -9,9 +10,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * cmc用车审批对象 cmc_car_approval
- * 
+ *
  * @author cmc
- * @date 2024-02-23
+ * @date 2024-03-05
  */
 public class CmcCarApproval extends BaseEntity
 {
@@ -98,210 +99,224 @@ public class CmcCarApproval extends BaseEntity
     @Excel(name = "调度审批意见")
     private String dispatchComment;
 
-    public void setCarApplyId(String carApplyId) 
+    /** 预计用车成本 */
+    @Excel(name = "预计用车成本")
+    private BigDecimal estimateCost;
+
+    public void setCarApplyId(String carApplyId)
     {
         this.carApplyId = carApplyId;
     }
 
-    public String getCarApplyId() 
+    public String getCarApplyId()
     {
         return carApplyId;
     }
-    public void setApplier(Long applier) 
+    public void setApplier(Long applier)
     {
         this.applier = applier;
     }
 
-    public Long getApplier() 
+    public Long getApplier()
     {
         return applier;
     }
-    public void setCars(String cars) 
+    public void setCars(String cars)
     {
         this.cars = cars;
     }
 
-    public String getCars() 
+    public String getCars()
     {
         return cars;
     }
-    public void setDrivers(String drivers) 
+    public void setDrivers(String drivers)
     {
         this.drivers = drivers;
     }
 
-    public String getDrivers() 
+    public String getDrivers()
     {
         return drivers;
     }
-    public void setProjectNumber(String projectNumber) 
+    public void setProjectNumber(String projectNumber)
     {
         this.projectNumber = projectNumber;
     }
 
-    public String getProjectNumber() 
+    public String getProjectNumber()
     {
         return projectNumber;
     }
-    public void setApplyReason(String applyReason) 
+    public void setApplyReason(String applyReason)
     {
         this.applyReason = applyReason;
     }
 
-    public String getApplyReason() 
+    public String getApplyReason()
     {
         return applyReason;
     }
-    public void setPassengers(Long passengers) 
+    public void setPassengers(Long passengers)
     {
         this.passengers = passengers;
     }
 
-    public Long getPassengers() 
+    public Long getPassengers()
     {
         return passengers;
     }
-    public void setBeginDate(Date beginDate) 
+    public void setBeginDate(Date beginDate)
     {
         this.beginDate = beginDate;
     }
 
-    public Date getBeginDate() 
+    public Date getBeginDate()
     {
         return beginDate;
     }
-    public void setBeginHalfday(String beginHalfday) 
+    public void setBeginHalfday(String beginHalfday)
     {
         this.beginHalfday = beginHalfday;
     }
 
-    public String getBeginHalfday() 
+    public String getBeginHalfday()
     {
         return beginHalfday;
     }
-    public void setEndDate(Date endDate) 
+    public void setEndDate(Date endDate)
     {
         this.endDate = endDate;
     }
 
-    public Date getEndDate() 
+    public Date getEndDate()
     {
         return endDate;
     }
-    public void setEndHalfday(String endHalfday) 
+    public void setEndHalfday(String endHalfday)
     {
         this.endHalfday = endHalfday;
     }
 
-    public String getEndHalfday() 
+    public String getEndHalfday()
     {
         return endHalfday;
     }
-    public void setDays(Long days) 
+    public void setDays(Long days)
     {
         this.days = days;
     }
 
-    public Long getDays() 
+    public Long getDays()
     {
         return days;
     }
-    public void setDeptUserId(Long deptUserId) 
+    public void setDeptUserId(Long deptUserId)
     {
         this.deptUserId = deptUserId;
     }
 
-    public Long getDeptUserId() 
+    public Long getDeptUserId()
     {
         return deptUserId;
     }
-    public void setDeptComment(String deptComment) 
+    public void setDeptComment(String deptComment)
     {
         this.deptComment = deptComment;
     }
 
-    public String getDeptComment() 
+    public String getDeptComment()
     {
         return deptComment;
     }
-    public void setManagerUserId(Long managerUserId) 
+    public void setManagerUserId(Long managerUserId)
     {
         this.managerUserId = managerUserId;
     }
 
-    public Long getManagerUserId() 
+    public Long getManagerUserId()
     {
         return managerUserId;
     }
-    public void setManagerComment(String managerComment) 
+    public void setManagerComment(String managerComment)
     {
         this.managerComment = managerComment;
     }
 
-    public String getManagerComment() 
+    public String getManagerComment()
     {
         return managerComment;
     }
-    public void setUnionUserId(Long unionUserId) 
+    public void setUnionUserId(Long unionUserId)
     {
         this.unionUserId = unionUserId;
     }
 
-    public Long getUnionUserId() 
+    public Long getUnionUserId()
     {
         return unionUserId;
     }
-    public void setUnionComment(String unionComment) 
+    public void setUnionComment(String unionComment)
     {
         this.unionComment = unionComment;
     }
 
-    public String getUnionComment() 
+    public String getUnionComment()
     {
         return unionComment;
     }
-    public void setDispatcher(Long dispatcher) 
+    public void setDispatcher(Long dispatcher)
     {
         this.dispatcher = dispatcher;
     }
 
-    public Long getDispatcher() 
+    public Long getDispatcher()
     {
         return dispatcher;
     }
-    public void setDispatchComment(String dispatchComment) 
+    public void setDispatchComment(String dispatchComment)
     {
         this.dispatchComment = dispatchComment;
     }
 
-    public String getDispatchComment() 
+    public String getDispatchComment()
     {
         return dispatchComment;
     }
+    public void setEstimateCost(BigDecimal estimateCost)
+    {
+        this.estimateCost = estimateCost;
+    }
+
+    public BigDecimal getEstimateCost()
+    {
+        return estimateCost;
+    }
 
     @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();
+                .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())
+                .append("estimateCost", getEstimateCost())
+                .toString();
     }
 }

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

@@ -0,0 +1,125 @@
+package com.ruoyi.oa.domain;
+
+import java.math.BigDecimal;
+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_device
+ * 
+ * @author cmc
+ * @date 2024-03-05
+ */
+public class CmcDevice extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 设备id */
+    private Long deviceId;
+
+    /** 设备编号 */
+    @Excel(name = "设备编号")
+    private String code;
+
+    /** 设备类别 */
+    @Excel(name = "设备类别")
+    private String type;
+
+    /** 购置时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "购置时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date acquisitionTime;
+
+    /** 总价 */
+    @Excel(name = "总价")
+    private BigDecimal cost;
+
+    /** 预计使用年限 */
+    @Excel(name = "预计使用年限")
+    private Integer expectLife;
+
+    /** 设备系列 */
+    @Excel(name = "设备系列")
+    private String series;
+
+    public void setDeviceId(Long deviceId) 
+    {
+        this.deviceId = deviceId;
+    }
+
+    public Long getDeviceId() 
+    {
+        return deviceId;
+    }
+    public void setCode(String code) 
+    {
+        this.code = code;
+    }
+
+    public String getCode() 
+    {
+        return code;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setAcquisitionTime(Date acquisitionTime) 
+    {
+        this.acquisitionTime = acquisitionTime;
+    }
+
+    public Date getAcquisitionTime() 
+    {
+        return acquisitionTime;
+    }
+    public void setCost(BigDecimal cost) 
+    {
+        this.cost = cost;
+    }
+
+    public BigDecimal getCost() 
+    {
+        return cost;
+    }
+    public void setExpectLife(Integer expectLife) 
+    {
+        this.expectLife = expectLife;
+    }
+
+    public Integer getExpectLife() 
+    {
+        return expectLife;
+    }
+    public void setSeries(String series) 
+    {
+        this.series = series;
+    }
+
+    public String getSeries() 
+    {
+        return series;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("deviceId", getDeviceId())
+            .append("code", getCode())
+            .append("type", getType())
+            .append("acquisitionTime", getAcquisitionTime())
+            .append("cost", getCost())
+            .append("expectLife", getExpectLife())
+            .append("series", getSeries())
+            .toString();
+    }
+}

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

@@ -0,0 +1,266 @@
+package com.ruoyi.oa.domain;
+
+import java.math.BigDecimal;
+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_device_approval
+ * 
+ * @author cmc
+ * @date 2024-03-05
+ */
+public class CmcDeviceApproval extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 设备申请id */
+    private String deviceApplyId;
+
+    /** 申请人 */
+    @Excel(name = "申请人")
+    private Long applier;
+
+    /** 设备id */
+    @Excel(name = "设备id")
+    private String deviceId;
+
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private String projectNumber;
+
+    /** 申领事由 */
+    @Excel(name = "申领事由")
+    private String applyReason;
+
+    /** 开始日期 */
+    @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 dispatcher;
+
+    /** 调度审批意见 */
+    @Excel(name = "调度审批意见")
+    private String dispatchComment;
+
+    /** 预计设备成本 */
+    @Excel(name = "预计设备成本")
+    private BigDecimal estimateCost;
+
+    public void setDeviceApplyId(String deviceApplyId) 
+    {
+        this.deviceApplyId = deviceApplyId;
+    }
+
+    public String getDeviceApplyId() 
+    {
+        return deviceApplyId;
+    }
+    public void setApplier(Long applier) 
+    {
+        this.applier = applier;
+    }
+
+    public Long getApplier() 
+    {
+        return applier;
+    }
+    public void setDeviceId(String deviceId) 
+    {
+        this.deviceId = deviceId;
+    }
+
+    public String getDeviceId() 
+    {
+        return deviceId;
+    }
+    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 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 setDispatcher(Long dispatcher) 
+    {
+        this.dispatcher = dispatcher;
+    }
+
+    public Long getDispatcher() 
+    {
+        return dispatcher;
+    }
+    public void setDispatchComment(String dispatchComment) 
+    {
+        this.dispatchComment = dispatchComment;
+    }
+
+    public String getDispatchComment() 
+    {
+        return dispatchComment;
+    }
+    public void setEstimateCost(BigDecimal estimateCost) 
+    {
+        this.estimateCost = estimateCost;
+    }
+
+    public BigDecimal getEstimateCost() 
+    {
+        return estimateCost;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("deviceApplyId", getDeviceApplyId())
+            .append("applier", getApplier())
+            .append("deviceId", getDeviceId())
+            .append("projectNumber", getProjectNumber())
+            .append("applyReason", getApplyReason())
+            .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("dispatcher", getDispatcher())
+            .append("dispatchComment", getDispatchComment())
+            .append("estimateCost", getEstimateCost())
+            .toString();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcDeviceApproval;
+
+/**
+ * cmc设备审批Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-03-05
+ */
+public interface CmcDeviceApprovalMapper 
+{
+    /**
+     * 查询cmc设备审批
+     * 
+     * @param deviceApplyId cmc设备审批主键
+     * @return cmc设备审批
+     */
+    public CmcDeviceApproval selectCmcDeviceApprovalByDeviceApplyId(String deviceApplyId);
+
+    /**
+     * 查询cmc设备审批列表
+     * 
+     * @param cmcDeviceApproval cmc设备审批
+     * @return cmc设备审批集合
+     */
+    public List<CmcDeviceApproval> selectCmcDeviceApprovalList(CmcDeviceApproval cmcDeviceApproval);
+
+    /**
+     * 新增cmc设备审批
+     * 
+     * @param cmcDeviceApproval cmc设备审批
+     * @return 结果
+     */
+    public int insertCmcDeviceApproval(CmcDeviceApproval cmcDeviceApproval);
+
+    /**
+     * 修改cmc设备审批
+     * 
+     * @param cmcDeviceApproval cmc设备审批
+     * @return 结果
+     */
+    public int updateCmcDeviceApproval(CmcDeviceApproval cmcDeviceApproval);
+
+    /**
+     * 删除cmc设备审批
+     * 
+     * @param deviceApplyId cmc设备审批主键
+     * @return 结果
+     */
+    public int deleteCmcDeviceApprovalByDeviceApplyId(String deviceApplyId);
+
+    /**
+     * 批量删除cmc设备审批
+     * 
+     * @param deviceApplyIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcDeviceApprovalByDeviceApplyIds(String[] deviceApplyIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcDevice;
+
+/**
+ * cmc设备信息Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-03-05
+ */
+public interface CmcDeviceMapper 
+{
+    /**
+     * 查询cmc设备信息
+     * 
+     * @param deviceId cmc设备信息主键
+     * @return cmc设备信息
+     */
+    public CmcDevice selectCmcDeviceByDeviceId(Long deviceId);
+
+    /**
+     * 查询cmc设备信息列表
+     * 
+     * @param cmcDevice cmc设备信息
+     * @return cmc设备信息集合
+     */
+    public List<CmcDevice> selectCmcDeviceList(CmcDevice cmcDevice);
+
+    /**
+     * 新增cmc设备信息
+     * 
+     * @param cmcDevice cmc设备信息
+     * @return 结果
+     */
+    public int insertCmcDevice(CmcDevice cmcDevice);
+
+    /**
+     * 修改cmc设备信息
+     * 
+     * @param cmcDevice cmc设备信息
+     * @return 结果
+     */
+    public int updateCmcDevice(CmcDevice cmcDevice);
+
+    /**
+     * 删除cmc设备信息
+     * 
+     * @param deviceId cmc设备信息主键
+     * @return 结果
+     */
+    public int deleteCmcDeviceByDeviceId(Long deviceId);
+
+    /**
+     * 批量删除cmc设备信息
+     * 
+     * @param deviceIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcDeviceByDeviceIds(Long[] deviceIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcDeviceApproval;
+
+/**
+ * cmc设备审批Service接口
+ * 
+ * @author cmc
+ * @date 2024-03-05
+ */
+public interface ICmcDeviceApprovalService 
+{
+    /**
+     * 查询cmc设备审批
+     * 
+     * @param deviceApplyId cmc设备审批主键
+     * @return cmc设备审批
+     */
+    public CmcDeviceApproval selectCmcDeviceApprovalByDeviceApplyId(String deviceApplyId);
+
+    /**
+     * 查询cmc设备审批列表
+     * 
+     * @param cmcDeviceApproval cmc设备审批
+     * @return cmc设备审批集合
+     */
+    public List<CmcDeviceApproval> selectCmcDeviceApprovalList(CmcDeviceApproval cmcDeviceApproval);
+
+    /**
+     * 新增cmc设备审批
+     * 
+     * @param cmcDeviceApproval cmc设备审批
+     * @return 结果
+     */
+    public int insertCmcDeviceApproval(CmcDeviceApproval cmcDeviceApproval);
+
+    /**
+     * 修改cmc设备审批
+     * 
+     * @param cmcDeviceApproval cmc设备审批
+     * @return 结果
+     */
+    public int updateCmcDeviceApproval(CmcDeviceApproval cmcDeviceApproval);
+
+    /**
+     * 批量删除cmc设备审批
+     * 
+     * @param deviceApplyIds 需要删除的cmc设备审批主键集合
+     * @return 结果
+     */
+    public int deleteCmcDeviceApprovalByDeviceApplyIds(String[] deviceApplyIds);
+
+    /**
+     * 删除cmc设备审批信息
+     * 
+     * @param deviceApplyId cmc设备审批主键
+     * @return 结果
+     */
+    public int deleteCmcDeviceApprovalByDeviceApplyId(String deviceApplyId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcDevice;
+
+/**
+ * cmc设备信息Service接口
+ * 
+ * @author cmc
+ * @date 2024-03-05
+ */
+public interface ICmcDeviceService 
+{
+    /**
+     * 查询cmc设备信息
+     * 
+     * @param deviceId cmc设备信息主键
+     * @return cmc设备信息
+     */
+    public CmcDevice selectCmcDeviceByDeviceId(Long deviceId);
+
+    /**
+     * 查询cmc设备信息列表
+     * 
+     * @param cmcDevice cmc设备信息
+     * @return cmc设备信息集合
+     */
+    public List<CmcDevice> selectCmcDeviceList(CmcDevice cmcDevice);
+
+    /**
+     * 新增cmc设备信息
+     * 
+     * @param cmcDevice cmc设备信息
+     * @return 结果
+     */
+    public int insertCmcDevice(CmcDevice cmcDevice);
+
+    /**
+     * 修改cmc设备信息
+     * 
+     * @param cmcDevice cmc设备信息
+     * @return 结果
+     */
+    public int updateCmcDevice(CmcDevice cmcDevice);
+
+    /**
+     * 批量删除cmc设备信息
+     * 
+     * @param deviceIds 需要删除的cmc设备信息主键集合
+     * @return 结果
+     */
+    public int deleteCmcDeviceByDeviceIds(Long[] deviceIds);
+
+    /**
+     * 删除cmc设备信息信息
+     * 
+     * @param deviceId cmc设备信息主键
+     * @return 结果
+     */
+    public int deleteCmcDeviceByDeviceId(Long deviceId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcDeviceApprovalServiceImpl.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.CmcDeviceApprovalMapper;
+import com.ruoyi.oa.domain.CmcDeviceApproval;
+import com.ruoyi.oa.service.ICmcDeviceApprovalService;
+
+/**
+ * cmc设备审批Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-03-05
+ */
+@Service
+public class CmcDeviceApprovalServiceImpl implements ICmcDeviceApprovalService 
+{
+    @Autowired
+    private CmcDeviceApprovalMapper cmcDeviceApprovalMapper;
+
+    /**
+     * 查询cmc设备审批
+     * 
+     * @param deviceApplyId cmc设备审批主键
+     * @return cmc设备审批
+     */
+    @Override
+    public CmcDeviceApproval selectCmcDeviceApprovalByDeviceApplyId(String deviceApplyId)
+    {
+        return cmcDeviceApprovalMapper.selectCmcDeviceApprovalByDeviceApplyId(deviceApplyId);
+    }
+
+    /**
+     * 查询cmc设备审批列表
+     * 
+     * @param cmcDeviceApproval cmc设备审批
+     * @return cmc设备审批
+     */
+    @Override
+    public List<CmcDeviceApproval> selectCmcDeviceApprovalList(CmcDeviceApproval cmcDeviceApproval)
+    {
+        return cmcDeviceApprovalMapper.selectCmcDeviceApprovalList(cmcDeviceApproval);
+    }
+
+    /**
+     * 新增cmc设备审批
+     * 
+     * @param cmcDeviceApproval cmc设备审批
+     * @return 结果
+     */
+    @Override
+    public int insertCmcDeviceApproval(CmcDeviceApproval cmcDeviceApproval)
+    {
+        return cmcDeviceApprovalMapper.insertCmcDeviceApproval(cmcDeviceApproval);
+    }
+
+    /**
+     * 修改cmc设备审批
+     * 
+     * @param cmcDeviceApproval cmc设备审批
+     * @return 结果
+     */
+    @Override
+    public int updateCmcDeviceApproval(CmcDeviceApproval cmcDeviceApproval)
+    {
+        return cmcDeviceApprovalMapper.updateCmcDeviceApproval(cmcDeviceApproval);
+    }
+
+    /**
+     * 批量删除cmc设备审批
+     * 
+     * @param deviceApplyIds 需要删除的cmc设备审批主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcDeviceApprovalByDeviceApplyIds(String[] deviceApplyIds)
+    {
+        return cmcDeviceApprovalMapper.deleteCmcDeviceApprovalByDeviceApplyIds(deviceApplyIds);
+    }
+
+    /**
+     * 删除cmc设备审批信息
+     * 
+     * @param deviceApplyId cmc设备审批主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcDeviceApprovalByDeviceApplyId(String deviceApplyId)
+    {
+        return cmcDeviceApprovalMapper.deleteCmcDeviceApprovalByDeviceApplyId(deviceApplyId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcDeviceServiceImpl.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.CmcDeviceMapper;
+import com.ruoyi.oa.domain.CmcDevice;
+import com.ruoyi.oa.service.ICmcDeviceService;
+
+/**
+ * cmc设备信息Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-03-05
+ */
+@Service
+public class CmcDeviceServiceImpl implements ICmcDeviceService 
+{
+    @Autowired
+    private CmcDeviceMapper cmcDeviceMapper;
+
+    /**
+     * 查询cmc设备信息
+     * 
+     * @param deviceId cmc设备信息主键
+     * @return cmc设备信息
+     */
+    @Override
+    public CmcDevice selectCmcDeviceByDeviceId(Long deviceId)
+    {
+        return cmcDeviceMapper.selectCmcDeviceByDeviceId(deviceId);
+    }
+
+    /**
+     * 查询cmc设备信息列表
+     * 
+     * @param cmcDevice cmc设备信息
+     * @return cmc设备信息
+     */
+    @Override
+    public List<CmcDevice> selectCmcDeviceList(CmcDevice cmcDevice)
+    {
+        return cmcDeviceMapper.selectCmcDeviceList(cmcDevice);
+    }
+
+    /**
+     * 新增cmc设备信息
+     * 
+     * @param cmcDevice cmc设备信息
+     * @return 结果
+     */
+    @Override
+    public int insertCmcDevice(CmcDevice cmcDevice)
+    {
+        return cmcDeviceMapper.insertCmcDevice(cmcDevice);
+    }
+
+    /**
+     * 修改cmc设备信息
+     * 
+     * @param cmcDevice cmc设备信息
+     * @return 结果
+     */
+    @Override
+    public int updateCmcDevice(CmcDevice cmcDevice)
+    {
+        return cmcDeviceMapper.updateCmcDevice(cmcDevice);
+    }
+
+    /**
+     * 批量删除cmc设备信息
+     * 
+     * @param deviceIds 需要删除的cmc设备信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcDeviceByDeviceIds(Long[] deviceIds)
+    {
+        return cmcDeviceMapper.deleteCmcDeviceByDeviceIds(deviceIds);
+    }
+
+    /**
+     * 删除cmc设备信息信息
+     * 
+     * @param deviceId cmc设备信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcDeviceByDeviceId(Long deviceId)
+    {
+        return cmcDeviceMapper.deleteCmcDeviceByDeviceId(deviceId);
+    }
+}

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcCarApprovalMapper.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.CmcCarApprovalMapper">
-    
+
     <resultMap type="CmcCarApproval" id="CmcCarApprovalResult">
         <result property="carApplyId"    column="car_apply_id"    />
         <result property="applier"    column="applier"    />
@@ -25,15 +25,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="unionComment"    column="union_comment"    />
         <result property="dispatcher"    column="dispatcher"    />
         <result property="dispatchComment"    column="dispatch_comment"    />
+        <result property="estimateCost"    column="estimate_cost"    />
     </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
+        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
     </sql>
 
     <select id="selectCmcCarApprovalList" parameterType="CmcCarApproval" resultMap="CmcCarApprovalResult">
         <include refid="selectCmcCarApprovalVo"/>
-        <where>  
+        <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>
@@ -53,14 +54,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
+            <if test="estimateCost != null "> and estimate_cost = #{estimateCost}</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=",">
@@ -84,7 +86,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unionComment != null">union_comment,</if>
             <if test="dispatcher != null">dispatcher,</if>
             <if test="dispatchComment != null">dispatch_comment,</if>
-         </trim>
+            <if test="estimateCost != null">estimate_cost,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="carApplyId != null">#{carApplyId},</if>
             <if test="applier != null">#{applier},</if>
@@ -106,7 +109,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unionComment != null">#{unionComment},</if>
             <if test="dispatcher != null">#{dispatcher},</if>
             <if test="dispatchComment != null">#{dispatchComment},</if>
-         </trim>
+            <if test="estimateCost != null">#{estimateCost},</if>
+        </trim>
     </insert>
 
     <update id="updateCmcCarApproval" parameterType="CmcCarApproval">
@@ -131,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unionComment != null">union_comment = #{unionComment},</if>
             <if test="dispatcher != null">dispatcher = #{dispatcher},</if>
             <if test="dispatchComment != null">dispatch_comment = #{dispatchComment},</if>
+            <if test="estimateCost != null">estimate_cost = #{estimateCost},</if>
         </trim>
         where car_apply_id = #{carApplyId}
     </update>
@@ -140,7 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCmcCarApprovalByCarApplyIds" parameterType="String">
-        delete from cmc_car_approval where car_apply_id in 
+        delete from cmc_car_approval where car_apply_id in
         <foreach item="carApplyId" collection="array" open="(" separator="," close=")">
             #{carApplyId}
         </foreach>

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

@@ -1,42 +1,62 @@
 <?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.CmcCarMapper">
-    
+
     <resultMap type="CmcCar" id="CmcCarResult">
         <result property="carId"    column="car_id"    />
         <result property="licensePlate"    column="license_plate"    />
         <result property="driver"    column="driver"    />
+        <result property="acquisitionTime"    column="acquisition_time"    />
+        <result property="cost"    column="cost"    />
+        <result property="expectLife"    column="expect_life"    />
+        <result property="series"    column="series"    />
+        <result property="level"    column="level"    />
     </resultMap>
 
     <sql id="selectCmcCarVo">
-        select car_id, license_plate, driver from cmc_car
+        select car_id, license_plate, driver, acquisition_time, cost, expect_life, series, level from cmc_car
     </sql>
 
     <select id="selectCmcCarList" parameterType="CmcCar" resultMap="CmcCarResult">
         <include refid="selectCmcCarVo"/>
-        <where>  
+        <where>
             <if test="licensePlate != null  and licensePlate != ''"> and license_plate = #{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>
         </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>
+            <if test="acquisitionTime != null">acquisition_time,</if>
+            <if test="cost != null">cost,</if>
+            <if test="expectLife != null">expect_life,</if>
+            <if test="series != null">series,</if>
+            <if test="level != null">level,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="licensePlate != null">#{licensePlate},</if>
             <if test="driver != null">#{driver},</if>
-         </trim>
+            <if test="acquisitionTime != null">#{acquisitionTime},</if>
+            <if test="cost != null">#{cost},</if>
+            <if test="expectLife != null">#{expectLife},</if>
+            <if test="series != null">#{series},</if>
+            <if test="level != null">#{level},</if>
+        </trim>
     </insert>
 
     <update id="updateCmcCar" parameterType="CmcCar">
@@ -44,6 +64,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="licensePlate != null">license_plate = #{licensePlate},</if>
             <if test="driver != null">driver = #{driver},</if>
+            <if test="acquisitionTime != null">acquisition_time = #{acquisitionTime},</if>
+            <if test="cost != null">cost = #{cost},</if>
+            <if test="expectLife != null">expect_life = #{expectLife},</if>
+            <if test="series != null">series = #{series},</if>
+            <if test="level != null">level = #{level},</if>
         </trim>
         where car_id = #{carId}
     </update>
@@ -53,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCmcCarByCarIds" parameterType="String">
-        delete from cmc_car where car_id in 
+        delete from cmc_car where car_id in
         <foreach item="carId" collection="array" open="(" separator="," close=")">
             #{carId}
         </foreach>

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

@@ -0,0 +1,133 @@
+<?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.CmcDeviceApprovalMapper">
+    
+    <resultMap type="CmcDeviceApproval" id="CmcDeviceApprovalResult">
+        <result property="deviceApplyId"    column="device_apply_id"    />
+        <result property="applier"    column="applier"    />
+        <result property="deviceId"    column="device_id"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="applyReason"    column="apply_reason"    />
+        <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="dispatcher"    column="dispatcher"    />
+        <result property="dispatchComment"    column="dispatch_comment"    />
+        <result property="estimateCost"    column="estimate_cost"    />
+    </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
+    </sql>
+
+    <select id="selectCmcDeviceApprovalList" parameterType="CmcDeviceApproval" resultMap="CmcDeviceApprovalResult">
+        <include refid="selectCmcDeviceApprovalVo"/>
+        <where>  
+            <if test="applier != null "> and applier = #{applier}</if>
+            <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="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="dispatcher != null "> and dispatcher = #{dispatcher}</if>
+            <if test="dispatchComment != null  and dispatchComment != ''"> and dispatch_comment = #{dispatchComment}</if>
+            <if test="estimateCost != null "> and estimate_cost = #{estimateCost}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcDeviceApprovalByDeviceApplyId" parameterType="String" resultMap="CmcDeviceApprovalResult">
+        <include refid="selectCmcDeviceApprovalVo"/>
+        where device_apply_id = #{deviceApplyId}
+    </select>
+        
+    <insert id="insertCmcDeviceApproval" parameterType="CmcDeviceApproval">
+        insert into cmc_device_approval
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deviceApplyId != null">device_apply_id,</if>
+            <if test="applier != null">applier,</if>
+            <if test="deviceId != null">device_id,</if>
+            <if test="projectNumber != null">project_number,</if>
+            <if test="applyReason != null">apply_reason,</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="dispatcher != null">dispatcher,</if>
+            <if test="dispatchComment != null">dispatch_comment,</if>
+            <if test="estimateCost != null">estimate_cost,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deviceApplyId != null">#{deviceApplyId},</if>
+            <if test="applier != null">#{applier},</if>
+            <if test="deviceId != null">#{deviceId},</if>
+            <if test="projectNumber != null">#{projectNumber},</if>
+            <if test="applyReason != null">#{applyReason},</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="dispatcher != null">#{dispatcher},</if>
+            <if test="dispatchComment != null">#{dispatchComment},</if>
+            <if test="estimateCost != null">#{estimateCost},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcDeviceApproval" parameterType="CmcDeviceApproval">
+        update cmc_device_approval
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="applier != null">applier = #{applier},</if>
+            <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="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="dispatcher != null">dispatcher = #{dispatcher},</if>
+            <if test="dispatchComment != null">dispatch_comment = #{dispatchComment},</if>
+            <if test="estimateCost != null">estimate_cost = #{estimateCost},</if>
+        </trim>
+        where device_apply_id = #{deviceApplyId}
+    </update>
+
+    <delete id="deleteCmcDeviceApprovalByDeviceApplyId" parameterType="String">
+        delete from cmc_device_approval where device_apply_id = #{deviceApplyId}
+    </delete>
+
+    <delete id="deleteCmcDeviceApprovalByDeviceApplyIds" parameterType="String">
+        delete from cmc_device_approval where device_apply_id in 
+        <foreach item="deviceApplyId" collection="array" open="(" separator="," close=")">
+            #{deviceApplyId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,81 @@
+<?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.CmcDeviceMapper">
+    
+    <resultMap type="CmcDevice" id="CmcDeviceResult">
+        <result property="deviceId"    column="device_id"    />
+        <result property="code"    column="code"    />
+        <result property="type"    column="type"    />
+        <result property="acquisitionTime"    column="acquisition_time"    />
+        <result property="cost"    column="cost"    />
+        <result property="expectLife"    column="expect_life"    />
+        <result property="series"    column="series"    />
+    </resultMap>
+
+    <sql id="selectCmcDeviceVo">
+        select device_id, code, type, acquisition_time, cost, expect_life, series from cmc_device
+    </sql>
+
+    <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>
+            <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>
+        </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=",">
+            <if test="code != null">code,</if>
+            <if test="type != null">type,</if>
+            <if test="acquisitionTime != null">acquisition_time,</if>
+            <if test="cost != null">cost,</if>
+            <if test="expectLife != null">expect_life,</if>
+            <if test="series != null">series,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="code != null">#{code},</if>
+            <if test="type != null">#{type},</if>
+            <if test="acquisitionTime != null">#{acquisitionTime},</if>
+            <if test="cost != null">#{cost},</if>
+            <if test="expectLife != null">#{expectLife},</if>
+            <if test="series != null">#{series},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcDevice" parameterType="CmcDevice">
+        update cmc_device
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="code != null">code = #{code},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="acquisitionTime != null">acquisition_time = #{acquisitionTime},</if>
+            <if test="cost != null">cost = #{cost},</if>
+            <if test="expectLife != null">expect_life = #{expectLife},</if>
+            <if test="series != null">series = #{series},</if>
+        </trim>
+        where device_id = #{deviceId}
+    </update>
+
+    <delete id="deleteCmcDeviceByDeviceId" parameterType="Long">
+        delete from cmc_device where device_id = #{deviceId}
+    </delete>
+
+    <delete id="deleteCmcDeviceByDeviceIds" parameterType="String">
+        delete from cmc_device where device_id in 
+        <foreach item="deviceId" collection="array" open="(" separator="," close=")">
+            #{deviceId}
+        </foreach>
+    </delete>
+</mapper>

oa-back/sql/sql.sql

@@ -344,11 +344,12 @@ create table sys_menu (
 -- 初始化-菜单信息表数据
 -- ----------------------------
 -- 一级菜单
-insert into sys_menu values('1', '系统管理', '0', '1', 'system',           null, '', 1, 0, 'M', '0', '0', '', 'system',   'admin', sysdate(), '', null, '系统管理目录');
-insert into sys_menu values('2', '系统监控', '0', '2', 'monitor',          null, '', 1, 0, 'M', '0', '0', '', 'monitor',  'admin', sysdate(), '', null, '系统监控目录');
-insert into sys_menu values('3', '系统工具', '0', '3', 'tool',             null, '', 1, 0, 'M', '0', '0', '', 'tool',     'admin', sysdate(), '', null, '系统工具目录');
-insert into sys_menu values('4', '车辆管理', '0', '4', 'car',    	  'oa/car/index',        	  '', 1, 0, 'C', '0', '0', 'oa:car:list',       	  'car',       	   'admin', sysdate(), '', null, '车辆管理菜单');
-insert into sys_menu values('5', '项目管理', '0', '5', 'project',	  'oa/project/index',         '', 1, 0, 'C', '0', '0', 'oa:project:list',         'project',       'admin', sysdate(), '', null, '项目管理菜单');
+insert into sys_menu values('1', '系统管理', '0', '1', 'system',			null, '', 1, 0, 'M', '0', '0', '', 'system',	'admin', sysdate(), '', null, '系统管理目录');
+insert into sys_menu values('2', '系统监控', '0', '2', 'monitor',			null, '', 1, 0, 'M', '0', '0', '', 'monitor',	'admin', sysdate(), '', null, '系统监控目录');
+insert into sys_menu values('3', '系统工具', '0', '3', 'tool',				null, '', 1, 0, 'M', '0', '0', '', 'tool',		'admin', sysdate(), '', null, '系统工具目录');
+insert into sys_menu values('4', '车辆管理', '0', '4', 'car',			'oa/car/index',        	  '', 1, 0, 'C', '0', '0', 'oa:car:list',       	  'car',			'admin', sysdate(), '', null, '车辆管理菜单');
+insert into sys_menu values('5', '设备管理', '0', '5', 'device',		'oa/device/index',        '', 1, 0, 'C', '0', '0', 'oa:device:list',       	  'component',		'admin', sysdate(), '', null, '设备管理菜单');
+insert into sys_menu values('6', '项目管理', '0', '6', 'project',		'oa/project/index',       '', 1, 0, 'C', '0', '0', 'oa:project:list',         'project',		'admin', sysdate(), '', null, '项目管理菜单');
 -- 二级菜单
 insert into sys_menu values('100',  '用户管理', '1',   '1', 'user',       'system/user/index',        '', 1, 0, 'C', '0', '0', 'system:user:list',        'user',          'admin', sysdate(), '', null, '用户管理菜单');
 insert into sys_menu values('101',  '角色管理', '1',   '2', 'role',       'system/role/index',        '', 1, 0, 'C', '0', '0', 'system:role:list',        'peoples',       'admin', sysdate(), '', null, '角色管理菜单');
@@ -447,17 +448,23 @@ insert into sys_menu values('1059', '导入代码', '116', '4', '#', '', '', 1,
 insert into sys_menu values('1060', '预览代码', '116', '5', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview',           '#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1061', '生成代码', '116', '6', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code',              '#', 'admin', sysdate(), '', null, '');
 -- 车辆管理按钮
-insert into sys_menu values('1062', '车辆查询', '4', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:car:query',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1062', '车辆查询', '4', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:car:query',					'#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1063', '车辆新增', '4', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:car:add',					'#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1064', '车辆修改', '4', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:car:edit',              	'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1065', '车辆删除', '4', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:car:remove',              '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1066', '车辆导出', '4', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:car:export',              '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1067', '项目查询', '5', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:query',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1068', '项目新增', '5', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:add',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1069', '项目修改', '5', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:edit',            '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1070', '项目删除', '5', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:remove',          '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1071', '项目导出', '5', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:export',          '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1065', '车辆删除', '4', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:car:remove',              	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1066', '车辆导出', '4', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:car:export',              	'#', 'admin', sysdate(), '', null, '');
+-- 设备管理按钮
+insert into sys_menu values('1067', '设备查询', '5', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:query',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1068', '设备新增', '5', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:add',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1069', '设备修改', '5', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:edit',            	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1070', '设备删除', '5', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:remove',          	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1071', '设备导出', '5', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:export',          	'#', 'admin', sysdate(), '', null, '');
+-- 项目管理按钮
+insert into sys_menu values('1072', '项目查询', '6', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:query',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1073', '项目新增', '6', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:add',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1074', '项目修改', '6', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:edit',            	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1075', '项目删除', '6', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:remove',          	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1076', '项目导出', '6', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:export',          	'#', 'admin', sysdate(), '', null, '');
 
 -- ----------------------------
 -- 6、用户和角色关联表  用户N-1角色
@@ -708,19 +715,21 @@ insert into sys_user_post values (13, 12);
 insert into sys_user_post values (14, 10);
 insert into sys_user_post values (14, 12);
 insert into sys_user_post values (15, 19);
-insert into sys_user_post values (16, 23);
-insert into sys_user_post values (17, 23);
-insert into sys_user_post values (18, 23);
-insert into sys_user_post values (19, 23);
+insert into sys_user_post values (16, 26);
+insert into sys_user_post values (16, 27);
+insert into sys_user_post values (17, 26);
+insert into sys_user_post values (18, 26);
+insert into sys_user_post values (19, 26);
+insert into sys_user_post values (19, 27);
 insert into sys_user_post values (20, 13);
 insert into sys_user_post values (21, 13);
 insert into sys_user_post values (22, 20);
-insert into sys_user_post values (22, 23);
-insert into sys_user_post values (23, 23);
-insert into sys_user_post values (24, 23);
-insert into sys_user_post values (25, 23);
-insert into sys_user_post values (26, 23);
-insert into sys_user_post values (27, 23);
+insert into sys_user_post values (22, 26);
+insert into sys_user_post values (23, 26);
+insert into sys_user_post values (24, 26);
+insert into sys_user_post values (25, 26);
+insert into sys_user_post values (26, 26);
+insert into sys_user_post values (27, 26);
 insert into sys_user_post values (28, 13);
 insert into sys_user_post values (29, 25);
 insert into sys_user_post values (30, 24);
@@ -1390,13 +1399,14 @@ create table `cmc_project_work`  (
 -- ----------------------------
 drop table if exists `cmc_car`;
 create table `cmc_car`  (
-  `car_id`			int					not null auto_increment		comment '车辆id',
-  `license_plate`	varchar(8)			default null				comment '车牌号',
-  `driver`			bigint				default null				comment '驾驶员（常用）',
-  `cost`			decimal(10,2)		default null				comment '总价',
-  `expect_life`		int					default null				comment '预计使用年限',
-  `series`			varchar(10)			default null				comment '车系',
-  `level`			varchar(10)			default null				comment '车级',
+  `car_id`				int					not null auto_increment		comment '车辆id',
+  `license_plate`		varchar(8)			default null				comment '车牌号',
+  `driver`				bigint				default null				comment '驾驶员（常用）',
+  `acquisition_time`	datetime			default null				comment '购置时间',
+  `cost`				decimal(10,2)		default null				comment '总价',
+  `expect_life`			int					default null				comment '预计使用年限',
+  `series`				varchar(10)			default null				comment '车系',
+  `level`				varchar(10)			default null				comment '车级',
   primary key (`car_id`)
 ) engine = innodb comment = 'cmc车辆信息表';
 
@@ -1442,12 +1452,13 @@ create table `cmc_car_approval`  (
 -- ----------------------------
 drop table if exists `cmc_device`;
 create table `cmc_device`  (
-  `device_id`		int					not null auto_increment		comment '设备id',
-  `code`			varchar(20)			default null				comment '设备编号',
-  `type`			varchar(10)			default null				comment '设备类别',
-  `cost`			decimal(10,2)		default null				comment '总价',
-  `expect_life`		int					default null				comment '预计使用年限',
-  `series`			varchar(20)			default null				comment '设备系列',
+  `device_id`			int					not null auto_increment		comment '设备id',
+  `code`				varchar(20)			default null				comment '设备编号',
+  `type`				varchar(10)			default null				comment '设备类别',
+  `acquisition_time`	datetime			default null				comment '购置时间',
+  `cost`				decimal(10,2)		default null				comment '总价',
+  `expect_life`			int					default null				comment '预计使用年限',
+  `series`				varchar(20)			default null				comment '设备系列',
   primary key (`device_id`)
 ) engine = innodb comment = 'cmc设备信息表';
 
@@ -1514,69 +1525,72 @@ create table `cmc_user_cost`  (
   `name`			varchar(10)		default null				comment '项名',
   `month_cost`		decimal(10, 2)	default null				comment '月成本',
   primary key (`cost_id`)
-) engine = innodb comment = 'cmc用户历史表';
+) engine = innodb comment = 'cmc用户成本表';
 
 -- ----------------------------
 -- 初始化-用户成本表数据
 -- ----------------------------
-insert into `cmc_cost` values (1, '一岗一档', 300.00);
-insert into `cmc_cost` values (2, '一岗二档', 340.00);
-insert into `cmc_cost` values (3, '一岗三档', 380.00);
-insert into `cmc_cost` values (4, '一岗四档', 420.00);
-insert into `cmc_cost` values (5, '二岗一档', 440.00);
-insert into `cmc_cost` values (6, '二岗二档', 500.00);
-insert into `cmc_cost` values (7, '二岗三档', 560.00);
-insert into `cmc_cost` values (8, '二岗四档', 620.00);
-insert into `cmc_cost` values (9, '二岗五档', 680.00);
-insert into `cmc_cost` values (10, '二岗六档', 740.00);
-insert into `cmc_cost` values (11, '三岗一档', 560.00);
-insert into `cmc_cost` values (12, '三岗二档', 640.00);
-insert into `cmc_cost` values (13, '三岗三档', 720.00);
-insert into `cmc_cost` values (14, '三岗四档', 800.00);
-insert into `cmc_cost` values (15, '三岗五档', 880.00);
-insert into `cmc_cost` values (16, '三岗六档', 960.00);
-insert into `cmc_cost` values (17, '三岗七档', 1040.00);
-insert into `cmc_cost` values (18, '三岗八档', 1120.00);
-insert into `cmc_cost` values (19, '四岗一档', 880.00);
-insert into `cmc_cost` values (20, '四岗二档', 1020.00);
-insert into `cmc_cost` values (21, '四岗三档', 1160.00);
-insert into `cmc_cost` values (22, '四岗四档', 1300.00);
-insert into `cmc_cost` values (23, '四岗五档', 1440.00);
-insert into `cmc_cost` values (24, '四岗六档', 1580.00);
-insert into `cmc_cost` values (25, '四岗七档', 1720.00);
-insert into `cmc_cost` values (26, '四岗八档', 1860.00);
-insert into `cmc_cost` values (27, '五岗一档', 1700.00);
-insert into `cmc_cost` values (28, '五岗二档', 1860.00);
-insert into `cmc_cost` values (29, '五岗三档', 2020.00);
-insert into `cmc_cost` values (30, '五岗四档', 2180.00);
-insert into `cmc_cost` values (31, '五岗五档', 2340.00);
-insert into `cmc_cost` values (32, '五岗六档', 2500.00);
-insert into `cmc_cost` values (33, '五岗七档', 2660.00);
-insert into `cmc_cost` values (34, '五岗八档', 2820.00);
-insert into `cmc_cost` values (35, '六岗一档', 2640.00);
-insert into `cmc_cost` values (36, '六岗二档', 2820.00);
-insert into `cmc_cost` values (37, '六岗三档', 3000.00);
-insert into `cmc_cost` values (38, '六岗四档', 3180.00);
-insert into `cmc_cost` values (39, '六岗五档', 3360.00);
-insert into `cmc_cost` values (40, '六岗六档', 3540.00);
-insert into `cmc_cost` values (41, '六岗七档', 3720.00);
-insert into `cmc_cost` values (42, '六岗八档', 3900.00);
-insert into `cmc_cost` values (43, '七岗一档', 3700.00);
-insert into `cmc_cost` values (44, '七岗二档', 3900.00);
-insert into `cmc_cost` values (45, '七岗三档', 4100.00);
-insert into `cmc_cost` values (46, '七岗四档', 4300.00);
-insert into `cmc_cost` values (47, '七岗五档', 4500.00);
-insert into `cmc_cost` values (48, '七岗六档', 4700.00);
-insert into `cmc_cost` values (49, '七岗七档', 4900.00);
-insert into `cmc_cost` values (50, '七岗八档', 5100.00);
-insert into `cmc_cost` values (51, '八岗一档', 4880.00);
-insert into `cmc_cost` values (52, '八岗二档', 5100.00);
-insert into `cmc_cost` values (53, '八岗三档', 5320.00);
-insert into `cmc_cost` values (54, '八岗四档', 5540.00);
-insert into `cmc_cost` values (55, '八岗五档', 5760.00);
-insert into `cmc_cost` values (56, '八岗六档', 5980.00);
-insert into `cmc_cost` values (57, '八岗七档', 6200.00);
-insert into `cmc_cost` values (58, '八岗八档', 6420.00);
+insert into `cmc_user_cost` values (1, '一岗一档', 300.00);
+insert into `cmc_user_cost` values (2, '一岗二档', 340.00);
+insert into `cmc_user_cost` values (3, '一岗三档', 380.00);
+insert into `cmc_user_cost` values (4, '一岗四档', 420.00);
+insert into `cmc_user_cost` values (5, '二岗一档', 440.00);
+insert into `cmc_user_cost` values (6, '二岗二档', 500.00);
+insert into `cmc_user_cost` values (7, '二岗三档', 560.00);
+insert into `cmc_user_cost` values (8, '二岗四档', 620.00);
+insert into `cmc_user_cost` values (9, '二岗五档', 680.00);
+insert into `cmc_user_cost` values (10, '二岗六档', 740.00);
+insert into `cmc_user_cost` values (11, '三岗一档', 560.00);
+insert into `cmc_user_cost` values (12, '三岗二档', 640.00);
+insert into `cmc_user_cost` values (13, '三岗三档', 720.00);
+insert into `cmc_user_cost` values (14, '三岗四档', 800.00);
+insert into `cmc_user_cost` values (15, '三岗五档', 880.00);
+insert into `cmc_user_cost` values (16, '三岗六档', 960.00);
+insert into `cmc_user_cost` values (17, '三岗七档', 1040.00);
+insert into `cmc_user_cost` values (18, '三岗八档', 1120.00);
+insert into `cmc_user_cost` values (19, '四岗一档', 880.00);
+insert into `cmc_user_cost` values (20, '四岗二档', 1020.00);
+insert into `cmc_user_cost` values (21, '四岗三档', 1160.00);
+insert into `cmc_user_cost` values (22, '四岗四档', 1300.00);
+insert into `cmc_user_cost` values (23, '四岗五档', 1440.00);
+insert into `cmc_user_cost` values (24, '四岗六档', 1580.00);
+insert into `cmc_user_cost` values (25, '四岗七档', 1720.00);
+insert into `cmc_user_cost` values (26, '四岗八档', 1860.00);
+insert into `cmc_user_cost` values (27, '五岗一档', 1700.00);
+insert into `cmc_user_cost` values (28, '五岗二档', 1860.00);
+insert into `cmc_user_cost` values (29, '五岗三档', 2020.00);
+insert into `cmc_user_cost` values (30, '五岗四档', 2180.00);
+insert into `cmc_user_cost` values (31, '五岗五档', 2340.00);
+insert into `cmc_user_cost` values (32, '五岗六档', 2500.00);
+insert into `cmc_user_cost` values (33, '五岗七档', 2660.00);
+insert into `cmc_user_cost` values (34, '五岗八档', 2820.00);
+insert into `cmc_user_cost` values (35, '六岗一档', 2640.00);
+insert into `cmc_user_cost` values (36, '六岗二档', 2820.00);
+insert into `cmc_user_cost` values (37, '六岗三档', 3000.00);
+insert into `cmc_user_cost` values (38, '六岗四档', 3180.00);
+insert into `cmc_user_cost` values (39, '六岗五档', 3360.00);
+insert into `cmc_user_cost` values (40, '六岗六档', 3540.00);
+insert into `cmc_user_cost` values (41, '六岗七档', 3720.00);
+insert into `cmc_user_cost` values (42, '六岗八档', 3900.00);
+insert into `cmc_user_cost` values (43, '七岗一档', 3700.00);
+insert into `cmc_user_cost` values (44, '七岗二档', 3900.00);
+insert into `cmc_user_cost` values (45, '七岗三档', 4100.00);
+insert into `cmc_user_cost` values (46, '七岗四档', 4300.00);
+insert into `cmc_user_cost` values (47, '七岗五档', 4500.00);
+insert into `cmc_user_cost` values (48, '七岗六档', 4700.00);
+insert into `cmc_user_cost` values (49, '七岗七档', 4900.00);
+insert into `cmc_user_cost` values (50, '七岗八档', 5100.00);
+insert into `cmc_user_cost` values (51, '八岗一档', 4880.00);
+insert into `cmc_user_cost` values (52, '八岗二档', 5100.00);
+insert into `cmc_user_cost` values (53, '八岗三档', 5320.00);
+insert into `cmc_user_cost` values (54, '八岗四档', 5540.00);
+insert into `cmc_user_cost` values (55, '八岗五档', 5760.00);
+insert into `cmc_user_cost` values (56, '八岗六档', 5980.00);
+insert into `cmc_user_cost` values (57, '八岗七档', 6200.00);
+insert into `cmc_user_cost` values (58, '八岗八档', 6420.00);
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
 
 -- ----------------------------
 -- Table structure for ACT_APP_APPDEF

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc用车审批列表
+export function listCarApproval(query) {
+  return request({
+    url: '/oa/carApproval/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc用车审批详细
+export function getCarApproval(carApplyId) {
+  return request({
+    url: '/oa/carApproval/' + carApplyId,
+    method: 'get'
+  })
+}
+
+// 新增cmc用车审批
+export function addCarApproval(data) {
+  return request({
+    url: '/oa/carApproval',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc用车审批
+export function updateCarApproval(data) {
+  return request({
+    url: '/oa/carApproval',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc用车审批
+export function delCarApproval(carApplyId) {
+  return request({
+    url: '/oa/carApproval/' + carApplyId,
+    method: 'delete'
+  })
+}

oa-ui/src/api/oa/device/device.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc设备信息列表
+export function listDevice(query) {
+  return request({
+    url: '/oa/device/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc设备信息详细
+export function getDevice(deviceId) {
+  return request({
+    url: '/oa/device/' + deviceId,
+    method: 'get'
+  })
+}
+
+// 新增cmc设备信息
+export function addDevice(data) {
+  return request({
+    url: '/oa/device',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc设备信息
+export function updateDevice(data) {
+  return request({
+    url: '/oa/device',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc设备信息
+export function delDevice(deviceId) {
+  return request({
+    url: '/oa/device/' + deviceId,
+    method: 'delete'
+  })
+}

oa-ui/src/api/oa/device/deviceApproval.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc设备审批列表
+export function listDeviceApproval(query) {
+  return request({
+    url: '/oa/deviceApproval/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc设备审批详细
+export function getDeviceApproval(deviceApplyId) {
+  return request({
+    url: '/oa/deviceApproval/' + deviceApplyId,
+    method: 'get'
+  })
+}
+
+// 新增cmc设备审批
+export function addDeviceApproval(data) {
+  return request({
+    url: '/oa/deviceApproval',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc设备审批
+export function updateDeviceApproval(data) {
+  return request({
+    url: '/oa/deviceApproval',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc设备审批
+export function delDeviceApproval(deviceApplyId) {
+  return request({
+    url: '/oa/deviceApproval/' + deviceApplyId,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,313 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="设备编号" prop="code">
+        <el-input
+          v-model="queryParams.code"
+          placeholder="请输入设备编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="购置时间" prop="acquisitionTime">
+        <el-date-picker clearable
+          v-model="queryParams.acquisitionTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择购置时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="总价" prop="cost">
+        <el-input
+          v-model="queryParams.cost"
+          placeholder="请输入总价"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预计使用年限" prop="expectLife">
+        <el-input
+          v-model="queryParams.expectLife"
+          placeholder="请输入预计使用年限"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备系列" prop="series">
+        <el-input
+          v-model="queryParams.series"
+          placeholder="请输入设备系列"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oa:device:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['oa:device:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['oa:device:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['oa:device:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="设备id" align="center" prop="deviceId" />
+      <el-table-column label="设备编号" align="center" prop="code" />
+      <el-table-column label="设备类别" align="center" prop="type" />
+      <el-table-column label="购置时间" align="center" prop="acquisitionTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.acquisitionTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="总价" align="center" prop="cost" />
+      <el-table-column label="预计使用年限" align="center" prop="expectLife" />
+      <el-table-column label="设备系列" align="center" prop="series" />
+      <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:device:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:device:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改cmc设备信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="设备编号" prop="code">
+          <el-input v-model="form.code" placeholder="请输入设备编号" />
+        </el-form-item>
+        <el-form-item label="购置时间" prop="acquisitionTime">
+          <el-date-picker clearable
+            v-model="form.acquisitionTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择购置时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="总价" prop="cost">
+          <el-input v-model="form.cost" placeholder="请输入总价" />
+        </el-form-item>
+        <el-form-item label="预计使用年限" prop="expectLife">
+          <el-input v-model="form.expectLife" placeholder="请输入预计使用年限" />
+        </el-form-item>
+        <el-form-item label="设备系列" prop="series">
+          <el-input v-model="form.series" placeholder="请输入设备系列" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDevice, getDevice, delDevice, addDevice, updateDevice } from "@/api/oa/device/device";
+
+export default {
+  name: "Device",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc设备信息表格数据
+      deviceList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        code: null,
+        type: null,
+        acquisitionTime: null,
+        cost: null,
+        expectLife: null,
+        series: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc设备信息列表 */
+    getList() {
+      this.loading = true;
+      listDevice(this.queryParams).then(response => {
+        this.deviceList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        deviceId: null,
+        code: null,
+        type: null,
+        acquisitionTime: null,
+        cost: null,
+        expectLife: null,
+        series: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.deviceId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc设备信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const deviceId = row.deviceId || this.ids
+      getDevice(deviceId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc设备信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.deviceId != null) {
+            updateDevice(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDevice(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const deviceIds = row.deviceId || this.ids;
+      this.$modal.confirm('是否确认删除cmc设备信息编号为"' + deviceIds + '"的数据项？').then(function() {
+        return delDevice(deviceIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/device/export', {
+        ...this.queryParams
+      }, `device_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>