新增项目变更流程

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectChangeController.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.CmcProjectChange;
+import com.ruoyi.oa.service.ICmcProjectChangeService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc项目变更Controller
+ * 
+ * @author cmc
+ * @date 2024-06-05
+ */
+@RestController
+@RequestMapping("/oa/projectChange")
+public class CmcProjectChangeController extends BaseController
+{
+    @Autowired
+    private ICmcProjectChangeService cmcProjectChangeService;
+
+    /**
+     * 查询cmc项目变更列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcProjectChange cmcProjectChange)
+    {
+        startPage();
+        List<CmcProjectChange> list = cmcProjectChangeService.selectCmcProjectChangeList(cmcProjectChange);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc项目变更列表
+     */
+    @Log(title = "cmc项目变更", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcProjectChange cmcProjectChange)
+    {
+        List<CmcProjectChange> list = cmcProjectChangeService.selectCmcProjectChangeList(cmcProjectChange);
+        ExcelUtil<CmcProjectChange> util = new ExcelUtil<CmcProjectChange>(CmcProjectChange.class);
+        util.exportExcel(response, list, "cmc项目变更数据");
+    }
+
+    /**
+     * 获取cmc项目变更详细信息
+     */
+    @GetMapping(value = "/{changeId}")
+    public AjaxResult getInfo(@PathVariable("changeId") Long changeId)
+    {
+        return success(cmcProjectChangeService.selectCmcProjectChangeByChangeId(changeId));
+    }
+
+    /**
+     * 新增cmc项目变更
+     */
+    @Log(title = "cmc项目变更", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcProjectChange cmcProjectChange)
+    {
+        return toAjax(cmcProjectChangeService.insertCmcProjectChange(cmcProjectChange));
+    }
+
+    /**
+     * 修改cmc项目变更
+     */
+    @Log(title = "cmc项目变更", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcProjectChange cmcProjectChange)
+    {
+        return toAjax(cmcProjectChangeService.updateCmcProjectChange(cmcProjectChange));
+    }
+
+    /**
+     * 删除cmc项目变更
+     */
+    @Log(title = "cmc项目变更", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{changeIds}")
+    public AjaxResult remove(@PathVariable Long[] changeIds)
+    {
+        return toAjax(cmcProjectChangeService.deleteCmcProjectChangeByChangeIds(changeIds));
+    }
+}

oa-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -87,20 +87,20 @@ public class SysUser extends BaseEntity
     @Excel(name = "工程师岗级", readConverterExp = "0=一级,1=二级,2=三级,3=四级,4=五级,5=六级")
     private String engineerLevel;
 
-    /** 技工等级（0一级、1二级、2三级） */
-    @Excel(name = "技工等级", readConverterExp = "0=一级、1二级、2三级")
+    /** 技工等级 */
+    @Excel(name = "技工等级", readConverterExp = "0=一级,1=二级,2=三级")
     private String operatorLevel;
 
     /** 技术职称 */
-    @Excel(name = "技术职称", readConverterExp = "0=正高,1=副高,2=中级,3=助工")
+    @Excel(name = "技术职称", readConverterExp = "0=正高级工程师,1=高级工程师,2=中级工程师,3=助理工程师,4=高级会计师,5=会计师,6=助理会计师,7=高级经济师,8=经济师,9=助理经济师,10=工人高级工,11=工人中级工,12=工人初级工,13=无职称")
     private String titles;
 
     /** 执业证书 */
-    @Excel(name = "执业证书", readConverterExp = "0=注测,1=注规,2=注岩,3=注安,4=注会")
+    @Excel(name = "执业证书", readConverterExp = "0=注册测绘师,1=注册城乡规划师,2=注册岩土工程师,3=注册安全工程师,4=注册会计师")
     private String certificates;
 
     /** 更新原因 */
-    @Excel(name = "更新原因", readConverterExp = "0=误录修改、1=正常调整）")
+    @Excel(name = "更新原因", readConverterExp = "0=误录修改,1=正常调整）")
     private String updateReason;
 
     /** 入职时间 */
@@ -124,7 +124,7 @@ public class SysUser extends BaseEntity
     private String nativePlace;
 
     /** 政治面貌 */
-    @Excel(name = "政治面貌")
+    @Excel(name = "政治面貌", readConverterExp = "0=党总支书记,1=党总支干事,2=党总支委员,3=第一党支部书记,4=第二党支部书记,5=第一党支部组织委员,6=第二党支部组织委员,7=第一党支部宣传委员,8=第二党支部宣传委员,9=第一党支部党员,10=第二党支部党员,11=预备党员,12=共青团员,13=群众")
     private String politicalAffiliation;
 
     /** 民族 */
@@ -140,7 +140,7 @@ public class SysUser extends BaseEntity
     private String major;
 
     /** 学历 */
-    @Excel(name = "学历")
+    @Excel(name = "学历", readConverterExp = "0=博士,1=硕士,2=本科,3=专科,4=高中,5=中专,6=初中")
     private String degree;
 
     /** 合同签订 */

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

@@ -65,7 +65,7 @@ public class CmcCarExpense extends BaseEntity
     public void setCar(CmcCar car)
     {
         this.car = car;
-        this.licensePlate = car.getLicensePlate();
+        this.licensePlate = car != null ? car.getLicensePlate() : "";
     }
 
     public CmcCar getCar()

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

@@ -33,7 +33,8 @@ public class CmcContract extends BaseEntity
     /** 投标项目 */
     private String tenderId;
 
-    /** 投标项目 */
+    @Excel(name = "投标项目")
+    private String tenderName;
     private CmcTender tender;
 
     /** 合同金额 */
@@ -49,13 +50,12 @@ public class CmcContract extends BaseEntity
     private String contractDocument;
 
     /** 拟稿人 */
-    @Excel(name = "拟稿人")
     private Long drafter;
 
+    @Excel(name = "拟稿人")
+    private String draftUserName;
     private SysUser draftUser;
 
-    private SysUser managerUser;
-
     /** 拟稿日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "拟稿日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -75,7 +75,7 @@ public class CmcContract extends BaseEntity
     private String signScan;
 
     /** 评审方式 */
-    @Excel(name = "评审方式")
+    @Excel(name = "评审方式", readConverterExp = "0=无须评审,1=会议评审,2=线上会审")
     private String commentType;
 
     /** 分管审批意见 */
@@ -83,9 +83,12 @@ public class CmcContract extends BaseEntity
     private String managerComment;
 
     /** 分管审批人 */
-    @Excel(name = "分管审批人")
     private Long managerUserId;
 
+    @Excel(name = "分管审批人")
+    private String managerUserName;
+    private SysUser managerUser;
+
     /** 分管审批日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "分管审批日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -130,6 +133,7 @@ public class CmcContract extends BaseEntity
     public void setTender(CmcTender tender)
     {
         this.tender = tender;
+        this.tenderName = tender != null ? tender.getProjectName() : "";
     }
 
     public CmcTender getTender()
@@ -175,6 +179,7 @@ public class CmcContract extends BaseEntity
     public void setDraftUser(SysUser draftUser)
     {
         this.draftUser = draftUser;
+        this.draftUserName = draftUser != null ? draftUser.getNickName() : "";
     }
 
     public SysUser getDraftUser()
@@ -184,6 +189,7 @@ public class CmcContract extends BaseEntity
     public void setManagerUser(SysUser managerUser)
     {
         this.managerUser = managerUser;
+        this.managerUserName = managerUser != null ? managerUser.getNickName() : "";
     }
 
     public SysUser getManagerUser()

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

@@ -86,11 +86,13 @@ public class CmcDeviceExpense extends BaseEntity
     public void setDevice(CmcDevice device)
     {
         this.device = device;
-        this.deviceNumber = device.getDeviceNumber();
-        this.brand = device.getBrand();
-        this.series = device.getSeries();
-        this.name = device.getName();
-        this.code = device.getCode();
+        if (device != null) {
+            this.deviceNumber = device.getDeviceNumber();
+            this.brand = device.getBrand();
+            this.series = device.getSeries();
+            this.name = device.getName();
+            this.code = device.getCode();
+        }
     }
 
     public CmcDevice getDevice()
@@ -109,7 +111,7 @@ public class CmcDeviceExpense extends BaseEntity
     public void setUser(SysUser user)
     {
         this.user = user;
-        this.nickName = user.getNickName();
+        this.nickName = user != null ? user.getNickName() : "";
     }
 
     public SysUser getUser()

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

@@ -104,11 +104,13 @@ public class CmcDeviceHandover extends BaseEntity
     public void setDevice(CmcDevice device)
     {
         this.device = device;
-        this.deviceNumber = device.getDeviceNumber();
-        this.brand = device.getBrand();
-        this.series = device.getSeries();
-        this.name = device.getName();
-        this.code = device.getCode();
+        if (device != null) {
+            this.deviceNumber = device.getDeviceNumber();
+            this.brand = device.getBrand();
+            this.series = device.getSeries();
+            this.name = device.getName();
+            this.code = device.getCode();
+        }
     }
 
     public CmcDevice getDevice()
@@ -163,7 +165,7 @@ public class CmcDeviceHandover extends BaseEntity
     public void setHandoverUser(SysUser handoverUser)
     {
         this.handoverUser = handoverUser;
-        this.handoverNickName = handoverUser.getNickName();
+        this.handoverNickName = handoverUser != null ? handoverUser.getNickName() : "";
     }
 
     public SysUser getHandoverUser()
@@ -173,7 +175,7 @@ public class CmcDeviceHandover extends BaseEntity
     public void setReceiveUser(SysUser receiveUser)
     {
         this.receiveUser = receiveUser;
-        this.receiveNickName = receiveUser.getNickName();
+        this.receiveNickName = receiveUser != null ? receiveUser.getNickName() : "";
     }
 
     public SysUser getReceiveUser()
@@ -183,7 +185,7 @@ public class CmcDeviceHandover extends BaseEntity
     public void setReceiveDept(SysDept receiveDept)
     {
         this.receiveDept = receiveDept;
-        this.receiveDeptName = receiveDept.getDeptName();
+        this.receiveDeptName = receiveDept != null ? receiveDept.getDeptName() : "";
     }
 
     public SysDept getReceiveDept()
@@ -193,7 +195,7 @@ public class CmcDeviceHandover extends BaseEntity
     public void setHandoverDept(SysDept handoverDept)
     {
         this.handoverDept = handoverDept;
-        this.handoverDeptName = handoverDept.getDeptName();
+        this.handoverDeptName = handoverDept != null ? handoverDept.getDeptName() : "";
     }
 
     public SysDept getHandoverDept()

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

@@ -0,0 +1,96 @@
+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_project_change
+ * 
+ * @author cmc
+ * @date 2024-06-05
+ */
+public class CmcProjectChange extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 变更id */
+    private Long changeId;
+
+    /** 项目id */
+    @Excel(name = "项目id")
+    private String projectId;
+
+    /** 变更内容 */
+    @Excel(name = "变更内容")
+    private String content;
+
+    /** 登记人 */
+    @Excel(name = "登记人")
+    private Long registrant;
+
+    /** 登记时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "登记时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date registerTime;
+
+    public void setChangeId(Long changeId) 
+    {
+        this.changeId = changeId;
+    }
+
+    public Long getChangeId() 
+    {
+        return changeId;
+    }
+    public void setProjectId(String projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId() 
+    {
+        return projectId;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setRegistrant(Long registrant) 
+    {
+        this.registrant = registrant;
+    }
+
+    public Long getRegistrant() 
+    {
+        return registrant;
+    }
+    public void setRegisterTime(Date registerTime) 
+    {
+        this.registerTime = registerTime;
+    }
+
+    public Date getRegisterTime() 
+    {
+        return registerTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("changeId", getChangeId())
+            .append("projectId", getProjectId())
+            .append("content", getContent())
+            .append("registrant", getRegistrant())
+            .append("registerTime", getRegisterTime())
+            .toString();
+    }
+}

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

@@ -398,7 +398,7 @@ public class CmcTender extends BaseEntity
     public void setBusinessUser(SysUser businessUser)
     {
         this.businessUser = businessUser;
-        this.businessUserName = businessUser.getNickName();
+        this.businessUserName = businessUser != null ? businessUser.getNickName() : "";
     }
 
     public SysUser getBusinessUser()
@@ -408,7 +408,7 @@ public class CmcTender extends BaseEntity
     public void setTechUser(SysUser techUser)
     {
         this.techUser = techUser;
-        this.techUserName = techUser.getNickName();
+        this.techUserName = techUser != null ? techUser.getNickName() : "";
     }
 
     public SysUser getTechUser()
@@ -418,7 +418,7 @@ public class CmcTender extends BaseEntity
     public void setCombinerUser(SysUser combinerUser)
     {
         this.combinerUser = combinerUser;
-        this.combinerUserName = combinerUser.getNickName();
+        this.combinerUserName = combinerUser != null ? combinerUser.getNickName() : "";
     }
 
     public SysUser getCombinerUser()
@@ -428,7 +428,7 @@ public class CmcTender extends BaseEntity
     public void setCheckerUser(SysUser checkerUser)
     {
         this.checkerUser = checkerUser;
-        this.checkerUserName = checkerUser.getNickName();
+        this.checkerUserName = checkerUser != null ? checkerUser.getNickName() : "";
     }
 
     public SysUser getCheckerUser()
@@ -438,7 +438,7 @@ public class CmcTender extends BaseEntity
     public void setPrinterUser(SysUser printerUser)
     {
         this.printerUser = printerUser;
-        this.printerUserName = printerUser.getNickName();
+        this.printerUserName = printerUser != null ? printerUser.getNickName() : "";
     }
 
     public SysUser getPrinterUser()
@@ -448,7 +448,7 @@ public class CmcTender extends BaseEntity
     public void setTrusteeUser(SysUser trusteeUser)
     {
         this.trusteeUser = trusteeUser;
-        this.trusteeUserName = trusteeUser.getNickName();
+        this.trusteeUserName = trusteeUser != null ? trusteeUser.getNickName() : "";
     }
 
     public SysUser getTrusteeUser()
@@ -458,7 +458,7 @@ public class CmcTender extends BaseEntity
     public void setTenderDept(SysDept tenderDept)
     {
         this.tenderDept = tenderDept;
-        this.tenderDeptName = tenderDept.getDeptName();
+        this.tenderDeptName = tenderDept != null ? tenderDept.getDeptName() : "";
     }
 
     public SysDept getTenderDept()

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcProjectChange;
+
+/**
+ * cmc项目变更Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-06-05
+ */
+public interface CmcProjectChangeMapper 
+{
+    /**
+     * 查询cmc项目变更
+     * 
+     * @param changeId cmc项目变更主键
+     * @return cmc项目变更
+     */
+    public CmcProjectChange selectCmcProjectChangeByChangeId(Long changeId);
+
+    /**
+     * 查询cmc项目变更列表
+     * 
+     * @param cmcProjectChange cmc项目变更
+     * @return cmc项目变更集合
+     */
+    public List<CmcProjectChange> selectCmcProjectChangeList(CmcProjectChange cmcProjectChange);
+
+    /**
+     * 新增cmc项目变更
+     * 
+     * @param cmcProjectChange cmc项目变更
+     * @return 结果
+     */
+    public int insertCmcProjectChange(CmcProjectChange cmcProjectChange);
+
+    /**
+     * 修改cmc项目变更
+     * 
+     * @param cmcProjectChange cmc项目变更
+     * @return 结果
+     */
+    public int updateCmcProjectChange(CmcProjectChange cmcProjectChange);
+
+    /**
+     * 删除cmc项目变更
+     * 
+     * @param changeId cmc项目变更主键
+     * @return 结果
+     */
+    public int deleteCmcProjectChangeByChangeId(Long changeId);
+
+    /**
+     * 批量删除cmc项目变更
+     * 
+     * @param changeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcProjectChangeByChangeIds(Long[] changeIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcProjectChange;
+
+/**
+ * cmc项目变更Service接口
+ * 
+ * @author cmc
+ * @date 2024-06-05
+ */
+public interface ICmcProjectChangeService 
+{
+    /**
+     * 查询cmc项目变更
+     * 
+     * @param changeId cmc项目变更主键
+     * @return cmc项目变更
+     */
+    public CmcProjectChange selectCmcProjectChangeByChangeId(Long changeId);
+
+    /**
+     * 查询cmc项目变更列表
+     * 
+     * @param cmcProjectChange cmc项目变更
+     * @return cmc项目变更集合
+     */
+    public List<CmcProjectChange> selectCmcProjectChangeList(CmcProjectChange cmcProjectChange);
+
+    /**
+     * 新增cmc项目变更
+     * 
+     * @param cmcProjectChange cmc项目变更
+     * @return 结果
+     */
+    public int insertCmcProjectChange(CmcProjectChange cmcProjectChange);
+
+    /**
+     * 修改cmc项目变更
+     * 
+     * @param cmcProjectChange cmc项目变更
+     * @return 结果
+     */
+    public int updateCmcProjectChange(CmcProjectChange cmcProjectChange);
+
+    /**
+     * 批量删除cmc项目变更
+     * 
+     * @param changeIds 需要删除的cmc项目变更主键集合
+     * @return 结果
+     */
+    public int deleteCmcProjectChangeByChangeIds(Long[] changeIds);
+
+    /**
+     * 删除cmc项目变更信息
+     * 
+     * @param changeId cmc项目变更主键
+     * @return 结果
+     */
+    public int deleteCmcProjectChangeByChangeId(Long changeId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcProjectChangeServiceImpl.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.CmcProjectChangeMapper;
+import com.ruoyi.oa.domain.CmcProjectChange;
+import com.ruoyi.oa.service.ICmcProjectChangeService;
+
+/**
+ * cmc项目变更Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-06-05
+ */
+@Service
+public class CmcProjectChangeServiceImpl implements ICmcProjectChangeService 
+{
+    @Autowired
+    private CmcProjectChangeMapper cmcProjectChangeMapper;
+
+    /**
+     * 查询cmc项目变更
+     * 
+     * @param changeId cmc项目变更主键
+     * @return cmc项目变更
+     */
+    @Override
+    public CmcProjectChange selectCmcProjectChangeByChangeId(Long changeId)
+    {
+        return cmcProjectChangeMapper.selectCmcProjectChangeByChangeId(changeId);
+    }
+
+    /**
+     * 查询cmc项目变更列表
+     * 
+     * @param cmcProjectChange cmc项目变更
+     * @return cmc项目变更
+     */
+    @Override
+    public List<CmcProjectChange> selectCmcProjectChangeList(CmcProjectChange cmcProjectChange)
+    {
+        return cmcProjectChangeMapper.selectCmcProjectChangeList(cmcProjectChange);
+    }
+
+    /**
+     * 新增cmc项目变更
+     * 
+     * @param cmcProjectChange cmc项目变更
+     * @return 结果
+     */
+    @Override
+    public int insertCmcProjectChange(CmcProjectChange cmcProjectChange)
+    {
+        return cmcProjectChangeMapper.insertCmcProjectChange(cmcProjectChange);
+    }
+
+    /**
+     * 修改cmc项目变更
+     * 
+     * @param cmcProjectChange cmc项目变更
+     * @return 结果
+     */
+    @Override
+    public int updateCmcProjectChange(CmcProjectChange cmcProjectChange)
+    {
+        return cmcProjectChangeMapper.updateCmcProjectChange(cmcProjectChange);
+    }
+
+    /**
+     * 批量删除cmc项目变更
+     * 
+     * @param changeIds 需要删除的cmc项目变更主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcProjectChangeByChangeIds(Long[] changeIds)
+    {
+        return cmcProjectChangeMapper.deleteCmcProjectChangeByChangeIds(changeIds);
+    }
+
+    /**
+     * 删除cmc项目变更信息
+     * 
+     * @param changeId cmc项目变更主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcProjectChangeByChangeId(Long changeId)
+    {
+        return cmcProjectChangeMapper.deleteCmcProjectChangeByChangeId(changeId);
+    }
+}

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

@@ -0,0 +1,71 @@
+<?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.CmcProjectChangeMapper">
+    
+    <resultMap type="CmcProjectChange" id="CmcProjectChangeResult">
+        <result property="changeId"    column="change_id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="content"    column="content"    />
+        <result property="registrant"    column="registrant"    />
+        <result property="registerTime"    column="register_time"    />
+    </resultMap>
+
+    <sql id="selectCmcProjectChangeVo">
+        select change_id, project_id, content, registrant, register_time from cmc_project_change
+    </sql>
+
+    <select id="selectCmcProjectChangeList" parameterType="CmcProjectChange" resultMap="CmcProjectChangeResult">
+        <include refid="selectCmcProjectChangeVo"/>
+        <where>  
+            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="registrant != null "> and registrant = #{registrant}</if>
+            <if test="registerTime != null "> and register_time = #{registerTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcProjectChangeByChangeId" parameterType="Long" resultMap="CmcProjectChangeResult">
+        <include refid="selectCmcProjectChangeVo"/>
+        where change_id = #{changeId}
+    </select>
+        
+    <insert id="insertCmcProjectChange" parameterType="CmcProjectChange" useGeneratedKeys="true" keyProperty="changeId">
+        insert into cmc_project_change
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">project_id,</if>
+            <if test="content != null">content,</if>
+            <if test="registrant != null">registrant,</if>
+            <if test="registerTime != null">register_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">#{projectId},</if>
+            <if test="content != null">#{content},</if>
+            <if test="registrant != null">#{registrant},</if>
+            <if test="registerTime != null">#{registerTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcProjectChange" parameterType="CmcProjectChange">
+        update cmc_project_change
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="registrant != null">registrant = #{registrant},</if>
+            <if test="registerTime != null">register_time = #{registerTime},</if>
+        </trim>
+        where change_id = #{changeId}
+    </update>
+
+    <delete id="deleteCmcProjectChangeByChangeId" parameterType="Long">
+        delete from cmc_project_change where change_id = #{changeId}
+    </delete>
+
+    <delete id="deleteCmcProjectChangeByChangeIds" parameterType="String">
+        delete from cmc_project_change where change_id in 
+        <foreach item="changeId" collection="array" open="(" separator="," close=")">
+            #{changeId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deadline != null "> and deadline like concat('%', #{deadline}, '%')</if>
             <if test="finishTime != null "> and finish_time like concat('%', #{finishTime}, '%')</if>
         </where>
+        order by deadline desc
     </select>
     
     <select id="selectCmcProjectWorkListByProjectId" parameterType="String" resultMap="CmcProjectWorkResult">

oa-ui/src/api/oa/project/projectChange.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc项目变更列表
+export function listProjectChange(query) {
+  return request({
+    url: '/oa/projectChange/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc项目变更详细
+export function getProjectChange(changeId) {
+  return request({
+    url: '/oa/projectChange/' + changeId,
+    method: 'get'
+  })
+}
+
+// 新增cmc项目变更
+export function addProjectChange(data) {
+  return request({
+    url: '/oa/projectChange',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc项目变更
+export function updateProjectChange(data) {
+  return request({
+    url: '/oa/projectChange',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc项目变更
+export function delProjectChange(changeId) {
+  return request({
+    url: '/oa/projectChange/' + changeId,
+    method: 'delete'
+  })
+}