设备移交、费用、维修表

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

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.CmcDeviceHandover;
+import com.ruoyi.oa.service.ICmcDeviceHandoverService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc设备移交Controller
+ * 
+ * @author cmc
+ * @date 2024-05-21
+ */
+@RestController
+@RequestMapping("/oa/deviceHandover")
+public class CmcDeviceHandoverController extends BaseController
+{
+    @Autowired
+    private ICmcDeviceHandoverService cmcDeviceHandoverService;
+
+    /**
+     * 查询cmc设备移交列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcDeviceHandover cmcDeviceHandover)
+    {
+        startPage();
+        List<CmcDeviceHandover> list = cmcDeviceHandoverService.selectCmcDeviceHandoverList(cmcDeviceHandover);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc设备移交列表
+     */
+    @Log(title = "cmc设备移交", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcDeviceHandover cmcDeviceHandover)
+    {
+        List<CmcDeviceHandover> list = cmcDeviceHandoverService.selectCmcDeviceHandoverList(cmcDeviceHandover);
+        ExcelUtil<CmcDeviceHandover> util = new ExcelUtil<CmcDeviceHandover>(CmcDeviceHandover.class);
+        util.exportExcel(response, list, "cmc设备移交数据");
+    }
+
+    /**
+     * 获取cmc设备移交详细信息
+     */
+    @GetMapping(value = "/{deviceHandoverId}")
+    public AjaxResult getInfo(@PathVariable("deviceHandoverId") String deviceHandoverId)
+    {
+        return success(cmcDeviceHandoverService.selectCmcDeviceHandoverByDeviceHandoverId(deviceHandoverId));
+    }
+
+    /**
+     * 新增cmc设备移交
+     */
+    @Log(title = "cmc设备移交", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcDeviceHandover cmcDeviceHandover)
+    {
+        return toAjax(cmcDeviceHandoverService.insertCmcDeviceHandover(cmcDeviceHandover));
+    }
+
+    /**
+     * 修改cmc设备移交
+     */
+    @Log(title = "cmc设备移交", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcDeviceHandover cmcDeviceHandover)
+    {
+        return toAjax(cmcDeviceHandoverService.updateCmcDeviceHandover(cmcDeviceHandover));
+    }
+
+    /**
+     * 删除cmc设备移交
+     */
+    @Log(title = "cmc设备移交", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{deviceHandoverIds}")
+    public AjaxResult remove(@PathVariable String[] deviceHandoverIds)
+    {
+        return toAjax(cmcDeviceHandoverService.deleteCmcDeviceHandoverByDeviceHandoverIds(deviceHandoverIds));
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.CmcDeviceScrap;
+import com.ruoyi.oa.service.ICmcDeviceScrapService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc设备报废Controller
+ * 
+ * @author cmc
+ * @date 2024-05-21
+ */
+@RestController
+@RequestMapping("/oa/deviceScrap")
+public class CmcDeviceScrapController extends BaseController
+{
+    @Autowired
+    private ICmcDeviceScrapService cmcDeviceScrapService;
+
+    /**
+     * 查询cmc设备报废列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcDeviceScrap cmcDeviceScrap)
+    {
+        startPage();
+        List<CmcDeviceScrap> list = cmcDeviceScrapService.selectCmcDeviceScrapList(cmcDeviceScrap);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc设备报废列表
+     */
+    @Log(title = "cmc设备报废", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcDeviceScrap cmcDeviceScrap)
+    {
+        List<CmcDeviceScrap> list = cmcDeviceScrapService.selectCmcDeviceScrapList(cmcDeviceScrap);
+        ExcelUtil<CmcDeviceScrap> util = new ExcelUtil<CmcDeviceScrap>(CmcDeviceScrap.class);
+        util.exportExcel(response, list, "cmc设备报废数据");
+    }
+
+    /**
+     * 获取cmc设备报废详细信息
+     */
+    @GetMapping(value = "/{deviceScrapId}")
+    public AjaxResult getInfo(@PathVariable("deviceScrapId") String deviceScrapId)
+    {
+        return success(cmcDeviceScrapService.selectCmcDeviceScrapByDeviceScrapId(deviceScrapId));
+    }
+
+    /**
+     * 新增cmc设备报废
+     */
+    @Log(title = "cmc设备报废", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcDeviceScrap cmcDeviceScrap)
+    {
+        return toAjax(cmcDeviceScrapService.insertCmcDeviceScrap(cmcDeviceScrap));
+    }
+
+    /**
+     * 修改cmc设备报废
+     */
+    @Log(title = "cmc设备报废", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcDeviceScrap cmcDeviceScrap)
+    {
+        return toAjax(cmcDeviceScrapService.updateCmcDeviceScrap(cmcDeviceScrap));
+    }
+
+    /**
+     * 删除cmc设备报废
+     */
+    @Log(title = "cmc设备报废", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{deviceScrapIds}")
+    public AjaxResult remove(@PathVariable String[] deviceScrapIds)
+    {
+        return toAjax(cmcDeviceScrapService.deleteCmcDeviceScrapByDeviceScrapIds(deviceScrapIds));
+    }
+}

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

@@ -9,22 +9,26 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * cmc仪器费用对象 cmc_device_expense
+ * cmc设备费用对象 cmc_device_expense
  * 
  * @author cmc
- * @date 2024-05-20
+ * @date 2024-05-21
  */
 public class CmcDeviceExpense extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 仪器费用id */
+    /** 设备费用id */
     private String deviceExpenseId;
 
-    /** 仪器id */
-    @Excel(name = "仪器id")
+    /** 设备id */
+    @Excel(name = "设备id")
     private Long deviceId;
 
+    /** 负责人id */
+    @Excel(name = "负责人id")
+    private Long userId;
+
     /** 费用类型（0检定费、1维修保养费） */
     @Excel(name = "费用类型", readConverterExp = "0=检定费、1维修保养费")
     private String expenseType;
@@ -39,6 +43,7 @@ public class CmcDeviceExpense extends BaseEntity
     private Date occurDate;
 
     /** 附件 */
+    @Excel(name = "附件")
     private String document;
 
     public void setDeviceExpenseId(String deviceExpenseId) 
@@ -59,6 +64,15 @@ public class CmcDeviceExpense extends BaseEntity
     {
         return deviceId;
     }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
     public void setExpenseType(String expenseType) 
     {
         this.expenseType = expenseType;
@@ -86,12 +100,12 @@ public class CmcDeviceExpense extends BaseEntity
     {
         return occurDate;
     }
-    public void setDocument(String document)
+    public void setDocument(String document) 
     {
         this.document = document;
     }
 
-    public String getDocument()
+    public String getDocument() 
     {
         return document;
     }
@@ -101,6 +115,7 @@ public class CmcDeviceExpense extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("deviceExpenseId", getDeviceExpenseId())
             .append("deviceId", getDeviceId())
+            .append("userId", getUserId())
             .append("expenseType", getExpenseType())
             .append("expense", getExpense())
             .append("occurDate", getOccurDate())

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

@@ -0,0 +1,153 @@
+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_device_handover
+ * 
+ * @author cmc
+ * @date 2024-05-21
+ */
+public class CmcDeviceHandover extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 设备移交id */
+    private String deviceHandoverId;
+
+    /** 设备id */
+    @Excel(name = "设备id")
+    private Long deviceId;
+
+    /** 移交部门id */
+    @Excel(name = "移交部门id")
+    private Long handoverDept;
+
+    /** 移交人id */
+    @Excel(name = "移交人id")
+    private Long handoverUser;
+
+    /** 移交日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "移交日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date handoverDate;
+
+    /** 接收部门id */
+    @Excel(name = "接收部门id")
+    private Long receiveDept;
+
+    /** 接收人id */
+    @Excel(name = "接收人id")
+    private Long receiveUser;
+
+    /** 设备软件说明 */
+    @Excel(name = "设备软件说明")
+    private String description;
+
+    /** 交接原因 */
+    @Excel(name = "交接原因")
+    private String reason;
+
+    public void setDeviceHandoverId(String deviceHandoverId) 
+    {
+        this.deviceHandoverId = deviceHandoverId;
+    }
+
+    public String getDeviceHandoverId() 
+    {
+        return deviceHandoverId;
+    }
+    public void setDeviceId(Long deviceId) 
+    {
+        this.deviceId = deviceId;
+    }
+
+    public Long getDeviceId() 
+    {
+        return deviceId;
+    }
+    public void setHandoverDept(Long handoverDept) 
+    {
+        this.handoverDept = handoverDept;
+    }
+
+    public Long getHandoverDept() 
+    {
+        return handoverDept;
+    }
+    public void setHandoverUser(Long handoverUser) 
+    {
+        this.handoverUser = handoverUser;
+    }
+
+    public Long getHandoverUser() 
+    {
+        return handoverUser;
+    }
+    public void setHandoverDate(Date handoverDate) 
+    {
+        this.handoverDate = handoverDate;
+    }
+
+    public Date getHandoverDate() 
+    {
+        return handoverDate;
+    }
+    public void setReceiveDept(Long receiveDept) 
+    {
+        this.receiveDept = receiveDept;
+    }
+
+    public Long getReceiveDept() 
+    {
+        return receiveDept;
+    }
+    public void setReceiveUser(Long receiveUser) 
+    {
+        this.receiveUser = receiveUser;
+    }
+
+    public Long getReceiveUser() 
+    {
+        return receiveUser;
+    }
+    public void setDescription(String description) 
+    {
+        this.description = description;
+    }
+
+    public String getDescription() 
+    {
+        return description;
+    }
+    public void setReason(String reason) 
+    {
+        this.reason = reason;
+    }
+
+    public String getReason() 
+    {
+        return reason;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("deviceHandoverId", getDeviceHandoverId())
+            .append("deviceId", getDeviceId())
+            .append("handoverDept", getHandoverDept())
+            .append("handoverUser", getHandoverUser())
+            .append("handoverDate", getHandoverDate())
+            .append("receiveDept", getReceiveDept())
+            .append("receiveUser", getReceiveUser())
+            .append("description", getDescription())
+            .append("reason", getReason())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,126 @@
+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_scrap
+ * 
+ * @author cmc
+ * @date 2024-05-21
+ */
+public class CmcDeviceScrap extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 设备报废id */
+    private String deviceScrapId;
+
+    /** 设备id */
+    @Excel(name = "设备id")
+    private Long deviceId;
+
+    /** 原价值 */
+    @Excel(name = "原价值")
+    private BigDecimal cost;
+
+    /** 报废日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "报废日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date scrapDate;
+
+    /** 报废原因 */
+    @Excel(name = "报废原因")
+    private String reason;
+
+    /** 处理结果 */
+    @Excel(name = "处理结果")
+    private String deal;
+
+    /** 附件 */
+    @Excel(name = "附件")
+    private String document;
+
+    public void setDeviceScrapId(String deviceScrapId) 
+    {
+        this.deviceScrapId = deviceScrapId;
+    }
+
+    public String getDeviceScrapId() 
+    {
+        return deviceScrapId;
+    }
+    public void setDeviceId(Long deviceId) 
+    {
+        this.deviceId = deviceId;
+    }
+
+    public Long getDeviceId() 
+    {
+        return deviceId;
+    }
+    public void setCost(BigDecimal cost) 
+    {
+        this.cost = cost;
+    }
+
+    public BigDecimal getCost() 
+    {
+        return cost;
+    }
+    public void setScrapDate(Date scrapDate) 
+    {
+        this.scrapDate = scrapDate;
+    }
+
+    public Date getScrapDate() 
+    {
+        return scrapDate;
+    }
+    public void setReason(String reason) 
+    {
+        this.reason = reason;
+    }
+
+    public String getReason() 
+    {
+        return reason;
+    }
+    public void setDeal(String deal) 
+    {
+        this.deal = deal;
+    }
+
+    public String getDeal() 
+    {
+        return deal;
+    }
+    public void setDocument(String document) 
+    {
+        this.document = document;
+    }
+
+    public String getDocument() 
+    {
+        return document;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("deviceScrapId", getDeviceScrapId())
+            .append("deviceId", getDeviceId())
+            .append("cost", getCost())
+            .append("scrapDate", getScrapDate())
+            .append("reason", getReason())
+            .append("deal", getDeal())
+            .append("remark", getRemark())
+            .append("document", getDocument())
+            .toString();
+    }
+}

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

@@ -4,55 +4,55 @@ import java.util.List;
 import com.ruoyi.oa.domain.CmcDeviceExpense;
 
 /**
- * cmc仪器费用Mapper接口
+ * cmc设备费用Mapper接口
  * 
  * @author cmc
- * @date 2024-05-20
+ * @date 2024-05-21
  */
 public interface CmcDeviceExpenseMapper 
 {
     /**
-     * 查询cmc仪器费用
+     * 查询cmc设备费用
      * 
-     * @param deviceExpenseId cmc仪器费用主键
-     * @return cmc仪器费用
+     * @param deviceExpenseId cmc设备费用主键
+     * @return cmc设备费用
      */
     public CmcDeviceExpense selectCmcDeviceExpenseByDeviceExpenseId(String deviceExpenseId);
 
     /**
-     * 查询cmc仪器费用列表
+     * 查询cmc设备费用列表
      * 
-     * @param cmcDeviceExpense cmc仪器费用
-     * @return cmc仪器费用集合
+     * @param cmcDeviceExpense cmc设备费用
+     * @return cmc设备费用集合
      */
     public List<CmcDeviceExpense> selectCmcDeviceExpenseList(CmcDeviceExpense cmcDeviceExpense);
 
     /**
-     * 新增cmc仪器费用
+     * 新增cmc设备费用
      * 
-     * @param cmcDeviceExpense cmc仪器费用
+     * @param cmcDeviceExpense cmc设备费用
      * @return 结果
      */
     public int insertCmcDeviceExpense(CmcDeviceExpense cmcDeviceExpense);
 
     /**
-     * 修改cmc仪器费用
+     * 修改cmc设备费用
      * 
-     * @param cmcDeviceExpense cmc仪器费用
+     * @param cmcDeviceExpense cmc设备费用
      * @return 结果
      */
     public int updateCmcDeviceExpense(CmcDeviceExpense cmcDeviceExpense);
 
     /**
-     * 删除cmc仪器费用
+     * 删除cmc设备费用
      * 
-     * @param deviceExpenseId cmc仪器费用主键
+     * @param deviceExpenseId cmc设备费用主键
      * @return 结果
      */
     public int deleteCmcDeviceExpenseByDeviceExpenseId(String deviceExpenseId);
 
     /**
-     * 批量删除cmc仪器费用
+     * 批量删除cmc设备费用
      * 
      * @param deviceExpenseIds 需要删除的数据主键集合
      * @return 结果

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcDeviceHandover;
+
+/**
+ * cmc设备移交Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-05-21
+ */
+public interface CmcDeviceHandoverMapper 
+{
+    /**
+     * 查询cmc设备移交
+     * 
+     * @param deviceHandoverId cmc设备移交主键
+     * @return cmc设备移交
+     */
+    public CmcDeviceHandover selectCmcDeviceHandoverByDeviceHandoverId(String deviceHandoverId);
+
+    /**
+     * 查询cmc设备移交列表
+     * 
+     * @param cmcDeviceHandover cmc设备移交
+     * @return cmc设备移交集合
+     */
+    public List<CmcDeviceHandover> selectCmcDeviceHandoverList(CmcDeviceHandover cmcDeviceHandover);
+
+    /**
+     * 新增cmc设备移交
+     * 
+     * @param cmcDeviceHandover cmc设备移交
+     * @return 结果
+     */
+    public int insertCmcDeviceHandover(CmcDeviceHandover cmcDeviceHandover);
+
+    /**
+     * 修改cmc设备移交
+     * 
+     * @param cmcDeviceHandover cmc设备移交
+     * @return 结果
+     */
+    public int updateCmcDeviceHandover(CmcDeviceHandover cmcDeviceHandover);
+
+    /**
+     * 删除cmc设备移交
+     * 
+     * @param deviceHandoverId cmc设备移交主键
+     * @return 结果
+     */
+    public int deleteCmcDeviceHandoverByDeviceHandoverId(String deviceHandoverId);
+
+    /**
+     * 批量删除cmc设备移交
+     * 
+     * @param deviceHandoverIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcDeviceHandoverByDeviceHandoverIds(String[] deviceHandoverIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcDeviceScrap;
+
+/**
+ * cmc设备报废Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-05-21
+ */
+public interface CmcDeviceScrapMapper 
+{
+    /**
+     * 查询cmc设备报废
+     * 
+     * @param deviceScrapId cmc设备报废主键
+     * @return cmc设备报废
+     */
+    public CmcDeviceScrap selectCmcDeviceScrapByDeviceScrapId(String deviceScrapId);
+
+    /**
+     * 查询cmc设备报废列表
+     * 
+     * @param cmcDeviceScrap cmc设备报废
+     * @return cmc设备报废集合
+     */
+    public List<CmcDeviceScrap> selectCmcDeviceScrapList(CmcDeviceScrap cmcDeviceScrap);
+
+    /**
+     * 新增cmc设备报废
+     * 
+     * @param cmcDeviceScrap cmc设备报废
+     * @return 结果
+     */
+    public int insertCmcDeviceScrap(CmcDeviceScrap cmcDeviceScrap);
+
+    /**
+     * 修改cmc设备报废
+     * 
+     * @param cmcDeviceScrap cmc设备报废
+     * @return 结果
+     */
+    public int updateCmcDeviceScrap(CmcDeviceScrap cmcDeviceScrap);
+
+    /**
+     * 删除cmc设备报废
+     * 
+     * @param deviceScrapId cmc设备报废主键
+     * @return 结果
+     */
+    public int deleteCmcDeviceScrapByDeviceScrapId(String deviceScrapId);
+
+    /**
+     * 批量删除cmc设备报废
+     * 
+     * @param deviceScrapIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcDeviceScrapByDeviceScrapIds(String[] deviceScrapIds);
+}

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

@@ -4,57 +4,57 @@ import java.util.List;
 import com.ruoyi.oa.domain.CmcDeviceExpense;
 
 /**
- * cmc仪器费用Service接口
+ * cmc设备费用Service接口
  * 
  * @author cmc
- * @date 2024-05-20
+ * @date 2024-05-21
  */
 public interface ICmcDeviceExpenseService 
 {
     /**
-     * 查询cmc仪器费用
+     * 查询cmc设备费用
      * 
-     * @param deviceExpenseId cmc仪器费用主键
-     * @return cmc仪器费用
+     * @param deviceExpenseId cmc设备费用主键
+     * @return cmc设备费用
      */
     public CmcDeviceExpense selectCmcDeviceExpenseByDeviceExpenseId(String deviceExpenseId);
 
     /**
-     * 查询cmc仪器费用列表
+     * 查询cmc设备费用列表
      * 
-     * @param cmcDeviceExpense cmc仪器费用
-     * @return cmc仪器费用集合
+     * @param cmcDeviceExpense cmc设备费用
+     * @return cmc设备费用集合
      */
     public List<CmcDeviceExpense> selectCmcDeviceExpenseList(CmcDeviceExpense cmcDeviceExpense);
 
     /**
-     * 新增cmc仪器费用
+     * 新增cmc设备费用
      * 
-     * @param cmcDeviceExpense cmc仪器费用
+     * @param cmcDeviceExpense cmc设备费用
      * @return 结果
      */
     public int insertCmcDeviceExpense(CmcDeviceExpense cmcDeviceExpense);
 
     /**
-     * 修改cmc仪器费用
+     * 修改cmc设备费用
      * 
-     * @param cmcDeviceExpense cmc仪器费用
+     * @param cmcDeviceExpense cmc设备费用
      * @return 结果
      */
     public int updateCmcDeviceExpense(CmcDeviceExpense cmcDeviceExpense);
 
     /**
-     * 批量删除cmc仪器费用
+     * 批量删除cmc设备费用
      * 
-     * @param deviceExpenseIds 需要删除的cmc仪器费用主键集合
+     * @param deviceExpenseIds 需要删除的cmc设备费用主键集合
      * @return 结果
      */
     public int deleteCmcDeviceExpenseByDeviceExpenseIds(String[] deviceExpenseIds);
 
     /**
-     * 删除cmc仪器费用信息
+     * 删除cmc设备费用信息
      * 
-     * @param deviceExpenseId cmc仪器费用主键
+     * @param deviceExpenseId cmc设备费用主键
      * @return 结果
      */
     public int deleteCmcDeviceExpenseByDeviceExpenseId(String deviceExpenseId);

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcDeviceHandover;
+
+/**
+ * cmc设备移交Service接口
+ * 
+ * @author cmc
+ * @date 2024-05-21
+ */
+public interface ICmcDeviceHandoverService 
+{
+    /**
+     * 查询cmc设备移交
+     * 
+     * @param deviceHandoverId cmc设备移交主键
+     * @return cmc设备移交
+     */
+    public CmcDeviceHandover selectCmcDeviceHandoverByDeviceHandoverId(String deviceHandoverId);
+
+    /**
+     * 查询cmc设备移交列表
+     * 
+     * @param cmcDeviceHandover cmc设备移交
+     * @return cmc设备移交集合
+     */
+    public List<CmcDeviceHandover> selectCmcDeviceHandoverList(CmcDeviceHandover cmcDeviceHandover);
+
+    /**
+     * 新增cmc设备移交
+     * 
+     * @param cmcDeviceHandover cmc设备移交
+     * @return 结果
+     */
+    public int insertCmcDeviceHandover(CmcDeviceHandover cmcDeviceHandover);
+
+    /**
+     * 修改cmc设备移交
+     * 
+     * @param cmcDeviceHandover cmc设备移交
+     * @return 结果
+     */
+    public int updateCmcDeviceHandover(CmcDeviceHandover cmcDeviceHandover);
+
+    /**
+     * 批量删除cmc设备移交
+     * 
+     * @param deviceHandoverIds 需要删除的cmc设备移交主键集合
+     * @return 结果
+     */
+    public int deleteCmcDeviceHandoverByDeviceHandoverIds(String[] deviceHandoverIds);
+
+    /**
+     * 删除cmc设备移交信息
+     * 
+     * @param deviceHandoverId cmc设备移交主键
+     * @return 结果
+     */
+    public int deleteCmcDeviceHandoverByDeviceHandoverId(String deviceHandoverId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcDeviceScrap;
+
+/**
+ * cmc设备报废Service接口
+ * 
+ * @author cmc
+ * @date 2024-05-21
+ */
+public interface ICmcDeviceScrapService 
+{
+    /**
+     * 查询cmc设备报废
+     * 
+     * @param deviceScrapId cmc设备报废主键
+     * @return cmc设备报废
+     */
+    public CmcDeviceScrap selectCmcDeviceScrapByDeviceScrapId(String deviceScrapId);
+
+    /**
+     * 查询cmc设备报废列表
+     * 
+     * @param cmcDeviceScrap cmc设备报废
+     * @return cmc设备报废集合
+     */
+    public List<CmcDeviceScrap> selectCmcDeviceScrapList(CmcDeviceScrap cmcDeviceScrap);
+
+    /**
+     * 新增cmc设备报废
+     * 
+     * @param cmcDeviceScrap cmc设备报废
+     * @return 结果
+     */
+    public int insertCmcDeviceScrap(CmcDeviceScrap cmcDeviceScrap);
+
+    /**
+     * 修改cmc设备报废
+     * 
+     * @param cmcDeviceScrap cmc设备报废
+     * @return 结果
+     */
+    public int updateCmcDeviceScrap(CmcDeviceScrap cmcDeviceScrap);
+
+    /**
+     * 批量删除cmc设备报废
+     * 
+     * @param deviceScrapIds 需要删除的cmc设备报废主键集合
+     * @return 结果
+     */
+    public int deleteCmcDeviceScrapByDeviceScrapIds(String[] deviceScrapIds);
+
+    /**
+     * 删除cmc设备报废信息
+     * 
+     * @param deviceScrapId cmc设备报废主键
+     * @return 结果
+     */
+    public int deleteCmcDeviceScrapByDeviceScrapId(String deviceScrapId);
+}

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

@@ -8,10 +8,10 @@ import com.ruoyi.oa.domain.CmcDeviceExpense;
 import com.ruoyi.oa.service.ICmcDeviceExpenseService;
 
 /**
- * cmc仪器费用Service业务层处理
+ * cmc设备费用Service业务层处理
  * 
  * @author cmc
- * @date 2024-05-20
+ * @date 2024-05-21
  */
 @Service
 public class CmcDeviceExpenseServiceImpl implements ICmcDeviceExpenseService 
@@ -20,10 +20,10 @@ public class CmcDeviceExpenseServiceImpl implements ICmcDeviceExpenseService
     private CmcDeviceExpenseMapper cmcDeviceExpenseMapper;
 
     /**
-     * 查询cmc仪器费用
+     * 查询cmc设备费用
      * 
-     * @param deviceExpenseId cmc仪器费用主键
-     * @return cmc仪器费用
+     * @param deviceExpenseId cmc设备费用主键
+     * @return cmc设备费用
      */
     @Override
     public CmcDeviceExpense selectCmcDeviceExpenseByDeviceExpenseId(String deviceExpenseId)
@@ -32,10 +32,10 @@ public class CmcDeviceExpenseServiceImpl implements ICmcDeviceExpenseService
     }
 
     /**
-     * 查询cmc仪器费用列表
+     * 查询cmc设备费用列表
      * 
-     * @param cmcDeviceExpense cmc仪器费用
-     * @return cmc仪器费用
+     * @param cmcDeviceExpense cmc设备费用
+     * @return cmc设备费用
      */
     @Override
     public List<CmcDeviceExpense> selectCmcDeviceExpenseList(CmcDeviceExpense cmcDeviceExpense)
@@ -44,9 +44,9 @@ public class CmcDeviceExpenseServiceImpl implements ICmcDeviceExpenseService
     }
 
     /**
-     * 新增cmc仪器费用
+     * 新增cmc设备费用
      * 
-     * @param cmcDeviceExpense cmc仪器费用
+     * @param cmcDeviceExpense cmc设备费用
      * @return 结果
      */
     @Override
@@ -56,9 +56,9 @@ public class CmcDeviceExpenseServiceImpl implements ICmcDeviceExpenseService
     }
 
     /**
-     * 修改cmc仪器费用
+     * 修改cmc设备费用
      * 
-     * @param cmcDeviceExpense cmc仪器费用
+     * @param cmcDeviceExpense cmc设备费用
      * @return 结果
      */
     @Override
@@ -68,9 +68,9 @@ public class CmcDeviceExpenseServiceImpl implements ICmcDeviceExpenseService
     }
 
     /**
-     * 批量删除cmc仪器费用
+     * 批量删除cmc设备费用
      * 
-     * @param deviceExpenseIds 需要删除的cmc仪器费用主键
+     * @param deviceExpenseIds 需要删除的cmc设备费用主键
      * @return 结果
      */
     @Override
@@ -80,9 +80,9 @@ public class CmcDeviceExpenseServiceImpl implements ICmcDeviceExpenseService
     }
 
     /**
-     * 删除cmc仪器费用信息
+     * 删除cmc设备费用信息
      * 
-     * @param deviceExpenseId cmc仪器费用主键
+     * @param deviceExpenseId cmc设备费用主键
      * @return 结果
      */
     @Override

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcDeviceHandoverServiceImpl.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.CmcDeviceHandoverMapper;
+import com.ruoyi.oa.domain.CmcDeviceHandover;
+import com.ruoyi.oa.service.ICmcDeviceHandoverService;
+
+/**
+ * cmc设备移交Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-05-21
+ */
+@Service
+public class CmcDeviceHandoverServiceImpl implements ICmcDeviceHandoverService 
+{
+    @Autowired
+    private CmcDeviceHandoverMapper cmcDeviceHandoverMapper;
+
+    /**
+     * 查询cmc设备移交
+     * 
+     * @param deviceHandoverId cmc设备移交主键
+     * @return cmc设备移交
+     */
+    @Override
+    public CmcDeviceHandover selectCmcDeviceHandoverByDeviceHandoverId(String deviceHandoverId)
+    {
+        return cmcDeviceHandoverMapper.selectCmcDeviceHandoverByDeviceHandoverId(deviceHandoverId);
+    }
+
+    /**
+     * 查询cmc设备移交列表
+     * 
+     * @param cmcDeviceHandover cmc设备移交
+     * @return cmc设备移交
+     */
+    @Override
+    public List<CmcDeviceHandover> selectCmcDeviceHandoverList(CmcDeviceHandover cmcDeviceHandover)
+    {
+        return cmcDeviceHandoverMapper.selectCmcDeviceHandoverList(cmcDeviceHandover);
+    }
+
+    /**
+     * 新增cmc设备移交
+     * 
+     * @param cmcDeviceHandover cmc设备移交
+     * @return 结果
+     */
+    @Override
+    public int insertCmcDeviceHandover(CmcDeviceHandover cmcDeviceHandover)
+    {
+        return cmcDeviceHandoverMapper.insertCmcDeviceHandover(cmcDeviceHandover);
+    }
+
+    /**
+     * 修改cmc设备移交
+     * 
+     * @param cmcDeviceHandover cmc设备移交
+     * @return 结果
+     */
+    @Override
+    public int updateCmcDeviceHandover(CmcDeviceHandover cmcDeviceHandover)
+    {
+        return cmcDeviceHandoverMapper.updateCmcDeviceHandover(cmcDeviceHandover);
+    }
+
+    /**
+     * 批量删除cmc设备移交
+     * 
+     * @param deviceHandoverIds 需要删除的cmc设备移交主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcDeviceHandoverByDeviceHandoverIds(String[] deviceHandoverIds)
+    {
+        return cmcDeviceHandoverMapper.deleteCmcDeviceHandoverByDeviceHandoverIds(deviceHandoverIds);
+    }
+
+    /**
+     * 删除cmc设备移交信息
+     * 
+     * @param deviceHandoverId cmc设备移交主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcDeviceHandoverByDeviceHandoverId(String deviceHandoverId)
+    {
+        return cmcDeviceHandoverMapper.deleteCmcDeviceHandoverByDeviceHandoverId(deviceHandoverId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcDeviceScrapServiceImpl.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.CmcDeviceScrapMapper;
+import com.ruoyi.oa.domain.CmcDeviceScrap;
+import com.ruoyi.oa.service.ICmcDeviceScrapService;
+
+/**
+ * cmc设备报废Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-05-21
+ */
+@Service
+public class CmcDeviceScrapServiceImpl implements ICmcDeviceScrapService 
+{
+    @Autowired
+    private CmcDeviceScrapMapper cmcDeviceScrapMapper;
+
+    /**
+     * 查询cmc设备报废
+     * 
+     * @param deviceScrapId cmc设备报废主键
+     * @return cmc设备报废
+     */
+    @Override
+    public CmcDeviceScrap selectCmcDeviceScrapByDeviceScrapId(String deviceScrapId)
+    {
+        return cmcDeviceScrapMapper.selectCmcDeviceScrapByDeviceScrapId(deviceScrapId);
+    }
+
+    /**
+     * 查询cmc设备报废列表
+     * 
+     * @param cmcDeviceScrap cmc设备报废
+     * @return cmc设备报废
+     */
+    @Override
+    public List<CmcDeviceScrap> selectCmcDeviceScrapList(CmcDeviceScrap cmcDeviceScrap)
+    {
+        return cmcDeviceScrapMapper.selectCmcDeviceScrapList(cmcDeviceScrap);
+    }
+
+    /**
+     * 新增cmc设备报废
+     * 
+     * @param cmcDeviceScrap cmc设备报废
+     * @return 结果
+     */
+    @Override
+    public int insertCmcDeviceScrap(CmcDeviceScrap cmcDeviceScrap)
+    {
+        return cmcDeviceScrapMapper.insertCmcDeviceScrap(cmcDeviceScrap);
+    }
+
+    /**
+     * 修改cmc设备报废
+     * 
+     * @param cmcDeviceScrap cmc设备报废
+     * @return 结果
+     */
+    @Override
+    public int updateCmcDeviceScrap(CmcDeviceScrap cmcDeviceScrap)
+    {
+        return cmcDeviceScrapMapper.updateCmcDeviceScrap(cmcDeviceScrap);
+    }
+
+    /**
+     * 批量删除cmc设备报废
+     * 
+     * @param deviceScrapIds 需要删除的cmc设备报废主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcDeviceScrapByDeviceScrapIds(String[] deviceScrapIds)
+    {
+        return cmcDeviceScrapMapper.deleteCmcDeviceScrapByDeviceScrapIds(deviceScrapIds);
+    }
+
+    /**
+     * 删除cmc设备报废信息
+     * 
+     * @param deviceScrapId cmc设备报废主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcDeviceScrapByDeviceScrapId(String deviceScrapId)
+    {
+        return cmcDeviceScrapMapper.deleteCmcDeviceScrapByDeviceScrapId(deviceScrapId);
+    }
+}

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

@@ -7,24 +7,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcDeviceExpense" id="CmcDeviceExpenseResult">
         <result property="deviceExpenseId"    column="device_expense_id"    />
         <result property="deviceId"    column="device_id"    />
+        <result property="userId"    column="user_id"    />
         <result property="expenseType"    column="expense_type"    />
         <result property="expense"    column="expense"    />
         <result property="occurDate"    column="occur_date"    />
-        <result property="document"    column="document"    />
         <result property="remark"    column="remark"    />
+        <result property="document"    column="document"    />
     </resultMap>
 
     <sql id="selectCmcDeviceExpenseVo">
-        select device_expense_id, device_id, expense_type, expense, occur_date, document, remark from cmc_device_expense
+        select device_expense_id, device_id, user_id, expense_type, expense, occur_date, remark, document from cmc_device_expense
     </sql>
 
     <select id="selectCmcDeviceExpenseList" parameterType="CmcDeviceExpense" resultMap="CmcDeviceExpenseResult">
         <include refid="selectCmcDeviceExpenseVo"/>
         <where>  
             <if test="deviceId != null "> and device_id = #{deviceId}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
             <if test="expenseType != null  and expenseType != ''"> and expense_type = #{expenseType}</if>
             <if test="expense != null "> and expense = #{expense}</if>
             <if test="occurDate != null "> and occur_date = #{occurDate}</if>
+            <if test="document != null  and document != ''"> and document = #{document}</if>
         </where>
     </select>
     
@@ -38,20 +41,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deviceExpenseId != null">device_expense_id,</if>
             <if test="deviceId != null">device_id,</if>
+            <if test="userId != null">user_id,</if>
             <if test="expenseType != null">expense_type,</if>
             <if test="expense != null">expense,</if>
             <if test="occurDate != null">occur_date,</if>
-            <if test="document != null">document,</if>
             <if test="remark != null">remark,</if>
+            <if test="document != null">document,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceExpenseId != null">#{deviceExpenseId},</if>
             <if test="deviceId != null">#{deviceId},</if>
+            <if test="userId != null">#{userId},</if>
             <if test="expenseType != null">#{expenseType},</if>
             <if test="expense != null">#{expense},</if>
             <if test="occurDate != null">#{occurDate},</if>
-            <if test="document != null">#{document},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="document != null">#{document},</if>
          </trim>
     </insert>
 
@@ -59,11 +64,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update cmc_device_expense
         <trim prefix="SET" suffixOverrides=",">
             <if test="deviceId != null">device_id = #{deviceId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
             <if test="expenseType != null">expense_type = #{expenseType},</if>
             <if test="expense != null">expense = #{expense},</if>
             <if test="occurDate != null">occur_date = #{occurDate},</if>
-            <if test="document != null">document = #{document},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="document != null">document = #{document},</if>
         </trim>
         where device_expense_id = #{deviceExpenseId}
     </update>

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

@@ -0,0 +1,97 @@
+<?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.CmcDeviceHandoverMapper">
+    
+    <resultMap type="CmcDeviceHandover" id="CmcDeviceHandoverResult">
+        <result property="deviceHandoverId"    column="device_handover_id"    />
+        <result property="deviceId"    column="device_id"    />
+        <result property="handoverDept"    column="handover_dept"    />
+        <result property="handoverUser"    column="handover_user"    />
+        <result property="handoverDate"    column="handover_date"    />
+        <result property="receiveDept"    column="receive_dept"    />
+        <result property="receiveUser"    column="receive_user"    />
+        <result property="description"    column="description"    />
+        <result property="reason"    column="reason"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectCmcDeviceHandoverVo">
+        select device_handover_id, device_id, handover_dept, handover_user, handover_date, receive_dept, receive_user, description, reason, remark from cmc_device_handover
+    </sql>
+
+    <select id="selectCmcDeviceHandoverList" parameterType="CmcDeviceHandover" resultMap="CmcDeviceHandoverResult">
+        <include refid="selectCmcDeviceHandoverVo"/>
+        <where>  
+            <if test="deviceId != null "> and device_id = #{deviceId}</if>
+            <if test="handoverDept != null "> and handover_dept = #{handoverDept}</if>
+            <if test="handoverUser != null "> and handover_user = #{handoverUser}</if>
+            <if test="handoverDate != null "> and handover_date = #{handoverDate}</if>
+            <if test="receiveDept != null "> and receive_dept = #{receiveDept}</if>
+            <if test="receiveUser != null "> and receive_user = #{receiveUser}</if>
+            <if test="description != null  and description != ''"> and description = #{description}</if>
+            <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcDeviceHandoverByDeviceHandoverId" parameterType="String" resultMap="CmcDeviceHandoverResult">
+        <include refid="selectCmcDeviceHandoverVo"/>
+        where device_handover_id = #{deviceHandoverId}
+    </select>
+        
+    <insert id="insertCmcDeviceHandover" parameterType="CmcDeviceHandover">
+        insert into cmc_device_handover
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deviceHandoverId != null">device_handover_id,</if>
+            <if test="deviceId != null">device_id,</if>
+            <if test="handoverDept != null">handover_dept,</if>
+            <if test="handoverUser != null">handover_user,</if>
+            <if test="handoverDate != null">handover_date,</if>
+            <if test="receiveDept != null">receive_dept,</if>
+            <if test="receiveUser != null">receive_user,</if>
+            <if test="description != null">description,</if>
+            <if test="reason != null">reason,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deviceHandoverId != null">#{deviceHandoverId},</if>
+            <if test="deviceId != null">#{deviceId},</if>
+            <if test="handoverDept != null">#{handoverDept},</if>
+            <if test="handoverUser != null">#{handoverUser},</if>
+            <if test="handoverDate != null">#{handoverDate},</if>
+            <if test="receiveDept != null">#{receiveDept},</if>
+            <if test="receiveUser != null">#{receiveUser},</if>
+            <if test="description != null">#{description},</if>
+            <if test="reason != null">#{reason},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcDeviceHandover" parameterType="CmcDeviceHandover">
+        update cmc_device_handover
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceId != null">device_id = #{deviceId},</if>
+            <if test="handoverDept != null">handover_dept = #{handoverDept},</if>
+            <if test="handoverUser != null">handover_user = #{handoverUser},</if>
+            <if test="handoverDate != null">handover_date = #{handoverDate},</if>
+            <if test="receiveDept != null">receive_dept = #{receiveDept},</if>
+            <if test="receiveUser != null">receive_user = #{receiveUser},</if>
+            <if test="description != null">description = #{description},</if>
+            <if test="reason != null">reason = #{reason},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where device_handover_id = #{deviceHandoverId}
+    </update>
+
+    <delete id="deleteCmcDeviceHandoverByDeviceHandoverId" parameterType="String">
+        delete from cmc_device_handover where device_handover_id = #{deviceHandoverId}
+    </delete>
+
+    <delete id="deleteCmcDeviceHandoverByDeviceHandoverIds" parameterType="String">
+        delete from cmc_device_handover where device_handover_id in 
+        <foreach item="deviceHandoverId" collection="array" open="(" separator="," close=")">
+            #{deviceHandoverId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,87 @@
+<?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.CmcDeviceScrapMapper">
+    
+    <resultMap type="CmcDeviceScrap" id="CmcDeviceScrapResult">
+        <result property="deviceScrapId"    column="device_scrap_id"    />
+        <result property="deviceId"    column="device_id"    />
+        <result property="cost"    column="cost"    />
+        <result property="scrapDate"    column="scrap_date"    />
+        <result property="reason"    column="reason"    />
+        <result property="deal"    column="deal"    />
+        <result property="remark"    column="remark"    />
+        <result property="document"    column="document"    />
+    </resultMap>
+
+    <sql id="selectCmcDeviceScrapVo">
+        select device_scrap_id, device_id, cost, scrap_date, reason, deal, remark, document from cmc_device_scrap
+    </sql>
+
+    <select id="selectCmcDeviceScrapList" parameterType="CmcDeviceScrap" resultMap="CmcDeviceScrapResult">
+        <include refid="selectCmcDeviceScrapVo"/>
+        <where>  
+            <if test="deviceId != null "> and device_id = #{deviceId}</if>
+            <if test="cost != null "> and cost = #{cost}</if>
+            <if test="scrapDate != null "> and scrap_date = #{scrapDate}</if>
+            <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
+            <if test="deal != null  and deal != ''"> and deal = #{deal}</if>
+            <if test="document != null  and document != ''"> and document = #{document}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcDeviceScrapByDeviceScrapId" parameterType="String" resultMap="CmcDeviceScrapResult">
+        <include refid="selectCmcDeviceScrapVo"/>
+        where device_scrap_id = #{deviceScrapId}
+    </select>
+        
+    <insert id="insertCmcDeviceScrap" parameterType="CmcDeviceScrap">
+        insert into cmc_device_scrap
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deviceScrapId != null">device_scrap_id,</if>
+            <if test="deviceId != null">device_id,</if>
+            <if test="cost != null">cost,</if>
+            <if test="scrapDate != null">scrap_date,</if>
+            <if test="reason != null">reason,</if>
+            <if test="deal != null">deal,</if>
+            <if test="remark != null">remark,</if>
+            <if test="document != null">document,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deviceScrapId != null">#{deviceScrapId},</if>
+            <if test="deviceId != null">#{deviceId},</if>
+            <if test="cost != null">#{cost},</if>
+            <if test="scrapDate != null">#{scrapDate},</if>
+            <if test="reason != null">#{reason},</if>
+            <if test="deal != null">#{deal},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="document != null">#{document},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcDeviceScrap" parameterType="CmcDeviceScrap">
+        update cmc_device_scrap
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceId != null">device_id = #{deviceId},</if>
+            <if test="cost != null">cost = #{cost},</if>
+            <if test="scrapDate != null">scrap_date = #{scrapDate},</if>
+            <if test="reason != null">reason = #{reason},</if>
+            <if test="deal != null">deal = #{deal},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="document != null">document = #{document},</if>
+        </trim>
+        where device_scrap_id = #{deviceScrapId}
+    </update>
+
+    <delete id="deleteCmcDeviceScrapByDeviceScrapId" parameterType="String">
+        delete from cmc_device_scrap where device_scrap_id = #{deviceScrapId}
+    </delete>
+
+    <delete id="deleteCmcDeviceScrapByDeviceScrapIds" parameterType="String">
+        delete from cmc_device_scrap where device_scrap_id in 
+        <foreach item="deviceScrapId" collection="array" open="(" separator="," close=")">
+            #{deviceScrapId}
+        </foreach>
+    </delete>
+</mapper>

oa-back/sql/sql.sql

@@ -6185,6 +6185,28 @@ INSERT INTO `cmc_device` VALUES (596, 'Z023', NULL, '办公桌', '办公设备',
 INSERT INTO `cmc_device` VALUES (597, 'Z024', NULL, '办公桌', '办公设备', NULL, 0.00, NULL, NULL, NULL, NULL, 'C304A', '', 114);
 INSERT INTO `cmc_device` VALUES (598, 'ZLJ01', NULL, '制冷机', '办公设备', NULL, 0.00, NULL, NULL, '骆驼', NULL, 'C301会议室', '', 104);
 
+-- ----------------------------
+-- 28、cmc设备移交表
+-- ----------------------------
+drop table if exists `cmc_device_handover`;
+create table `cmc_device_handover`  (
+  `device_handover_id`	char(19)		not null 		comment '设备移交id',
+  `device_id` 			int 			default null 	comment '设备id',
+  `handover_dept` 		bigint 			default null 	comment '移交部门id',
+  `handover_user` 		bigint 			default null 	comment '移交人id',
+  `handover_date`		date			default null 	comment '移交日期',
+  `receive_dept` 		bigint 			default null 	comment '接收部门id',
+  `receive_user` 		bigint 			default null 	comment '接收人id',
+  `description`			varchar(255)	default null 	comment '设备软件说明',
+  `reason`				varchar(255)	default null 	comment '交接原因',
+  `remark`				varchar(255)	default null 	comment '备注',
+  primary key (`device_handover_id`)
+) engine = innodb comment = 'cmc设备移交表';
+
+-- ----------------------------
+-- 初始化-设备移交表数据
+-- ----------------------------
+
 -- ----------------------------
 -- 29、cmc设备审批表
 -- ----------------------------
@@ -9409,38 +9431,40 @@ INSERT INTO `cmc_price_remark` VALUES (21, '内业-三维模型', '⑴根据内
 INSERT INTO `cmc_price_remark` VALUES (22, '内业-坐标转换', '⑴坐标转换、电子沙盘制作，按工作前核准的内业工天结算。');
 
 -- ----------------------------
+-- 62、cmc设备费用表
 -- ----------------------------
 drop table if exists `cmc_device_expense`;
 create table `cmc_device_expense`  (
-  `device_expense_id`	char(19)		not null 		comment '仪器费用id',
-  `device_id` 			int 			default null 	comment '仪器id',
+  `device_expense_id`	char(19)		not null 		comment '设备费用id',
+  `device_id` 			int 			default null 	comment '设备id',
+  `user_id` 			bigint 			default null 	comment '负责人id',
   `expense_type`		char(1) 		default null 	comment '费用类型（0检定费、1维修保养费）',
   `expense`				decimal(10, 2) 	default null 	comment '费用金额',
   `occur_date`			date			default null 	comment '发生日期',
   `remark`				varchar(255)	default null 	comment '备注',
   `document`			varchar(255)	default null 	comment '附件',
   primary key (`device_expense_id`)
-) engine = innodb comment = 'cmc仪器费用表';
+) engine = innodb comment = 'cmc设备费用表';
 
 -- ----------------------------
 -- 初始化-仪器费用表数据
 -- ----------------------------
 
 -- ----------------------------
+-- 63、cmc设备报废表
 -- ----------------------------
-drop table if exists `cmc_device_expense`;
-create table `cmc_device_expense`  (
-  `device_expense_id`	char(19)		not null 		comment '仪器费用id',
-  `device_id` 			int 			default null 	comment '仪器id',
-  `expense_type`		char(1) 		default null 	comment '费用类型（0检定费、1维修保养费）',
-  `expense`				decimal(10, 2) 	default null 	comment '费用金额',
-  `occur_date`			date			default null 	comment '发生日期',
+drop table if exists `cmc_device_scrap`;
+create table `cmc_device_scrap`  (
+  `device_scrap_id`		char(19)		not null 		comment '设备报废id',
+  `device_id` 			int 			default null 	comment '设备id',
+  `cost`				decimal(10, 2) 	default null 	comment '原价值',
+  `scrap_date`			date			default null 	comment '报废日期',
+  `reason`				varchar(255)	default null 	comment '报废原因',
+  `deal`				varchar(255)	default null 	comment '处理结果',
   `remark`				varchar(255)	default null 	comment '备注',
   `document`			varchar(255)	default null 	comment '附件',
-  primary key (`device_expense_id`)
-) engine = innodb comment = 'cmc仪器报废表';
+  primary key (`device_scrap_id`)
+) engine = innodb comment = 'cmc设备报废表';
 
 -- ----------------------------
 -- 初始化-仪器报废表数据

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

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询cmc仪器费用列表
+// 查询cmc设备费用列表
 export function listDeviceExpense(query) {
   return request({
     url: '/oa/deviceExpense/list',
@@ -9,7 +9,7 @@ export function listDeviceExpense(query) {
   })
 }
 
-// 查询cmc仪器费用详细
+// 查询cmc设备费用详细
 export function getDeviceExpense(deviceExpenseId) {
   return request({
     url: '/oa/deviceExpense/' + deviceExpenseId,
@@ -17,7 +17,7 @@ export function getDeviceExpense(deviceExpenseId) {
   })
 }
 
-// 新增cmc仪器费用
+// 新增cmc设备费用
 export function addDeviceExpense(data) {
   return request({
     url: '/oa/deviceExpense',
@@ -26,7 +26,7 @@ export function addDeviceExpense(data) {
   })
 }
 
-// 修改cmc仪器费用
+// 修改cmc设备费用
 export function updateDeviceExpense(data) {
   return request({
     url: '/oa/deviceExpense',
@@ -35,7 +35,7 @@ export function updateDeviceExpense(data) {
   })
 }
 
-// 删除cmc仪器费用
+// 删除cmc设备费用
 export function delDeviceExpense(deviceExpenseId) {
   return request({
     url: '/oa/deviceExpense/' + deviceExpenseId,

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc设备移交列表
+export function listDeviceHandover(query) {
+  return request({
+    url: '/oa/deviceHandover/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc设备移交详细
+export function getDeviceHandover(deviceHandoverId) {
+  return request({
+    url: '/oa/deviceHandover/' + deviceHandoverId,
+    method: 'get'
+  })
+}
+
+// 新增cmc设备移交
+export function addDeviceHandover(data) {
+  return request({
+    url: '/oa/deviceHandover',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc设备移交
+export function updateDeviceHandover(data) {
+  return request({
+    url: '/oa/deviceHandover',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc设备移交
+export function delDeviceHandover(deviceHandoverId) {
+  return request({
+    url: '/oa/deviceHandover/' + deviceHandoverId,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc设备报废列表
+export function listDeviceScrap(query) {
+  return request({
+    url: '/oa/deviceScrap/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc设备报废详细
+export function getDeviceScrap(deviceScrapId) {
+  return request({
+    url: '/oa/deviceScrap/' + deviceScrapId,
+    method: 'get'
+  })
+}
+
+// 新增cmc设备报废
+export function addDeviceScrap(data) {
+  return request({
+    url: '/oa/deviceScrap',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc设备报废
+export function updateDeviceScrap(data) {
+  return request({
+    url: '/oa/deviceScrap',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc设备报废
+export function delDeviceScrap(deviceScrapId) {
+  return request({
+    url: '/oa/deviceScrap/' + deviceScrapId,
+    method: 'delete'
+  })
+}