重置密码；耗材前后端

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcMaterialBuyController.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.CmcMaterialBuy;
+import com.ruoyi.oa.service.ICmcMaterialBuyService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc耗材购买Controller
+ * 
+ * @author cmc
+ * @date 2024-07-31
+ */
+@RestController
+@RequestMapping("/oa/materialBuy")
+public class CmcMaterialBuyController extends BaseController
+{
+    @Autowired
+    private ICmcMaterialBuyService cmcMaterialBuyService;
+
+    /**
+     * 查询cmc耗材购买列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcMaterialBuy cmcMaterialBuy)
+    {
+        startPage();
+        List<CmcMaterialBuy> list = cmcMaterialBuyService.selectCmcMaterialBuyList(cmcMaterialBuy);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc耗材购买列表
+     */
+    @Log(title = "cmc耗材购买", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcMaterialBuy cmcMaterialBuy)
+    {
+        List<CmcMaterialBuy> list = cmcMaterialBuyService.selectCmcMaterialBuyList(cmcMaterialBuy);
+        ExcelUtil<CmcMaterialBuy> util = new ExcelUtil<CmcMaterialBuy>(CmcMaterialBuy.class);
+        util.exportExcel(response, list, "cmc耗材购买数据");
+    }
+
+    /**
+     * 获取cmc耗材购买详细信息
+     */
+    @GetMapping(value = "/{buyId}")
+    public AjaxResult getInfo(@PathVariable("buyId") Integer buyId)
+    {
+        return success(cmcMaterialBuyService.selectCmcMaterialBuyByBuyId(buyId));
+    }
+
+    /**
+     * 新增cmc耗材购买
+     */
+    @Log(title = "cmc耗材购买", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcMaterialBuy cmcMaterialBuy)
+    {
+        return toAjax(cmcMaterialBuyService.insertCmcMaterialBuy(cmcMaterialBuy));
+    }
+
+    /**
+     * 修改cmc耗材购买
+     */
+    @Log(title = "cmc耗材购买", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcMaterialBuy cmcMaterialBuy)
+    {
+        return toAjax(cmcMaterialBuyService.updateCmcMaterialBuy(cmcMaterialBuy));
+    }
+
+    /**
+     * 删除cmc耗材购买
+     */
+    @Log(title = "cmc耗材购买", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{buyIds}")
+    public AjaxResult remove(@PathVariable Integer[] buyIds)
+    {
+        return toAjax(cmcMaterialBuyService.deleteCmcMaterialBuyByBuyIds(buyIds));
+    }
+}

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcMaterialController.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.CmcMaterial;
+import com.ruoyi.oa.service.ICmcMaterialService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc耗材信息Controller
+ * 
+ * @author cmc
+ * @date 2024-07-31
+ */
+@RestController
+@RequestMapping("/oa/material")
+public class CmcMaterialController extends BaseController
+{
+    @Autowired
+    private ICmcMaterialService cmcMaterialService;
+
+    /**
+     * 查询cmc耗材信息列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcMaterial cmcMaterial)
+    {
+        startPage();
+        List<CmcMaterial> list = cmcMaterialService.selectCmcMaterialList(cmcMaterial);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc耗材信息列表
+     */
+    @Log(title = "cmc耗材信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcMaterial cmcMaterial)
+    {
+        List<CmcMaterial> list = cmcMaterialService.selectCmcMaterialList(cmcMaterial);
+        ExcelUtil<CmcMaterial> util = new ExcelUtil<CmcMaterial>(CmcMaterial.class);
+        util.exportExcel(response, list, "cmc耗材信息数据");
+    }
+
+    /**
+     * 获取cmc耗材信息详细信息
+     */
+    @GetMapping(value = "/{materialId}")
+    public AjaxResult getInfo(@PathVariable("materialId") Integer materialId)
+    {
+        return success(cmcMaterialService.selectCmcMaterialByMaterialId(materialId));
+    }
+
+    /**
+     * 新增cmc耗材信息
+     */
+    @Log(title = "cmc耗材信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcMaterial cmcMaterial)
+    {
+        return toAjax(cmcMaterialService.insertCmcMaterial(cmcMaterial));
+    }
+
+    /**
+     * 修改cmc耗材信息
+     */
+    @Log(title = "cmc耗材信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcMaterial cmcMaterial)
+    {
+        return toAjax(cmcMaterialService.updateCmcMaterial(cmcMaterial));
+    }
+
+    /**
+     * 删除cmc耗材信息
+     */
+    @Log(title = "cmc耗材信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{materialIds}")
+    public AjaxResult remove(@PathVariable Integer[] materialIds)
+    {
+        return toAjax(cmcMaterialService.deleteCmcMaterialByMaterialIds(materialIds));
+    }
+}

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcMaterialGiveController.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.CmcMaterialGive;
+import com.ruoyi.oa.service.ICmcMaterialGiveService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc耗材发放Controller
+ * 
+ * @author cmc
+ * @date 2024-07-31
+ */
+@RestController
+@RequestMapping("/oa/materialGive")
+public class CmcMaterialGiveController extends BaseController
+{
+    @Autowired
+    private ICmcMaterialGiveService cmcMaterialGiveService;
+
+    /**
+     * 查询cmc耗材发放列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcMaterialGive cmcMaterialGive)
+    {
+        startPage();
+        List<CmcMaterialGive> list = cmcMaterialGiveService.selectCmcMaterialGiveList(cmcMaterialGive);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc耗材发放列表
+     */
+    @Log(title = "cmc耗材发放", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcMaterialGive cmcMaterialGive)
+    {
+        List<CmcMaterialGive> list = cmcMaterialGiveService.selectCmcMaterialGiveList(cmcMaterialGive);
+        ExcelUtil<CmcMaterialGive> util = new ExcelUtil<CmcMaterialGive>(CmcMaterialGive.class);
+        util.exportExcel(response, list, "cmc耗材发放数据");
+    }
+
+    /**
+     * 获取cmc耗材发放详细信息
+     */
+    @GetMapping(value = "/{giveId}")
+    public AjaxResult getInfo(@PathVariable("giveId") Integer giveId)
+    {
+        return success(cmcMaterialGiveService.selectCmcMaterialGiveByGiveId(giveId));
+    }
+
+    /**
+     * 新增cmc耗材发放
+     */
+    @Log(title = "cmc耗材发放", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcMaterialGive cmcMaterialGive)
+    {
+        return toAjax(cmcMaterialGiveService.insertCmcMaterialGive(cmcMaterialGive));
+    }
+
+    /**
+     * 修改cmc耗材发放
+     */
+    @Log(title = "cmc耗材发放", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcMaterialGive cmcMaterialGive)
+    {
+        return toAjax(cmcMaterialGiveService.updateCmcMaterialGive(cmcMaterialGive));
+    }
+
+    /**
+     * 删除cmc耗材发放
+     */
+    @Log(title = "cmc耗材发放", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{giveIds}")
+    public AjaxResult remove(@PathVariable Integer[] giveIds)
+    {
+        return toAjax(cmcMaterialGiveService.deleteCmcMaterialGiveByGiveIds(giveIds));
+    }
+}

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

@@ -307,7 +307,7 @@ public class SysUserController extends BaseController
         for (SysUser user : userService.selectUserList(new SysUser())) {
             if (user.getUserId() > 1) {
                 user.setPassword(SecurityUtils.encryptPassword(user.getIdCard().substring(12,18)));
-                userService.updateUser(user);
+                userService.resetPwd(user);
             }
         }
         return toAjax(userService.selectUserList(new SysUser()).size() - 15);
@@ -390,7 +390,10 @@ public class SysUserController extends BaseController
     {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
-        user.setPassword(SecurityUtils.encryptPassword(user.getIdCard().substring(12,18)));
+        if (user.getPassword() == null)
+            user.setPassword(SecurityUtils.encryptPassword(user.getIdCard().substring(12,18)));
+        else
+            user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         user.setUpdateBy(getUsername());
         return toAjax(userService.resetPwd(user));
     }

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

@@ -0,0 +1,136 @@
+package com.ruoyi.oa.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * cmc耗材信息对象 cmc_material
+ * 
+ * @author cmc
+ * @date 2024-07-31
+ */
+public class CmcMaterial extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 耗材id */
+    private Integer materialId;
+
+    /** 耗材名称 */
+    @Excel(name = "耗材名称")
+    private String name;
+
+    /** 耗材类别 */
+    @Excel(name = "耗材类别")
+    private String type;
+
+    /** 规格型号 */
+    @Excel(name = "规格型号")
+    private String series;
+
+    /** 耗材品牌 */
+    @Excel(name = "耗材品牌")
+    private String brand;
+
+    /** 存放地点 */
+    @Excel(name = "存放地点")
+    private String place;
+
+    /** 剩余数量 */
+    @Excel(name = "剩余数量")
+    private Double remain;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    public void setMaterialId(Integer materialId) 
+    {
+        this.materialId = materialId;
+    }
+
+    public Integer getMaterialId() 
+    {
+        return materialId;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setSeries(String series) 
+    {
+        this.series = series;
+    }
+
+    public String getSeries() 
+    {
+        return series;
+    }
+    public void setBrand(String brand) 
+    {
+        this.brand = brand;
+    }
+
+    public String getBrand() 
+    {
+        return brand;
+    }
+    public void setPlace(String place) 
+    {
+        this.place = place;
+    }
+
+    public String getPlace() 
+    {
+        return place;
+    }
+    public void setRemain(Double remain) 
+    {
+        this.remain = remain;
+    }
+
+    public Double getRemain() 
+    {
+        return remain;
+    }
+    public void setUnit(String unit) 
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit() 
+    {
+        return unit;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("materialId", getMaterialId())
+            .append("name", getName())
+            .append("type", getType())
+            .append("series", getSeries())
+            .append("brand", getBrand())
+            .append("place", getPlace())
+            .append("remain", getRemain())
+            .append("unit", getUnit())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,140 @@
+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_material_buy
+ * 
+ * @author cmc
+ * @date 2024-07-31
+ */
+public class CmcMaterialBuy extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 耗材购买id */
+    private Integer buyId;
+
+    /** 耗材id */
+    @Excel(name = "耗材id")
+    private Integer materialId;
+
+    /** 采购日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "采购日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date buyTime;
+
+    /** 采购地点 */
+    @Excel(name = "采购地点")
+    private String place;
+
+    /** 采购数量 */
+    @Excel(name = "采购数量")
+    private Double totalNum;
+
+    /** 单价 */
+    @Excel(name = "单价")
+    private BigDecimal price;
+
+    /** 总价 */
+    @Excel(name = "总价")
+    private BigDecimal amount;
+
+    /** 采购人 */
+    @Excel(name = "采购人")
+    private Long buyer;
+
+    public void setBuyId(Integer buyId) 
+    {
+        this.buyId = buyId;
+    }
+
+    public Integer getBuyId() 
+    {
+        return buyId;
+    }
+    public void setMaterialId(Integer materialId) 
+    {
+        this.materialId = materialId;
+    }
+
+    public Integer getMaterialId() 
+    {
+        return materialId;
+    }
+    public void setBuyTime(Date buyTime) 
+    {
+        this.buyTime = buyTime;
+    }
+
+    public Date getBuyTime() 
+    {
+        return buyTime;
+    }
+    public void setPlace(String place) 
+    {
+        this.place = place;
+    }
+
+    public String getPlace() 
+    {
+        return place;
+    }
+    public void setTotalNum(Double totalNum) 
+    {
+        this.totalNum = totalNum;
+    }
+
+    public Double getTotalNum() 
+    {
+        return totalNum;
+    }
+    public void setPrice(BigDecimal price) 
+    {
+        this.price = price;
+    }
+
+    public BigDecimal getPrice() 
+    {
+        return price;
+    }
+    public void setAmount(BigDecimal amount) 
+    {
+        this.amount = amount;
+    }
+
+    public BigDecimal getAmount() 
+    {
+        return amount;
+    }
+    public void setBuyer(Long buyer) 
+    {
+        this.buyer = buyer;
+    }
+
+    public Long getBuyer() 
+    {
+        return buyer;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("buyId", getBuyId())
+            .append("materialId", getMaterialId())
+            .append("buyTime", getBuyTime())
+            .append("place", getPlace())
+            .append("totalNum", getTotalNum())
+            .append("price", getPrice())
+            .append("amount", getAmount())
+            .append("buyer", getBuyer())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,111 @@
+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_material_give
+ * 
+ * @author cmc
+ * @date 2024-07-31
+ */
+public class CmcMaterialGive extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 耗材发放id */
+    private Integer giveId;
+
+    /** 耗材id */
+    @Excel(name = "耗材id")
+    private Integer materialId;
+
+    /** 发放时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "发放时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date giveTime;
+
+    /** 领用人 */
+    @Excel(name = "领用人")
+    private Long accpter;
+
+    /** 领用部门 */
+    @Excel(name = "领用部门")
+    private Long useDept;
+
+    /** 领用数量 */
+    @Excel(name = "领用数量")
+    private Double giveNum;
+
+    public void setGiveId(Integer giveId) 
+    {
+        this.giveId = giveId;
+    }
+
+    public Integer getGiveId() 
+    {
+        return giveId;
+    }
+    public void setMaterialId(Integer materialId) 
+    {
+        this.materialId = materialId;
+    }
+
+    public Integer getMaterialId() 
+    {
+        return materialId;
+    }
+    public void setGiveTime(Date giveTime) 
+    {
+        this.giveTime = giveTime;
+    }
+
+    public Date getGiveTime() 
+    {
+        return giveTime;
+    }
+    public void setAccpter(Long accpter) 
+    {
+        this.accpter = accpter;
+    }
+
+    public Long getAccpter() 
+    {
+        return accpter;
+    }
+    public void setUseDept(Long useDept) 
+    {
+        this.useDept = useDept;
+    }
+
+    public Long getUseDept() 
+    {
+        return useDept;
+    }
+    public void setGiveNum(Double giveNum) 
+    {
+        this.giveNum = giveNum;
+    }
+
+    public Double getGiveNum() 
+    {
+        return giveNum;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("giveId", getGiveId())
+            .append("materialId", getMaterialId())
+            .append("giveTime", getGiveTime())
+            .append("accpter", getAccpter())
+            .append("useDept", getUseDept())
+            .append("giveNum", getGiveNum())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcMaterialBuy;
+
+/**
+ * cmc耗材购买Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-07-31
+ */
+public interface CmcMaterialBuyMapper 
+{
+    /**
+     * 查询cmc耗材购买
+     * 
+     * @param buyId cmc耗材购买主键
+     * @return cmc耗材购买
+     */
+    public CmcMaterialBuy selectCmcMaterialBuyByBuyId(Integer buyId);
+
+    /**
+     * 查询cmc耗材购买列表
+     * 
+     * @param cmcMaterialBuy cmc耗材购买
+     * @return cmc耗材购买集合
+     */
+    public List<CmcMaterialBuy> selectCmcMaterialBuyList(CmcMaterialBuy cmcMaterialBuy);
+
+    /**
+     * 新增cmc耗材购买
+     * 
+     * @param cmcMaterialBuy cmc耗材购买
+     * @return 结果
+     */
+    public int insertCmcMaterialBuy(CmcMaterialBuy cmcMaterialBuy);
+
+    /**
+     * 修改cmc耗材购买
+     * 
+     * @param cmcMaterialBuy cmc耗材购买
+     * @return 结果
+     */
+    public int updateCmcMaterialBuy(CmcMaterialBuy cmcMaterialBuy);
+
+    /**
+     * 删除cmc耗材购买
+     * 
+     * @param buyId cmc耗材购买主键
+     * @return 结果
+     */
+    public int deleteCmcMaterialBuyByBuyId(Integer buyId);
+
+    /**
+     * 批量删除cmc耗材购买
+     * 
+     * @param buyIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcMaterialBuyByBuyIds(Integer[] buyIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcMaterialGive;
+
+/**
+ * cmc耗材发放Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-07-31
+ */
+public interface CmcMaterialGiveMapper 
+{
+    /**
+     * 查询cmc耗材发放
+     * 
+     * @param giveId cmc耗材发放主键
+     * @return cmc耗材发放
+     */
+    public CmcMaterialGive selectCmcMaterialGiveByGiveId(Integer giveId);
+
+    /**
+     * 查询cmc耗材发放列表
+     * 
+     * @param cmcMaterialGive cmc耗材发放
+     * @return cmc耗材发放集合
+     */
+    public List<CmcMaterialGive> selectCmcMaterialGiveList(CmcMaterialGive cmcMaterialGive);
+
+    /**
+     * 新增cmc耗材发放
+     * 
+     * @param cmcMaterialGive cmc耗材发放
+     * @return 结果
+     */
+    public int insertCmcMaterialGive(CmcMaterialGive cmcMaterialGive);
+
+    /**
+     * 修改cmc耗材发放
+     * 
+     * @param cmcMaterialGive cmc耗材发放
+     * @return 结果
+     */
+    public int updateCmcMaterialGive(CmcMaterialGive cmcMaterialGive);
+
+    /**
+     * 删除cmc耗材发放
+     * 
+     * @param giveId cmc耗材发放主键
+     * @return 结果
+     */
+    public int deleteCmcMaterialGiveByGiveId(Integer giveId);
+
+    /**
+     * 批量删除cmc耗材发放
+     * 
+     * @param giveIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcMaterialGiveByGiveIds(Integer[] giveIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcMaterial;
+
+/**
+ * cmc耗材信息Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-07-31
+ */
+public interface CmcMaterialMapper 
+{
+    /**
+     * 查询cmc耗材信息
+     * 
+     * @param materialId cmc耗材信息主键
+     * @return cmc耗材信息
+     */
+    public CmcMaterial selectCmcMaterialByMaterialId(Integer materialId);
+
+    /**
+     * 查询cmc耗材信息列表
+     * 
+     * @param cmcMaterial cmc耗材信息
+     * @return cmc耗材信息集合
+     */
+    public List<CmcMaterial> selectCmcMaterialList(CmcMaterial cmcMaterial);
+
+    /**
+     * 新增cmc耗材信息
+     * 
+     * @param cmcMaterial cmc耗材信息
+     * @return 结果
+     */
+    public int insertCmcMaterial(CmcMaterial cmcMaterial);
+
+    /**
+     * 修改cmc耗材信息
+     * 
+     * @param cmcMaterial cmc耗材信息
+     * @return 结果
+     */
+    public int updateCmcMaterial(CmcMaterial cmcMaterial);
+
+    /**
+     * 删除cmc耗材信息
+     * 
+     * @param materialId cmc耗材信息主键
+     * @return 结果
+     */
+    public int deleteCmcMaterialByMaterialId(Integer materialId);
+
+    /**
+     * 批量删除cmc耗材信息
+     * 
+     * @param materialIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcMaterialByMaterialIds(Integer[] materialIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcMaterialBuy;
+
+/**
+ * cmc耗材购买Service接口
+ * 
+ * @author cmc
+ * @date 2024-07-31
+ */
+public interface ICmcMaterialBuyService 
+{
+    /**
+     * 查询cmc耗材购买
+     * 
+     * @param buyId cmc耗材购买主键
+     * @return cmc耗材购买
+     */
+    public CmcMaterialBuy selectCmcMaterialBuyByBuyId(Integer buyId);
+
+    /**
+     * 查询cmc耗材购买列表
+     * 
+     * @param cmcMaterialBuy cmc耗材购买
+     * @return cmc耗材购买集合
+     */
+    public List<CmcMaterialBuy> selectCmcMaterialBuyList(CmcMaterialBuy cmcMaterialBuy);
+
+    /**
+     * 新增cmc耗材购买
+     * 
+     * @param cmcMaterialBuy cmc耗材购买
+     * @return 结果
+     */
+    public int insertCmcMaterialBuy(CmcMaterialBuy cmcMaterialBuy);
+
+    /**
+     * 修改cmc耗材购买
+     * 
+     * @param cmcMaterialBuy cmc耗材购买
+     * @return 结果
+     */
+    public int updateCmcMaterialBuy(CmcMaterialBuy cmcMaterialBuy);
+
+    /**
+     * 批量删除cmc耗材购买
+     * 
+     * @param buyIds 需要删除的cmc耗材购买主键集合
+     * @return 结果
+     */
+    public int deleteCmcMaterialBuyByBuyIds(Integer[] buyIds);
+
+    /**
+     * 删除cmc耗材购买信息
+     * 
+     * @param buyId cmc耗材购买主键
+     * @return 结果
+     */
+    public int deleteCmcMaterialBuyByBuyId(Integer buyId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcMaterialGive;
+
+/**
+ * cmc耗材发放Service接口
+ * 
+ * @author cmc
+ * @date 2024-07-31
+ */
+public interface ICmcMaterialGiveService 
+{
+    /**
+     * 查询cmc耗材发放
+     * 
+     * @param giveId cmc耗材发放主键
+     * @return cmc耗材发放
+     */
+    public CmcMaterialGive selectCmcMaterialGiveByGiveId(Integer giveId);
+
+    /**
+     * 查询cmc耗材发放列表
+     * 
+     * @param cmcMaterialGive cmc耗材发放
+     * @return cmc耗材发放集合
+     */
+    public List<CmcMaterialGive> selectCmcMaterialGiveList(CmcMaterialGive cmcMaterialGive);
+
+    /**
+     * 新增cmc耗材发放
+     * 
+     * @param cmcMaterialGive cmc耗材发放
+     * @return 结果
+     */
+    public int insertCmcMaterialGive(CmcMaterialGive cmcMaterialGive);
+
+    /**
+     * 修改cmc耗材发放
+     * 
+     * @param cmcMaterialGive cmc耗材发放
+     * @return 结果
+     */
+    public int updateCmcMaterialGive(CmcMaterialGive cmcMaterialGive);
+
+    /**
+     * 批量删除cmc耗材发放
+     * 
+     * @param giveIds 需要删除的cmc耗材发放主键集合
+     * @return 结果
+     */
+    public int deleteCmcMaterialGiveByGiveIds(Integer[] giveIds);
+
+    /**
+     * 删除cmc耗材发放信息
+     * 
+     * @param giveId cmc耗材发放主键
+     * @return 结果
+     */
+    public int deleteCmcMaterialGiveByGiveId(Integer giveId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcMaterial;
+
+/**
+ * cmc耗材信息Service接口
+ * 
+ * @author cmc
+ * @date 2024-07-31
+ */
+public interface ICmcMaterialService 
+{
+    /**
+     * 查询cmc耗材信息
+     * 
+     * @param materialId cmc耗材信息主键
+     * @return cmc耗材信息
+     */
+    public CmcMaterial selectCmcMaterialByMaterialId(Integer materialId);
+
+    /**
+     * 查询cmc耗材信息列表
+     * 
+     * @param cmcMaterial cmc耗材信息
+     * @return cmc耗材信息集合
+     */
+    public List<CmcMaterial> selectCmcMaterialList(CmcMaterial cmcMaterial);
+
+    /**
+     * 新增cmc耗材信息
+     * 
+     * @param cmcMaterial cmc耗材信息
+     * @return 结果
+     */
+    public int insertCmcMaterial(CmcMaterial cmcMaterial);
+
+    /**
+     * 修改cmc耗材信息
+     * 
+     * @param cmcMaterial cmc耗材信息
+     * @return 结果
+     */
+    public int updateCmcMaterial(CmcMaterial cmcMaterial);
+
+    /**
+     * 批量删除cmc耗材信息
+     * 
+     * @param materialIds 需要删除的cmc耗材信息主键集合
+     * @return 结果
+     */
+    public int deleteCmcMaterialByMaterialIds(Integer[] materialIds);
+
+    /**
+     * 删除cmc耗材信息信息
+     * 
+     * @param materialId cmc耗材信息主键
+     * @return 结果
+     */
+    public int deleteCmcMaterialByMaterialId(Integer materialId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcMaterialBuyServiceImpl.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.CmcMaterialBuyMapper;
+import com.ruoyi.oa.domain.CmcMaterialBuy;
+import com.ruoyi.oa.service.ICmcMaterialBuyService;
+
+/**
+ * cmc耗材购买Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-07-31
+ */
+@Service
+public class CmcMaterialBuyServiceImpl implements ICmcMaterialBuyService 
+{
+    @Autowired
+    private CmcMaterialBuyMapper cmcMaterialBuyMapper;
+
+    /**
+     * 查询cmc耗材购买
+     * 
+     * @param buyId cmc耗材购买主键
+     * @return cmc耗材购买
+     */
+    @Override
+    public CmcMaterialBuy selectCmcMaterialBuyByBuyId(Integer buyId)
+    {
+        return cmcMaterialBuyMapper.selectCmcMaterialBuyByBuyId(buyId);
+    }
+
+    /**
+     * 查询cmc耗材购买列表
+     * 
+     * @param cmcMaterialBuy cmc耗材购买
+     * @return cmc耗材购买
+     */
+    @Override
+    public List<CmcMaterialBuy> selectCmcMaterialBuyList(CmcMaterialBuy cmcMaterialBuy)
+    {
+        return cmcMaterialBuyMapper.selectCmcMaterialBuyList(cmcMaterialBuy);
+    }
+
+    /**
+     * 新增cmc耗材购买
+     * 
+     * @param cmcMaterialBuy cmc耗材购买
+     * @return 结果
+     */
+    @Override
+    public int insertCmcMaterialBuy(CmcMaterialBuy cmcMaterialBuy)
+    {
+        return cmcMaterialBuyMapper.insertCmcMaterialBuy(cmcMaterialBuy);
+    }
+
+    /**
+     * 修改cmc耗材购买
+     * 
+     * @param cmcMaterialBuy cmc耗材购买
+     * @return 结果
+     */
+    @Override
+    public int updateCmcMaterialBuy(CmcMaterialBuy cmcMaterialBuy)
+    {
+        return cmcMaterialBuyMapper.updateCmcMaterialBuy(cmcMaterialBuy);
+    }
+
+    /**
+     * 批量删除cmc耗材购买
+     * 
+     * @param buyIds 需要删除的cmc耗材购买主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcMaterialBuyByBuyIds(Integer[] buyIds)
+    {
+        return cmcMaterialBuyMapper.deleteCmcMaterialBuyByBuyIds(buyIds);
+    }
+
+    /**
+     * 删除cmc耗材购买信息
+     * 
+     * @param buyId cmc耗材购买主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcMaterialBuyByBuyId(Integer buyId)
+    {
+        return cmcMaterialBuyMapper.deleteCmcMaterialBuyByBuyId(buyId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcMaterialGiveServiceImpl.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.CmcMaterialGiveMapper;
+import com.ruoyi.oa.domain.CmcMaterialGive;
+import com.ruoyi.oa.service.ICmcMaterialGiveService;
+
+/**
+ * cmc耗材发放Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-07-31
+ */
+@Service
+public class CmcMaterialGiveServiceImpl implements ICmcMaterialGiveService 
+{
+    @Autowired
+    private CmcMaterialGiveMapper cmcMaterialGiveMapper;
+
+    /**
+     * 查询cmc耗材发放
+     * 
+     * @param giveId cmc耗材发放主键
+     * @return cmc耗材发放
+     */
+    @Override
+    public CmcMaterialGive selectCmcMaterialGiveByGiveId(Integer giveId)
+    {
+        return cmcMaterialGiveMapper.selectCmcMaterialGiveByGiveId(giveId);
+    }
+
+    /**
+     * 查询cmc耗材发放列表
+     * 
+     * @param cmcMaterialGive cmc耗材发放
+     * @return cmc耗材发放
+     */
+    @Override
+    public List<CmcMaterialGive> selectCmcMaterialGiveList(CmcMaterialGive cmcMaterialGive)
+    {
+        return cmcMaterialGiveMapper.selectCmcMaterialGiveList(cmcMaterialGive);
+    }
+
+    /**
+     * 新增cmc耗材发放
+     * 
+     * @param cmcMaterialGive cmc耗材发放
+     * @return 结果
+     */
+    @Override
+    public int insertCmcMaterialGive(CmcMaterialGive cmcMaterialGive)
+    {
+        return cmcMaterialGiveMapper.insertCmcMaterialGive(cmcMaterialGive);
+    }
+
+    /**
+     * 修改cmc耗材发放
+     * 
+     * @param cmcMaterialGive cmc耗材发放
+     * @return 结果
+     */
+    @Override
+    public int updateCmcMaterialGive(CmcMaterialGive cmcMaterialGive)
+    {
+        return cmcMaterialGiveMapper.updateCmcMaterialGive(cmcMaterialGive);
+    }
+
+    /**
+     * 批量删除cmc耗材发放
+     * 
+     * @param giveIds 需要删除的cmc耗材发放主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcMaterialGiveByGiveIds(Integer[] giveIds)
+    {
+        return cmcMaterialGiveMapper.deleteCmcMaterialGiveByGiveIds(giveIds);
+    }
+
+    /**
+     * 删除cmc耗材发放信息
+     * 
+     * @param giveId cmc耗材发放主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcMaterialGiveByGiveId(Integer giveId)
+    {
+        return cmcMaterialGiveMapper.deleteCmcMaterialGiveByGiveId(giveId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcMaterialServiceImpl.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.CmcMaterialMapper;
+import com.ruoyi.oa.domain.CmcMaterial;
+import com.ruoyi.oa.service.ICmcMaterialService;
+
+/**
+ * cmc耗材信息Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-07-31
+ */
+@Service
+public class CmcMaterialServiceImpl implements ICmcMaterialService 
+{
+    @Autowired
+    private CmcMaterialMapper cmcMaterialMapper;
+
+    /**
+     * 查询cmc耗材信息
+     * 
+     * @param materialId cmc耗材信息主键
+     * @return cmc耗材信息
+     */
+    @Override
+    public CmcMaterial selectCmcMaterialByMaterialId(Integer materialId)
+    {
+        return cmcMaterialMapper.selectCmcMaterialByMaterialId(materialId);
+    }
+
+    /**
+     * 查询cmc耗材信息列表
+     * 
+     * @param cmcMaterial cmc耗材信息
+     * @return cmc耗材信息
+     */
+    @Override
+    public List<CmcMaterial> selectCmcMaterialList(CmcMaterial cmcMaterial)
+    {
+        return cmcMaterialMapper.selectCmcMaterialList(cmcMaterial);
+    }
+
+    /**
+     * 新增cmc耗材信息
+     * 
+     * @param cmcMaterial cmc耗材信息
+     * @return 结果
+     */
+    @Override
+    public int insertCmcMaterial(CmcMaterial cmcMaterial)
+    {
+        return cmcMaterialMapper.insertCmcMaterial(cmcMaterial);
+    }
+
+    /**
+     * 修改cmc耗材信息
+     * 
+     * @param cmcMaterial cmc耗材信息
+     * @return 结果
+     */
+    @Override
+    public int updateCmcMaterial(CmcMaterial cmcMaterial)
+    {
+        return cmcMaterialMapper.updateCmcMaterial(cmcMaterial);
+    }
+
+    /**
+     * 批量删除cmc耗材信息
+     * 
+     * @param materialIds 需要删除的cmc耗材信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcMaterialByMaterialIds(Integer[] materialIds)
+    {
+        return cmcMaterialMapper.deleteCmcMaterialByMaterialIds(materialIds);
+    }
+
+    /**
+     * 删除cmc耗材信息信息
+     * 
+     * @param materialId cmc耗材信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcMaterialByMaterialId(Integer materialId)
+    {
+        return cmcMaterialMapper.deleteCmcMaterialByMaterialId(materialId);
+    }
+}

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

@@ -0,0 +1,90 @@
+<?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.CmcMaterialBuyMapper">
+    
+    <resultMap type="CmcMaterialBuy" id="CmcMaterialBuyResult">
+        <result property="buyId"    column="buy_id"    />
+        <result property="materialId"    column="material_id"    />
+        <result property="buyTime"    column="buy_time"    />
+        <result property="place"    column="place"    />
+        <result property="totalNum"    column="total_num"    />
+        <result property="price"    column="price"    />
+        <result property="amount"    column="amount"    />
+        <result property="buyer"    column="buyer"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectCmcMaterialBuyVo">
+        select buy_id, material_id, buy_time, place, total_num, price, amount, buyer, remark from cmc_material_buy
+    </sql>
+
+    <select id="selectCmcMaterialBuyList" parameterType="CmcMaterialBuy" resultMap="CmcMaterialBuyResult">
+        <include refid="selectCmcMaterialBuyVo"/>
+        <where>  
+            <if test="materialId != null "> and material_id = #{materialId}</if>
+            <if test="buyTime != null "> and buy_time = #{buyTime}</if>
+            <if test="place != null  and place != ''"> and place = #{place}</if>
+            <if test="totalNum != null "> and total_num = #{totalNum}</if>
+            <if test="price != null "> and price = #{price}</if>
+            <if test="amount != null "> and amount = #{amount}</if>
+            <if test="buyer != null "> and buyer = #{buyer}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcMaterialBuyByBuyId" parameterType="Integer" resultMap="CmcMaterialBuyResult">
+        <include refid="selectCmcMaterialBuyVo"/>
+        where buy_id = #{buyId}
+    </select>
+        
+    <insert id="insertCmcMaterialBuy" parameterType="CmcMaterialBuy" useGeneratedKeys="true" keyProperty="buyId">
+        insert into cmc_material_buy
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="materialId != null">material_id,</if>
+            <if test="buyTime != null">buy_time,</if>
+            <if test="place != null">place,</if>
+            <if test="totalNum != null">total_num,</if>
+            <if test="price != null">price,</if>
+            <if test="amount != null">amount,</if>
+            <if test="buyer != null">buyer,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="materialId != null">#{materialId},</if>
+            <if test="buyTime != null">#{buyTime},</if>
+            <if test="place != null">#{place},</if>
+            <if test="totalNum != null">#{totalNum},</if>
+            <if test="price != null">#{price},</if>
+            <if test="amount != null">#{amount},</if>
+            <if test="buyer != null">#{buyer},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcMaterialBuy" parameterType="CmcMaterialBuy">
+        update cmc_material_buy
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="materialId != null">material_id = #{materialId},</if>
+            <if test="buyTime != null">buy_time = #{buyTime},</if>
+            <if test="place != null">place = #{place},</if>
+            <if test="totalNum != null">total_num = #{totalNum},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="amount != null">amount = #{amount},</if>
+            <if test="buyer != null">buyer = #{buyer},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where buy_id = #{buyId}
+    </update>
+
+    <delete id="deleteCmcMaterialBuyByBuyId" parameterType="Integer">
+        delete from cmc_material_buy where buy_id = #{buyId}
+    </delete>
+
+    <delete id="deleteCmcMaterialBuyByBuyIds" parameterType="String">
+        delete from cmc_material_buy where buy_id in 
+        <foreach item="buyId" collection="array" open="(" separator="," close=")">
+            #{buyId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,80 @@
+<?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.CmcMaterialGiveMapper">
+    
+    <resultMap type="CmcMaterialGive" id="CmcMaterialGiveResult">
+        <result property="giveId"    column="give_id"    />
+        <result property="materialId"    column="material_id"    />
+        <result property="giveTime"    column="give_time"    />
+        <result property="accpter"    column="accpter"    />
+        <result property="useDept"    column="use_dept"    />
+        <result property="giveNum"    column="give_num"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectCmcMaterialGiveVo">
+        select give_id, material_id, give_time, accpter, use_dept, give_num, remark from cmc_material_give
+    </sql>
+
+    <select id="selectCmcMaterialGiveList" parameterType="CmcMaterialGive" resultMap="CmcMaterialGiveResult">
+        <include refid="selectCmcMaterialGiveVo"/>
+        <where>  
+            <if test="materialId != null "> and material_id = #{materialId}</if>
+            <if test="giveTime != null "> and give_time = #{giveTime}</if>
+            <if test="accpter != null "> and accpter = #{accpter}</if>
+            <if test="useDept != null "> and use_dept = #{useDept}</if>
+            <if test="giveNum != null "> and give_num = #{giveNum}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcMaterialGiveByGiveId" parameterType="Integer" resultMap="CmcMaterialGiveResult">
+        <include refid="selectCmcMaterialGiveVo"/>
+        where give_id = #{giveId}
+    </select>
+        
+    <insert id="insertCmcMaterialGive" parameterType="CmcMaterialGive" useGeneratedKeys="true" keyProperty="giveId">
+        insert into cmc_material_give
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="materialId != null">material_id,</if>
+            <if test="giveTime != null">give_time,</if>
+            <if test="accpter != null">accpter,</if>
+            <if test="useDept != null">use_dept,</if>
+            <if test="giveNum != null">give_num,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="materialId != null">#{materialId},</if>
+            <if test="giveTime != null">#{giveTime},</if>
+            <if test="accpter != null">#{accpter},</if>
+            <if test="useDept != null">#{useDept},</if>
+            <if test="giveNum != null">#{giveNum},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcMaterialGive" parameterType="CmcMaterialGive">
+        update cmc_material_give
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="materialId != null">material_id = #{materialId},</if>
+            <if test="giveTime != null">give_time = #{giveTime},</if>
+            <if test="accpter != null">accpter = #{accpter},</if>
+            <if test="useDept != null">use_dept = #{useDept},</if>
+            <if test="giveNum != null">give_num = #{giveNum},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where give_id = #{giveId}
+    </update>
+
+    <delete id="deleteCmcMaterialGiveByGiveId" parameterType="Integer">
+        delete from cmc_material_give where give_id = #{giveId}
+    </delete>
+
+    <delete id="deleteCmcMaterialGiveByGiveIds" parameterType="String">
+        delete from cmc_material_give where give_id in 
+        <foreach item="giveId" collection="array" open="(" separator="," close=")">
+            #{giveId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,90 @@
+<?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.CmcMaterialMapper">
+    
+    <resultMap type="CmcMaterial" id="CmcMaterialResult">
+        <result property="materialId"    column="material_id"    />
+        <result property="name"    column="name"    />
+        <result property="type"    column="type"    />
+        <result property="series"    column="series"    />
+        <result property="brand"    column="brand"    />
+        <result property="place"    column="place"    />
+        <result property="remain"    column="remain"    />
+        <result property="unit"    column="unit"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectCmcMaterialVo">
+        select material_id, name, type, series, brand, place, remain, unit, remark from cmc_material
+    </sql>
+
+    <select id="selectCmcMaterialList" parameterType="CmcMaterial" resultMap="CmcMaterialResult">
+        <include refid="selectCmcMaterialVo"/>
+        <where>  
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="series != null  and series != ''"> and series = #{series}</if>
+            <if test="brand != null  and brand != ''"> and brand = #{brand}</if>
+            <if test="place != null  and place != ''"> and place = #{place}</if>
+            <if test="remain != null "> and remain = #{remain}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcMaterialByMaterialId" parameterType="Integer" resultMap="CmcMaterialResult">
+        <include refid="selectCmcMaterialVo"/>
+        where material_id = #{materialId}
+    </select>
+        
+    <insert id="insertCmcMaterial" parameterType="CmcMaterial" useGeneratedKeys="true" keyProperty="materialId">
+        insert into cmc_material
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null">name,</if>
+            <if test="type != null">type,</if>
+            <if test="series != null">series,</if>
+            <if test="brand != null">brand,</if>
+            <if test="place != null">place,</if>
+            <if test="remain != null">remain,</if>
+            <if test="unit != null">unit,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null">#{name},</if>
+            <if test="type != null">#{type},</if>
+            <if test="series != null">#{series},</if>
+            <if test="brand != null">#{brand},</if>
+            <if test="place != null">#{place},</if>
+            <if test="remain != null">#{remain},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcMaterial" parameterType="CmcMaterial">
+        update cmc_material
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="series != null">series = #{series},</if>
+            <if test="brand != null">brand = #{brand},</if>
+            <if test="place != null">place = #{place},</if>
+            <if test="remain != null">remain = #{remain},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where material_id = #{materialId}
+    </update>
+
+    <delete id="deleteCmcMaterialByMaterialId" parameterType="Integer">
+        delete from cmc_material where material_id = #{materialId}
+    </delete>
+
+    <delete id="deleteCmcMaterialByMaterialIds" parameterType="String">
+        delete from cmc_material where material_id in 
+        <foreach item="materialId" collection="array" open="(" separator="," close=")">
+            #{materialId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc耗材信息列表
+export function listMaterial(query) {
+  return request({
+    url: '/oa/material/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc耗材信息详细
+export function getMaterial(materialId) {
+  return request({
+    url: '/oa/material/' + materialId,
+    method: 'get'
+  })
+}
+
+// 新增cmc耗材信息
+export function addMaterial(data) {
+  return request({
+    url: '/oa/material',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc耗材信息
+export function updateMaterial(data) {
+  return request({
+    url: '/oa/material',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc耗材信息
+export function delMaterial(materialId) {
+  return request({
+    url: '/oa/material/' + materialId,
+    method: 'delete'
+  })
+}

oa-ui/src/api/oa/material/materialBuy.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc耗材购买列表
+export function listMaterialBuy(query) {
+  return request({
+    url: '/oa/materialBuy/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc耗材购买详细
+export function getMaterialBuy(buyId) {
+  return request({
+    url: '/oa/materialBuy/' + buyId,
+    method: 'get'
+  })
+}
+
+// 新增cmc耗材购买
+export function addMaterialBuy(data) {
+  return request({
+    url: '/oa/materialBuy',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc耗材购买
+export function updateMaterialBuy(data) {
+  return request({
+    url: '/oa/materialBuy',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc耗材购买
+export function delMaterialBuy(buyId) {
+  return request({
+    url: '/oa/materialBuy/' + buyId,
+    method: 'delete'
+  })
+}

oa-ui/src/api/oa/material/materialGive.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc耗材发放列表
+export function listMaterialGive(query) {
+  return request({
+    url: '/oa/materialGive/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc耗材发放详细
+export function getMaterialGive(giveId) {
+  return request({
+    url: '/oa/materialGive/' + giveId,
+    method: 'get'
+  })
+}
+
+// 新增cmc耗材发放
+export function addMaterialGive(data) {
+  return request({
+    url: '/oa/materialGive',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc耗材发放
+export function updateMaterialGive(data) {
+  return request({
+    url: '/oa/materialGive',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc耗材发放
+export function delMaterialGive(giveId) {
+  return request({
+    url: '/oa/materialGive/' + giveId,
+    method: 'delete'
+  })
+}

oa-ui/src/api/system/user.js

@@ -54,9 +54,10 @@ export function delUser(userId) {
 }
 
 // 用户密码重置
-export function resetUserPwd(userId, password) {
+export function resetUserPwd(userId, idCard, password) {
   const data = {
     userId,
+    idCard,
     password
   }
   return request({

oa-ui/src/views/oa/material/buy.vue

@@ -0,0 +1,343 @@
+<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="耗材id" prop="materialId">
+        <el-input
+          v-model="queryParams.materialId"
+          placeholder="请输入耗材id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="采购日期" prop="buyTime">
+        <el-date-picker clearable
+          v-model="queryParams.buyTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择采购日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="采购地点" prop="place">
+        <el-input
+          v-model="queryParams.place"
+          placeholder="请输入采购地点"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="采购数量" prop="totalNum">
+        <el-input
+          v-model="queryParams.totalNum"
+          placeholder="请输入采购数量"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单价" prop="price">
+        <el-input
+          v-model="queryParams.price"
+          placeholder="请输入单价"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="总价" prop="amount">
+        <el-input
+          v-model="queryParams.amount"
+          placeholder="请输入总价"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="采购人" prop="buyer">
+        <el-input
+          v-model="queryParams.buyer"
+          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:materialBuy: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:materialBuy: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:materialBuy: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:materialBuy:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="materialBuyList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="耗材购买id" align="center" prop="buyId" />
+      <el-table-column label="耗材id" align="center" prop="materialId" />
+      <el-table-column label="采购日期" align="center" prop="buyTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.buyTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="采购地点" align="center" prop="place" />
+      <el-table-column label="采购数量" align="center" prop="totalNum" />
+      <el-table-column label="单价" align="center" prop="price" />
+      <el-table-column label="总价" align="center" prop="amount" />
+      <el-table-column label="采购人" align="center" prop="buyer" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <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:materialBuy:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:materialBuy: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="耗材id" prop="materialId">
+          <el-input v-model="form.materialId" placeholder="请输入耗材id" />
+        </el-form-item>
+        <el-form-item label="采购日期" prop="buyTime">
+          <el-date-picker clearable
+            v-model="form.buyTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择采购日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="采购地点" prop="place">
+          <el-input v-model="form.place" placeholder="请输入采购地点" />
+        </el-form-item>
+        <el-form-item label="采购数量" prop="totalNum">
+          <el-input v-model="form.totalNum" placeholder="请输入采购数量" />
+        </el-form-item>
+        <el-form-item label="单价" prop="price">
+          <el-input v-model="form.price" placeholder="请输入单价" />
+        </el-form-item>
+        <el-form-item label="总价" prop="amount">
+          <el-input v-model="form.amount" placeholder="请输入总价" />
+        </el-form-item>
+        <el-form-item label="采购人" prop="buyer">
+          <el-input v-model="form.buyer" placeholder="请输入采购人" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" 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 { listMaterialBuy, getMaterialBuy, delMaterialBuy, addMaterialBuy, updateMaterialBuy } from "@/api/oa/material/materialBuy";
+
+export default {
+  name: "MaterialBuy",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc耗材购买表格数据
+      materialBuyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        materialId: null,
+        buyTime: null,
+        place: null,
+        totalNum: null,
+        price: null,
+        amount: null,
+        buyer: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc耗材购买列表 */
+    getList() {
+      this.loading = true;
+      listMaterialBuy(this.queryParams).then(response => {
+        this.materialBuyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        buyId: null,
+        materialId: null,
+        buyTime: null,
+        place: null,
+        totalNum: null,
+        price: null,
+        amount: null,
+        buyer: null,
+        remark: 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.buyId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc耗材购买";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const buyId = row.buyId || this.ids
+      getMaterialBuy(buyId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc耗材购买";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.buyId != null) {
+            updateMaterialBuy(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMaterialBuy(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const buyIds = row.buyId || this.ids;
+      this.$modal.confirm('是否确认删除cmc耗材购买编号为"' + buyIds + '"的数据项？').then(function() {
+        return delMaterialBuy(buyIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/materialBuy/export', {
+        ...this.queryParams
+      }, `materialBuy_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

oa-ui/src/views/oa/material/give.vue

@@ -0,0 +1,315 @@
+<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="耗材id" prop="materialId">
+        <el-input
+          v-model="queryParams.materialId"
+          placeholder="请输入耗材id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="发放时间" prop="giveTime">
+        <el-date-picker clearable
+          v-model="queryParams.giveTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择发放时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="领用人" prop="accpter">
+        <el-input
+          v-model="queryParams.accpter"
+          placeholder="请输入领用人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="领用部门" prop="useDept">
+        <el-input
+          v-model="queryParams.useDept"
+          placeholder="请输入领用部门"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="领用数量" prop="giveNum">
+        <el-input
+          v-model="queryParams.giveNum"
+          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:materialGive: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:materialGive: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:materialGive: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:materialGive:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="materialGiveList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="耗材发放id" align="center" prop="giveId" />
+      <el-table-column label="耗材id" align="center" prop="materialId" />
+      <el-table-column label="发放时间" align="center" prop="giveTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.giveTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="领用人" align="center" prop="accpter" />
+      <el-table-column label="领用部门" align="center" prop="useDept" />
+      <el-table-column label="领用数量" align="center" prop="giveNum" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <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:materialGive:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:materialGive: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="耗材id" prop="materialId">
+          <el-input v-model="form.materialId" placeholder="请输入耗材id" />
+        </el-form-item>
+        <el-form-item label="发放时间" prop="giveTime">
+          <el-date-picker clearable
+            v-model="form.giveTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择发放时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="领用人" prop="accpter">
+          <el-input v-model="form.accpter" placeholder="请输入领用人" />
+        </el-form-item>
+        <el-form-item label="领用部门" prop="useDept">
+          <el-input v-model="form.useDept" placeholder="请输入领用部门" />
+        </el-form-item>
+        <el-form-item label="领用数量" prop="giveNum">
+          <el-input v-model="form.giveNum" placeholder="请输入领用数量" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" 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 { listMaterialGive, getMaterialGive, delMaterialGive, addMaterialGive, updateMaterialGive } from "@/api/oa/material/materialGive";
+
+export default {
+  name: "MaterialGive",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc耗材发放表格数据
+      materialGiveList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        materialId: null,
+        giveTime: null,
+        accpter: null,
+        useDept: null,
+        giveNum: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc耗材发放列表 */
+    getList() {
+      this.loading = true;
+      listMaterialGive(this.queryParams).then(response => {
+        this.materialGiveList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        giveId: null,
+        materialId: null,
+        giveTime: null,
+        accpter: null,
+        useDept: null,
+        giveNum: null,
+        remark: 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.giveId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc耗材发放";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const giveId = row.giveId || this.ids
+      getMaterialGive(giveId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc耗材发放";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.giveId != null) {
+            updateMaterialGive(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMaterialGive(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const giveIds = row.giveId || this.ids;
+      this.$modal.confirm('是否确认删除cmc耗材发放编号为"' + giveIds + '"的数据项？').then(function() {
+        return delMaterialGive(giveIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/materialGive/export', {
+        ...this.queryParams
+      }, `materialGive_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -0,0 +1,323 @@
+<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="name">
+        <el-input
+          v-model="queryParams.name"
+          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 label="耗材品牌" prop="brand">
+        <el-input
+          v-model="queryParams.brand"
+          placeholder="请输入耗材品牌"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="存放地点" prop="place">
+        <el-input
+          v-model="queryParams.place"
+          placeholder="请输入存放地点"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="剩余数量" prop="remain">
+        <el-input
+          v-model="queryParams.remain"
+          placeholder="请输入剩余数量"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单位" prop="unit">
+        <el-input
+          v-model="queryParams.unit"
+          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:material: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:material: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:material: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:material:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="materialList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="耗材id" align="center" prop="materialId" />
+      <el-table-column label="耗材名称" align="center" prop="name" />
+      <el-table-column label="耗材类别" align="center" prop="type" />
+      <el-table-column label="规格型号" align="center" prop="series" />
+      <el-table-column label="耗材品牌" align="center" prop="brand" />
+      <el-table-column label="存放地点" align="center" prop="place" />
+      <el-table-column label="剩余数量" align="center" prop="remain" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <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:material:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:material: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="name">
+          <el-input v-model="form.name" placeholder="请输入耗材名称" />
+        </el-form-item>
+        <el-form-item label="规格型号" prop="series">
+          <el-input v-model="form.series" placeholder="请输入规格型号" />
+        </el-form-item>
+        <el-form-item label="耗材品牌" prop="brand">
+          <el-input v-model="form.brand" placeholder="请输入耗材品牌" />
+        </el-form-item>
+        <el-form-item label="存放地点" prop="place">
+          <el-input v-model="form.place" placeholder="请输入存放地点" />
+        </el-form-item>
+        <el-form-item label="剩余数量" prop="remain">
+          <el-input v-model="form.remain" placeholder="请输入剩余数量" />
+        </el-form-item>
+        <el-form-item label="单位" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入单位" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" 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 { listMaterial, getMaterial, delMaterial, addMaterial, updateMaterial } from "@/api/oa/material/material";
+
+export default {
+  name: "Material",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc耗材信息表格数据
+      materialList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        type: null,
+        series: null,
+        brand: null,
+        place: null,
+        remain: null,
+        unit: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc耗材信息列表 */
+    getList() {
+      this.loading = true;
+      listMaterial(this.queryParams).then(response => {
+        this.materialList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        materialId: null,
+        name: null,
+        type: null,
+        series: null,
+        brand: null,
+        place: null,
+        remain: null,
+        unit: null,
+        remark: 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.materialId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc耗材信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const materialId = row.materialId || this.ids
+      getMaterial(materialId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc耗材信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.materialId != null) {
+            updateMaterial(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMaterial(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const materialIds = row.materialId || this.ids;
+      this.$modal.confirm('是否确认删除cmc耗材信息编号为"' + materialIds + '"的数据项？').then(function() {
+        return delMaterial(materialIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/material/export', {
+        ...this.queryParams
+      }, `material_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

oa-ui/src/views/system/user/index.vue

@@ -560,11 +560,14 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         closeOnClickModal: false,
-        inputPattern: /^.{5,20}$/,
-        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
+        // inputPattern: /^.{5,20}$/,
+        // inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
       }).then(({ value }) => {
-        resetUserPwd(row.userId, value).then(response => {
-          this.$modal.msgSuccess("修改成功，新密码是：" + value);
+        resetUserPwd(row.userId, row.idCard, value).then(response => {
+          if (value)
+            this.$modal.msgSuccess("修改成功，新密码是：" + value);
+          else
+            this.$modal.msgSuccess("修改成功，新密码是身份证后6位");
         });
       }).catch(() => { });
     },