合同评审

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

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcContract;
+import com.ruoyi.oa.service.ICmcContractService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc合同评审Controller
+ * 
+ * @author cmc
+ * @date 2024-03-15
+ */
+@RestController
+@RequestMapping("/oa/contract")
+public class CmcContractController extends BaseController
+{
+    @Autowired
+    private ICmcContractService cmcContractService;
+
+    /**
+     * 查询cmc合同评审列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:contract:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CmcContract cmcContract)
+    {
+        startPage();
+        List<CmcContract> list = cmcContractService.selectCmcContractList(cmcContract);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc合同评审列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:contract:export')")
+    @Log(title = "cmc合同评审", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcContract cmcContract)
+    {
+        List<CmcContract> list = cmcContractService.selectCmcContractList(cmcContract);
+        ExcelUtil<CmcContract> util = new ExcelUtil<CmcContract>(CmcContract.class);
+        util.exportExcel(response, list, "cmc合同评审数据");
+    }
+
+    /**
+     * 获取cmc合同评审详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:contract:query')")
+    @GetMapping(value = "/{contractId}")
+    public AjaxResult getInfo(@PathVariable("contractId") String contractId)
+    {
+        return success(cmcContractService.selectCmcContractByContractId(contractId));
+    }
+
+    /**
+     * 新增cmc合同评审
+     */
+    @PreAuthorize("@ss.hasPermi('oa:contract:add')")
+    @Log(title = "cmc合同评审", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcContract cmcContract)
+    {
+        return toAjax(cmcContractService.insertCmcContract(cmcContract));
+    }
+
+    /**
+     * 修改cmc合同评审
+     */
+    @PreAuthorize("@ss.hasPermi('oa:contract:edit')")
+    @Log(title = "cmc合同评审", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcContract cmcContract)
+    {
+        return toAjax(cmcContractService.updateCmcContract(cmcContract));
+    }
+
+    /**
+     * 删除cmc合同评审
+     */
+    @PreAuthorize("@ss.hasPermi('oa:contract:remove')")
+    @Log(title = "cmc合同评审", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{contractIds}")
+    public AjaxResult remove(@PathVariable String[] contractIds)
+    {
+        return toAjax(cmcContractService.deleteCmcContractByContractIds(contractIds));
+    }
+}

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

@@ -35,7 +35,7 @@ public class SysNoticeController extends BaseController
     /**
      * 获取通知公告列表
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:list')")
+//    @PreAuthorize("@ss.hasPermi('system:notice:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysNotice notice)
     {

oa-back/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
  * @author ruoyi
  */
 @Component
-@ConfigurationProperties(prefix = "ruoyi")
+@ConfigurationProperties(prefix = "cmc")
 public class RuoYiConfig
 {
     /** 项目名称 */

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

@@ -0,0 +1,295 @@
+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_contract
+ *
+ * @author cmc
+ * @date 2024-03-15
+ */
+public class CmcContract extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 合同id（ht2024w002） */
+    private String contractId;
+
+    /** 合同编号 */
+    @Excel(name = "合同编号")
+    private String contractNumber;
+
+    /** 合同名称 */
+    @Excel(name = "合同名称")
+    private String contractName;
+
+    /** 甲方单位 */
+    @Excel(name = "甲方单位")
+    private String partyA;
+
+    /** 甲方单位联系人 */
+    @Excel(name = "甲方单位联系人")
+    private String contactPerson;
+
+    /** 甲方单位联系电话 */
+    @Excel(name = "甲方单位联系电话")
+    private String telephone;
+
+    /** 项目类型 */
+    @Excel(name = "项目类型")
+    private String projectType;
+
+    /** 项目来源（0院内、1院外） */
+    @Excel(name = "项目来源", readConverterExp = "0=院内、1院外")
+    private String projectSource;
+
+    /** 拟承担部门 */
+    @Excel(name = "拟承担部门")
+    private String undertakingDept;
+
+    /** 合同金额 */
+    @Excel(name = "合同金额")
+    private BigDecimal amount;
+
+    /** 履约保证金 */
+    @Excel(name = "履约保证金")
+    private BigDecimal deposit;
+
+    /** 合同文件 */
+    @Excel(name = "合同文件")
+    private String contractDocument;
+
+    /** 拟稿人 */
+    @Excel(name = "拟稿人")
+    private Long drafter;
+
+    /** 拟稿日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "拟稿日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date draftTime;
+
+    /** 关联项目 */
+    @Excel(name = "关联项目")
+    private String projectIds;
+
+    /** 签订日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "签订日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date signDate;
+
+    /** 签订备注 */
+    @Excel(name = "签订备注")
+    private String signRemark;
+
+    /** 签订扫描件 */
+    @Excel(name = "签订扫描件")
+    private String signScan;
+
+    /** 评审方式 */
+    @Excel(name = "评审方式")
+    private String commentType;
+
+    public void setContractId(String contractId)
+    {
+        this.contractId = contractId;
+    }
+
+    public String getContractId()
+    {
+        return contractId;
+    }
+    public void setContractNumber(String contractNumber)
+    {
+        this.contractNumber = contractNumber;
+    }
+
+    public String getContractNumber()
+    {
+        return contractNumber;
+    }
+    public void setContractName(String contractName)
+    {
+        this.contractName = contractName;
+    }
+
+    public String getContractName()
+    {
+        return contractName;
+    }
+    public void setPartyA(String partyA)
+    {
+        this.partyA = partyA;
+    }
+
+    public String getPartyA()
+    {
+        return partyA;
+    }
+    public void setContactPerson(String contactPerson)
+    {
+        this.contactPerson = contactPerson;
+    }
+
+    public String getContactPerson()
+    {
+        return contactPerson;
+    }
+    public void setTelephone(String telephone)
+    {
+        this.telephone = telephone;
+    }
+
+    public String getTelephone()
+    {
+        return telephone;
+    }
+    public void setProjectType(String projectType)
+    {
+        this.projectType = projectType;
+    }
+
+    public String getProjectType()
+    {
+        return projectType;
+    }
+    public void setProjectSource(String projectSource)
+    {
+        this.projectSource = projectSource;
+    }
+
+    public String getProjectSource()
+    {
+        return projectSource;
+    }
+    public void setUndertakingDept(String undertakingDept)
+    {
+        this.undertakingDept = undertakingDept;
+    }
+
+    public String getUndertakingDept()
+    {
+        return undertakingDept;
+    }
+    public void setAmount(BigDecimal amount)
+    {
+        this.amount = amount;
+    }
+
+    public BigDecimal getAmount()
+    {
+        return amount;
+    }
+    public void setDeposit(BigDecimal deposit)
+    {
+        this.deposit = deposit;
+    }
+
+    public BigDecimal getDeposit()
+    {
+        return deposit;
+    }
+    public void setContractDocument(String contractDocument)
+    {
+        this.contractDocument = contractDocument;
+    }
+
+    public String getContractDocument()
+    {
+        return contractDocument;
+    }
+    public void setDrafter(Long drafter)
+    {
+        this.drafter = drafter;
+    }
+
+    public Long getDrafter()
+    {
+        return drafter;
+    }
+    public void setDraftTime(Date draftTime)
+    {
+        this.draftTime = draftTime;
+    }
+
+    public Date getDraftTime()
+    {
+        return draftTime;
+    }
+    public void setProjectIds(String projectIds)
+    {
+        this.projectIds = projectIds;
+    }
+
+    public String getProjectIds()
+    {
+        return projectIds;
+    }
+    public void setSignDate(Date signDate)
+    {
+        this.signDate = signDate;
+    }
+
+    public Date getSignDate()
+    {
+        return signDate;
+    }
+    public void setSignRemark(String signRemark)
+    {
+        this.signRemark = signRemark;
+    }
+
+    public String getSignRemark()
+    {
+        return signRemark;
+    }
+    public void setSignScan(String signScan)
+    {
+        this.signScan = signScan;
+    }
+
+    public String getSignScan()
+    {
+        return signScan;
+    }
+    public void setCommentType(String commentType)
+    {
+        this.commentType = commentType;
+    }
+
+    public String getCommentType()
+    {
+        return commentType;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("contractId", getContractId())
+                .append("contractNumber", getContractNumber())
+                .append("contractName", getContractName())
+                .append("partyA", getPartyA())
+                .append("contactPerson", getContactPerson())
+                .append("telephone", getTelephone())
+                .append("projectType", getProjectType())
+                .append("projectSource", getProjectSource())
+                .append("undertakingDept", getUndertakingDept())
+                .append("amount", getAmount())
+                .append("deposit", getDeposit())
+                .append("contractDocument", getContractDocument())
+                .append("drafter", getDrafter())
+                .append("draftTime", getDraftTime())
+                .append("projectIds", getProjectIds())
+                .append("remark", getRemark())
+                .append("signDate", getSignDate())
+                .append("signRemark", getSignRemark())
+                .append("signScan", getSignScan())
+                .append("commentType", getCommentType())
+                .toString();
+    }
+}

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

@@ -0,0 +1,124 @@
+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_contract_comment
+ * 
+ * @author cmc
+ * @date 2024-03-15
+ */
+public class CmcContractComment extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 合同会审意见id */
+    private String commentId;
+
+    /** 合同id */
+    @Excel(name = "合同id")
+    private String contractId;
+
+    /** 会审部门 */
+    @Excel(name = "会审部门")
+    private Long deptId;
+
+    /** 会审人 */
+    @Excel(name = "会审人")
+    private Long userId;
+
+    /** 会审意见 */
+    @Excel(name = "会审意见")
+    private String comment;
+
+    /** 会审日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "会审日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date commentTime;
+
+    /** 是否签名 */
+    @Excel(name = "是否签名")
+    private String isSign;
+
+    public void setCommentId(String commentId) 
+    {
+        this.commentId = commentId;
+    }
+
+    public String getCommentId() 
+    {
+        return commentId;
+    }
+    public void setContractId(String contractId) 
+    {
+        this.contractId = contractId;
+    }
+
+    public String getContractId() 
+    {
+        return contractId;
+    }
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setComment(String comment) 
+    {
+        this.comment = comment;
+    }
+
+    public String getComment() 
+    {
+        return comment;
+    }
+    public void setCommentTime(Date commentTime) 
+    {
+        this.commentTime = commentTime;
+    }
+
+    public Date getCommentTime() 
+    {
+        return commentTime;
+    }
+    public void setIsSign(String isSign) 
+    {
+        this.isSign = isSign;
+    }
+
+    public String getIsSign() 
+    {
+        return isSign;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("commentId", getCommentId())
+            .append("contractId", getContractId())
+            .append("deptId", getDeptId())
+            .append("userId", getUserId())
+            .append("comment", getComment())
+            .append("commentTime", getCommentTime())
+            .append("isSign", getIsSign())
+            .toString();
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcContractPayment.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_contract_payment
+ * 
+ * @author cmc
+ * @date 2024-03-15
+ */
+public class CmcContractPayment extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 合同回款id */
+    private String paymentId;
+
+    /** 合同id */
+    @Excel(name = "合同id")
+    private String contractId;
+
+    /** 回款条件 */
+    @Excel(name = "回款条件")
+    private String paymentCondition;
+
+    /** 回款比例 */
+    @Excel(name = "回款比例")
+    private String paymentPercentage;
+
+    /** 回款金额 */
+    @Excel(name = "回款金额")
+    private String paymentAmount;
+
+    /** 回款预计时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "回款预计时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date paymentTime;
+
+    public void setPaymentId(String paymentId) 
+    {
+        this.paymentId = paymentId;
+    }
+
+    public String getPaymentId() 
+    {
+        return paymentId;
+    }
+    public void setContractId(String contractId) 
+    {
+        this.contractId = contractId;
+    }
+
+    public String getContractId() 
+    {
+        return contractId;
+    }
+    public void setPaymentCondition(String paymentCondition) 
+    {
+        this.paymentCondition = paymentCondition;
+    }
+
+    public String getPaymentCondition() 
+    {
+        return paymentCondition;
+    }
+    public void setPaymentPercentage(String paymentPercentage) 
+    {
+        this.paymentPercentage = paymentPercentage;
+    }
+
+    public String getPaymentPercentage() 
+    {
+        return paymentPercentage;
+    }
+    public void setPaymentAmount(String paymentAmount) 
+    {
+        this.paymentAmount = paymentAmount;
+    }
+
+    public String getPaymentAmount() 
+    {
+        return paymentAmount;
+    }
+    public void setPaymentTime(Date paymentTime) 
+    {
+        this.paymentTime = paymentTime;
+    }
+
+    public Date getPaymentTime() 
+    {
+        return paymentTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("paymentId", getPaymentId())
+            .append("contractId", getContractId())
+            .append("paymentCondition", getPaymentCondition())
+            .append("paymentPercentage", getPaymentPercentage())
+            .append("paymentAmount", getPaymentAmount())
+            .append("paymentTime", getPaymentTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,125 @@
+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_contract_work
+ * 
+ * @author cmc
+ * @date 2024-03-15
+ */
+public class CmcContractWork extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 工作内容id */
+    private String workId;
+
+    /** 合同id */
+    @Excel(name = "合同id")
+    private String contractId;
+
+    /** 工作内容 */
+    @Excel(name = "工作内容")
+    private String content;
+
+    /** 等级或比例尺 */
+    @Excel(name = "等级或比例尺")
+    private String scale;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    /** 工作量 */
+    @Excel(name = "工作量")
+    private String workload;
+
+    /** 要求完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "要求完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deadline;
+
+    public void setWorkId(String workId) 
+    {
+        this.workId = workId;
+    }
+
+    public String getWorkId() 
+    {
+        return workId;
+    }
+    public void setContractId(String contractId) 
+    {
+        this.contractId = contractId;
+    }
+
+    public String getContractId() 
+    {
+        return contractId;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setScale(String scale) 
+    {
+        this.scale = scale;
+    }
+
+    public String getScale() 
+    {
+        return scale;
+    }
+    public void setUnit(String unit) 
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit() 
+    {
+        return unit;
+    }
+    public void setWorkload(String workload) 
+    {
+        this.workload = workload;
+    }
+
+    public String getWorkload() 
+    {
+        return workload;
+    }
+    public void setDeadline(Date deadline) 
+    {
+        this.deadline = deadline;
+    }
+
+    public Date getDeadline() 
+    {
+        return deadline;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("workId", getWorkId())
+            .append("contractId", getContractId())
+            .append("content", getContent())
+            .append("scale", getScale())
+            .append("unit", getUnit())
+            .append("workload", getWorkload())
+            .append("deadline", getDeadline())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -54,6 +54,10 @@ public class CmcProject extends BaseEntity
     @Excel(name = "联系电话")
     private String telephone;
 
+    /** 合同编码 */
+    @Excel(name = "合同编码")
+    private String contractId;
+
     /** 项目类型 */
     @Excel(name = "项目类型")
     private String projectType;
@@ -160,6 +164,16 @@ public class CmcProject extends BaseEntity
     {
         return telephone;
     }
+    public void setContractId(String contractId)
+{
+    this.contractId = contractId;
+}
+
+    public String getContractId()
+    {
+        return contractId;
+    }
+
     public void setProjectType(String projectType)
     {
         this.projectType = projectType;
@@ -209,6 +223,7 @@ public class CmcProject extends BaseEntity
                 .append("partyA", getPartyA())
                 .append("contactPerson", getContactPerson())
                 .append("telephone", getTelephone())
+                .append("contractId", getContractId())
                 .append("projectType", getProjectType())
                 .append("projectLevel", getProjectLevel())
                 .append("projectRegistrant", getProjectRegistrant())

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcContractComment;
+
+/**
+ * cmc合同意见Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-03-15
+ */
+public interface CmcContractCommentMapper 
+{
+    /**
+     * 查询cmc合同意见
+     * 
+     * @param commentId cmc合同意见主键
+     * @return cmc合同意见
+     */
+    public CmcContractComment selectCmcContractCommentByCommentId(String commentId);
+
+    /**
+     * 查询cmc合同意见列表
+     * 
+     * @param cmcContractComment cmc合同意见
+     * @return cmc合同意见集合
+     */
+    public List<CmcContractComment> selectCmcContractCommentList(CmcContractComment cmcContractComment);
+
+    /**
+     * 新增cmc合同意见
+     * 
+     * @param cmcContractComment cmc合同意见
+     * @return 结果
+     */
+    public int insertCmcContractComment(CmcContractComment cmcContractComment);
+
+    /**
+     * 修改cmc合同意见
+     * 
+     * @param cmcContractComment cmc合同意见
+     * @return 结果
+     */
+    public int updateCmcContractComment(CmcContractComment cmcContractComment);
+
+    /**
+     * 删除cmc合同意见
+     * 
+     * @param commentId cmc合同意见主键
+     * @return 结果
+     */
+    public int deleteCmcContractCommentByCommentId(String commentId);
+
+    /**
+     * 批量删除cmc合同意见
+     * 
+     * @param commentIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcContractCommentByCommentIds(String[] commentIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcContract;
+
+/**
+ * cmc合同评审Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-03-15
+ */
+public interface CmcContractMapper 
+{
+    /**
+     * 查询cmc合同评审
+     * 
+     * @param contractId cmc合同评审主键
+     * @return cmc合同评审
+     */
+    public CmcContract selectCmcContractByContractId(String contractId);
+
+    /**
+     * 查询cmc合同评审列表
+     * 
+     * @param cmcContract cmc合同评审
+     * @return cmc合同评审集合
+     */
+    public List<CmcContract> selectCmcContractList(CmcContract cmcContract);
+
+    /**
+     * 新增cmc合同评审
+     * 
+     * @param cmcContract cmc合同评审
+     * @return 结果
+     */
+    public int insertCmcContract(CmcContract cmcContract);
+
+    /**
+     * 修改cmc合同评审
+     * 
+     * @param cmcContract cmc合同评审
+     * @return 结果
+     */
+    public int updateCmcContract(CmcContract cmcContract);
+
+    /**
+     * 删除cmc合同评审
+     * 
+     * @param contractId cmc合同评审主键
+     * @return 结果
+     */
+    public int deleteCmcContractByContractId(String contractId);
+
+    /**
+     * 批量删除cmc合同评审
+     * 
+     * @param contractIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcContractByContractIds(String[] contractIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcContractPayment;
+
+/**
+ * cmc合同回款Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-03-15
+ */
+public interface CmcContractPaymentMapper 
+{
+    /**
+     * 查询cmc合同回款
+     * 
+     * @param paymentId cmc合同回款主键
+     * @return cmc合同回款
+     */
+    public CmcContractPayment selectCmcContractPaymentByPaymentId(String paymentId);
+
+    /**
+     * 查询cmc合同回款列表
+     * 
+     * @param cmcContractPayment cmc合同回款
+     * @return cmc合同回款集合
+     */
+    public List<CmcContractPayment> selectCmcContractPaymentList(CmcContractPayment cmcContractPayment);
+
+    /**
+     * 新增cmc合同回款
+     * 
+     * @param cmcContractPayment cmc合同回款
+     * @return 结果
+     */
+    public int insertCmcContractPayment(CmcContractPayment cmcContractPayment);
+
+    /**
+     * 修改cmc合同回款
+     * 
+     * @param cmcContractPayment cmc合同回款
+     * @return 结果
+     */
+    public int updateCmcContractPayment(CmcContractPayment cmcContractPayment);
+
+    /**
+     * 删除cmc合同回款
+     * 
+     * @param paymentId cmc合同回款主键
+     * @return 结果
+     */
+    public int deleteCmcContractPaymentByPaymentId(String paymentId);
+
+    /**
+     * 批量删除cmc合同回款
+     * 
+     * @param paymentIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcContractPaymentByPaymentIds(String[] paymentIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcContractWork;
+
+/**
+ * cmc合同内容Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-03-15
+ */
+public interface CmcContractWorkMapper 
+{
+    /**
+     * 查询cmc合同内容
+     * 
+     * @param workId cmc合同内容主键
+     * @return cmc合同内容
+     */
+    public CmcContractWork selectCmcContractWorkByWorkId(String workId);
+
+    /**
+     * 查询cmc合同内容列表
+     * 
+     * @param cmcContractWork cmc合同内容
+     * @return cmc合同内容集合
+     */
+    public List<CmcContractWork> selectCmcContractWorkList(CmcContractWork cmcContractWork);
+
+    /**
+     * 新增cmc合同内容
+     * 
+     * @param cmcContractWork cmc合同内容
+     * @return 结果
+     */
+    public int insertCmcContractWork(CmcContractWork cmcContractWork);
+
+    /**
+     * 修改cmc合同内容
+     * 
+     * @param cmcContractWork cmc合同内容
+     * @return 结果
+     */
+    public int updateCmcContractWork(CmcContractWork cmcContractWork);
+
+    /**
+     * 删除cmc合同内容
+     * 
+     * @param workId cmc合同内容主键
+     * @return 结果
+     */
+    public int deleteCmcContractWorkByWorkId(String workId);
+
+    /**
+     * 批量删除cmc合同内容
+     * 
+     * @param workIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcContractWorkByWorkIds(String[] workIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcContractComment;
+
+/**
+ * cmc合同意见Service接口
+ * 
+ * @author cmc
+ * @date 2024-03-15
+ */
+public interface ICmcContractCommentService 
+{
+    /**
+     * 查询cmc合同意见
+     * 
+     * @param commentId cmc合同意见主键
+     * @return cmc合同意见
+     */
+    public CmcContractComment selectCmcContractCommentByCommentId(String commentId);
+
+    /**
+     * 查询cmc合同意见列表
+     * 
+     * @param cmcContractComment cmc合同意见
+     * @return cmc合同意见集合
+     */
+    public List<CmcContractComment> selectCmcContractCommentList(CmcContractComment cmcContractComment);
+
+    /**
+     * 新增cmc合同意见
+     * 
+     * @param cmcContractComment cmc合同意见
+     * @return 结果
+     */
+    public int insertCmcContractComment(CmcContractComment cmcContractComment);
+
+    /**
+     * 修改cmc合同意见
+     * 
+     * @param cmcContractComment cmc合同意见
+     * @return 结果
+     */
+    public int updateCmcContractComment(CmcContractComment cmcContractComment);
+
+    /**
+     * 批量删除cmc合同意见
+     * 
+     * @param commentIds 需要删除的cmc合同意见主键集合
+     * @return 结果
+     */
+    public int deleteCmcContractCommentByCommentIds(String[] commentIds);
+
+    /**
+     * 删除cmc合同意见信息
+     * 
+     * @param commentId cmc合同意见主键
+     * @return 结果
+     */
+    public int deleteCmcContractCommentByCommentId(String commentId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcContractPayment;
+
+/**
+ * cmc合同回款Service接口
+ * 
+ * @author cmc
+ * @date 2024-03-15
+ */
+public interface ICmcContractPaymentService 
+{
+    /**
+     * 查询cmc合同回款
+     * 
+     * @param paymentId cmc合同回款主键
+     * @return cmc合同回款
+     */
+    public CmcContractPayment selectCmcContractPaymentByPaymentId(String paymentId);
+
+    /**
+     * 查询cmc合同回款列表
+     * 
+     * @param cmcContractPayment cmc合同回款
+     * @return cmc合同回款集合
+     */
+    public List<CmcContractPayment> selectCmcContractPaymentList(CmcContractPayment cmcContractPayment);
+
+    /**
+     * 新增cmc合同回款
+     * 
+     * @param cmcContractPayment cmc合同回款
+     * @return 结果
+     */
+    public int insertCmcContractPayment(CmcContractPayment cmcContractPayment);
+
+    /**
+     * 修改cmc合同回款
+     * 
+     * @param cmcContractPayment cmc合同回款
+     * @return 结果
+     */
+    public int updateCmcContractPayment(CmcContractPayment cmcContractPayment);
+
+    /**
+     * 批量删除cmc合同回款
+     * 
+     * @param paymentIds 需要删除的cmc合同回款主键集合
+     * @return 结果
+     */
+    public int deleteCmcContractPaymentByPaymentIds(String[] paymentIds);
+
+    /**
+     * 删除cmc合同回款信息
+     * 
+     * @param paymentId cmc合同回款主键
+     * @return 结果
+     */
+    public int deleteCmcContractPaymentByPaymentId(String paymentId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcContract;
+
+/**
+ * cmc合同评审Service接口
+ * 
+ * @author cmc
+ * @date 2024-03-15
+ */
+public interface ICmcContractService 
+{
+    /**
+     * 查询cmc合同评审
+     * 
+     * @param contractId cmc合同评审主键
+     * @return cmc合同评审
+     */
+    public CmcContract selectCmcContractByContractId(String contractId);
+
+    /**
+     * 查询cmc合同评审列表
+     * 
+     * @param cmcContract cmc合同评审
+     * @return cmc合同评审集合
+     */
+    public List<CmcContract> selectCmcContractList(CmcContract cmcContract);
+
+    /**
+     * 新增cmc合同评审
+     * 
+     * @param cmcContract cmc合同评审
+     * @return 结果
+     */
+    public int insertCmcContract(CmcContract cmcContract);
+
+    /**
+     * 修改cmc合同评审
+     * 
+     * @param cmcContract cmc合同评审
+     * @return 结果
+     */
+    public int updateCmcContract(CmcContract cmcContract);
+
+    /**
+     * 批量删除cmc合同评审
+     * 
+     * @param contractIds 需要删除的cmc合同评审主键集合
+     * @return 结果
+     */
+    public int deleteCmcContractByContractIds(String[] contractIds);
+
+    /**
+     * 删除cmc合同评审信息
+     * 
+     * @param contractId cmc合同评审主键
+     * @return 结果
+     */
+    public int deleteCmcContractByContractId(String contractId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcContractWork;
+
+/**
+ * cmc合同内容Service接口
+ * 
+ * @author cmc
+ * @date 2024-03-15
+ */
+public interface ICmcContractWorkService 
+{
+    /**
+     * 查询cmc合同内容
+     * 
+     * @param workId cmc合同内容主键
+     * @return cmc合同内容
+     */
+    public CmcContractWork selectCmcContractWorkByWorkId(String workId);
+
+    /**
+     * 查询cmc合同内容列表
+     * 
+     * @param cmcContractWork cmc合同内容
+     * @return cmc合同内容集合
+     */
+    public List<CmcContractWork> selectCmcContractWorkList(CmcContractWork cmcContractWork);
+
+    /**
+     * 新增cmc合同内容
+     * 
+     * @param cmcContractWork cmc合同内容
+     * @return 结果
+     */
+    public int insertCmcContractWork(CmcContractWork cmcContractWork);
+
+    /**
+     * 修改cmc合同内容
+     * 
+     * @param cmcContractWork cmc合同内容
+     * @return 结果
+     */
+    public int updateCmcContractWork(CmcContractWork cmcContractWork);
+
+    /**
+     * 批量删除cmc合同内容
+     * 
+     * @param workIds 需要删除的cmc合同内容主键集合
+     * @return 结果
+     */
+    public int deleteCmcContractWorkByWorkIds(String[] workIds);
+
+    /**
+     * 删除cmc合同内容信息
+     * 
+     * @param workId cmc合同内容主键
+     * @return 结果
+     */
+    public int deleteCmcContractWorkByWorkId(String workId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcContractCommentServiceImpl.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.CmcContractCommentMapper;
+import com.ruoyi.oa.domain.CmcContractComment;
+import com.ruoyi.oa.service.ICmcContractCommentService;
+
+/**
+ * cmc合同意见Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-03-15
+ */
+@Service
+public class CmcContractCommentServiceImpl implements ICmcContractCommentService 
+{
+    @Autowired
+    private CmcContractCommentMapper cmcContractCommentMapper;
+
+    /**
+     * 查询cmc合同意见
+     * 
+     * @param commentId cmc合同意见主键
+     * @return cmc合同意见
+     */
+    @Override
+    public CmcContractComment selectCmcContractCommentByCommentId(String commentId)
+    {
+        return cmcContractCommentMapper.selectCmcContractCommentByCommentId(commentId);
+    }
+
+    /**
+     * 查询cmc合同意见列表
+     * 
+     * @param cmcContractComment cmc合同意见
+     * @return cmc合同意见
+     */
+    @Override
+    public List<CmcContractComment> selectCmcContractCommentList(CmcContractComment cmcContractComment)
+    {
+        return cmcContractCommentMapper.selectCmcContractCommentList(cmcContractComment);
+    }
+
+    /**
+     * 新增cmc合同意见
+     * 
+     * @param cmcContractComment cmc合同意见
+     * @return 结果
+     */
+    @Override
+    public int insertCmcContractComment(CmcContractComment cmcContractComment)
+    {
+        return cmcContractCommentMapper.insertCmcContractComment(cmcContractComment);
+    }
+
+    /**
+     * 修改cmc合同意见
+     * 
+     * @param cmcContractComment cmc合同意见
+     * @return 结果
+     */
+    @Override
+    public int updateCmcContractComment(CmcContractComment cmcContractComment)
+    {
+        return cmcContractCommentMapper.updateCmcContractComment(cmcContractComment);
+    }
+
+    /**
+     * 批量删除cmc合同意见
+     * 
+     * @param commentIds 需要删除的cmc合同意见主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcContractCommentByCommentIds(String[] commentIds)
+    {
+        return cmcContractCommentMapper.deleteCmcContractCommentByCommentIds(commentIds);
+    }
+
+    /**
+     * 删除cmc合同意见信息
+     * 
+     * @param commentId cmc合同意见主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcContractCommentByCommentId(String commentId)
+    {
+        return cmcContractCommentMapper.deleteCmcContractCommentByCommentId(commentId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcContractPaymentServiceImpl.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.CmcContractPaymentMapper;
+import com.ruoyi.oa.domain.CmcContractPayment;
+import com.ruoyi.oa.service.ICmcContractPaymentService;
+
+/**
+ * cmc合同回款Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-03-15
+ */
+@Service
+public class CmcContractPaymentServiceImpl implements ICmcContractPaymentService 
+{
+    @Autowired
+    private CmcContractPaymentMapper cmcContractPaymentMapper;
+
+    /**
+     * 查询cmc合同回款
+     * 
+     * @param paymentId cmc合同回款主键
+     * @return cmc合同回款
+     */
+    @Override
+    public CmcContractPayment selectCmcContractPaymentByPaymentId(String paymentId)
+    {
+        return cmcContractPaymentMapper.selectCmcContractPaymentByPaymentId(paymentId);
+    }
+
+    /**
+     * 查询cmc合同回款列表
+     * 
+     * @param cmcContractPayment cmc合同回款
+     * @return cmc合同回款
+     */
+    @Override
+    public List<CmcContractPayment> selectCmcContractPaymentList(CmcContractPayment cmcContractPayment)
+    {
+        return cmcContractPaymentMapper.selectCmcContractPaymentList(cmcContractPayment);
+    }
+
+    /**
+     * 新增cmc合同回款
+     * 
+     * @param cmcContractPayment cmc合同回款
+     * @return 结果
+     */
+    @Override
+    public int insertCmcContractPayment(CmcContractPayment cmcContractPayment)
+    {
+        return cmcContractPaymentMapper.insertCmcContractPayment(cmcContractPayment);
+    }
+
+    /**
+     * 修改cmc合同回款
+     * 
+     * @param cmcContractPayment cmc合同回款
+     * @return 结果
+     */
+    @Override
+    public int updateCmcContractPayment(CmcContractPayment cmcContractPayment)
+    {
+        return cmcContractPaymentMapper.updateCmcContractPayment(cmcContractPayment);
+    }
+
+    /**
+     * 批量删除cmc合同回款
+     * 
+     * @param paymentIds 需要删除的cmc合同回款主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcContractPaymentByPaymentIds(String[] paymentIds)
+    {
+        return cmcContractPaymentMapper.deleteCmcContractPaymentByPaymentIds(paymentIds);
+    }
+
+    /**
+     * 删除cmc合同回款信息
+     * 
+     * @param paymentId cmc合同回款主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcContractPaymentByPaymentId(String paymentId)
+    {
+        return cmcContractPaymentMapper.deleteCmcContractPaymentByPaymentId(paymentId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcContractServiceImpl.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.CmcContractMapper;
+import com.ruoyi.oa.domain.CmcContract;
+import com.ruoyi.oa.service.ICmcContractService;
+
+/**
+ * cmc合同评审Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-03-15
+ */
+@Service
+public class CmcContractServiceImpl implements ICmcContractService 
+{
+    @Autowired
+    private CmcContractMapper cmcContractMapper;
+
+    /**
+     * 查询cmc合同评审
+     * 
+     * @param contractId cmc合同评审主键
+     * @return cmc合同评审
+     */
+    @Override
+    public CmcContract selectCmcContractByContractId(String contractId)
+    {
+        return cmcContractMapper.selectCmcContractByContractId(contractId);
+    }
+
+    /**
+     * 查询cmc合同评审列表
+     * 
+     * @param cmcContract cmc合同评审
+     * @return cmc合同评审
+     */
+    @Override
+    public List<CmcContract> selectCmcContractList(CmcContract cmcContract)
+    {
+        return cmcContractMapper.selectCmcContractList(cmcContract);
+    }
+
+    /**
+     * 新增cmc合同评审
+     * 
+     * @param cmcContract cmc合同评审
+     * @return 结果
+     */
+    @Override
+    public int insertCmcContract(CmcContract cmcContract)
+    {
+        return cmcContractMapper.insertCmcContract(cmcContract);
+    }
+
+    /**
+     * 修改cmc合同评审
+     * 
+     * @param cmcContract cmc合同评审
+     * @return 结果
+     */
+    @Override
+    public int updateCmcContract(CmcContract cmcContract)
+    {
+        return cmcContractMapper.updateCmcContract(cmcContract);
+    }
+
+    /**
+     * 批量删除cmc合同评审
+     * 
+     * @param contractIds 需要删除的cmc合同评审主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcContractByContractIds(String[] contractIds)
+    {
+        return cmcContractMapper.deleteCmcContractByContractIds(contractIds);
+    }
+
+    /**
+     * 删除cmc合同评审信息
+     * 
+     * @param contractId cmc合同评审主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcContractByContractId(String contractId)
+    {
+        return cmcContractMapper.deleteCmcContractByContractId(contractId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcContractWorkServiceImpl.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.CmcContractWorkMapper;
+import com.ruoyi.oa.domain.CmcContractWork;
+import com.ruoyi.oa.service.ICmcContractWorkService;
+
+/**
+ * cmc合同内容Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-03-15
+ */
+@Service
+public class CmcContractWorkServiceImpl implements ICmcContractWorkService 
+{
+    @Autowired
+    private CmcContractWorkMapper cmcContractWorkMapper;
+
+    /**
+     * 查询cmc合同内容
+     * 
+     * @param workId cmc合同内容主键
+     * @return cmc合同内容
+     */
+    @Override
+    public CmcContractWork selectCmcContractWorkByWorkId(String workId)
+    {
+        return cmcContractWorkMapper.selectCmcContractWorkByWorkId(workId);
+    }
+
+    /**
+     * 查询cmc合同内容列表
+     * 
+     * @param cmcContractWork cmc合同内容
+     * @return cmc合同内容
+     */
+    @Override
+    public List<CmcContractWork> selectCmcContractWorkList(CmcContractWork cmcContractWork)
+    {
+        return cmcContractWorkMapper.selectCmcContractWorkList(cmcContractWork);
+    }
+
+    /**
+     * 新增cmc合同内容
+     * 
+     * @param cmcContractWork cmc合同内容
+     * @return 结果
+     */
+    @Override
+    public int insertCmcContractWork(CmcContractWork cmcContractWork)
+    {
+        return cmcContractWorkMapper.insertCmcContractWork(cmcContractWork);
+    }
+
+    /**
+     * 修改cmc合同内容
+     * 
+     * @param cmcContractWork cmc合同内容
+     * @return 结果
+     */
+    @Override
+    public int updateCmcContractWork(CmcContractWork cmcContractWork)
+    {
+        return cmcContractWorkMapper.updateCmcContractWork(cmcContractWork);
+    }
+
+    /**
+     * 批量删除cmc合同内容
+     * 
+     * @param workIds 需要删除的cmc合同内容主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcContractWorkByWorkIds(String[] workIds)
+    {
+        return cmcContractWorkMapper.deleteCmcContractWorkByWorkIds(workIds);
+    }
+
+    /**
+     * 删除cmc合同内容信息
+     * 
+     * @param workId cmc合同内容主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcContractWorkByWorkId(String workId)
+    {
+        return cmcContractWorkMapper.deleteCmcContractWorkByWorkId(workId);
+    }
+}

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

@@ -0,0 +1,83 @@
+<?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.CmcContractCommentMapper">
+    
+    <resultMap type="CmcContractComment" id="CmcContractCommentResult">
+        <result property="commentId"    column="comment_id"    />
+        <result property="contractId"    column="contract_id"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="comment"    column="comment"    />
+        <result property="commentTime"    column="comment_time"    />
+        <result property="isSign"    column="is_sign"    />
+    </resultMap>
+
+    <sql id="selectCmcContractCommentVo">
+        select comment_id, contract_id, dept_id, user_id, comment, comment_time, is_sign from cmc_contract_comment
+    </sql>
+
+    <select id="selectCmcContractCommentList" parameterType="CmcContractComment" resultMap="CmcContractCommentResult">
+        <include refid="selectCmcContractCommentVo"/>
+        <where>  
+            <if test="contractId != null  and contractId != ''"> and contract_id like concat('%', #{contractId}, '%')</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="comment != null  and comment != ''"> and comment = #{comment}</if>
+            <if test="commentTime != null "> and comment_time = #{commentTime}</if>
+            <if test="isSign != null  and isSign != ''"> and is_sign = #{isSign}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcContractCommentByCommentId" parameterType="String" resultMap="CmcContractCommentResult">
+        <include refid="selectCmcContractCommentVo"/>
+        where comment_id = #{commentId}
+    </select>
+        
+    <insert id="insertCmcContractComment" parameterType="CmcContractComment">
+        insert into cmc_contract_comment
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="commentId != null">comment_id,</if>
+            <if test="contractId != null">contract_id,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="comment != null">comment,</if>
+            <if test="commentTime != null">comment_time,</if>
+            <if test="isSign != null">is_sign,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="commentId != null">#{commentId},</if>
+            <if test="contractId != null">#{contractId},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="comment != null">#{comment},</if>
+            <if test="commentTime != null">#{commentTime},</if>
+            <if test="isSign != null">#{isSign},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcContractComment" parameterType="CmcContractComment">
+        update cmc_contract_comment
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="contractId != null">contract_id = #{contractId},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="comment != null">comment = #{comment},</if>
+            <if test="commentTime != null">comment_time = #{commentTime},</if>
+            <if test="isSign != null">is_sign = #{isSign},</if>
+        </trim>
+        where comment_id = #{commentId}
+    </update>
+
+    <delete id="deleteCmcContractCommentByCommentId" parameterType="String">
+        delete from cmc_contract_comment where comment_id = #{commentId}
+    </delete>
+
+    <delete id="deleteCmcContractCommentByCommentIds" parameterType="String">
+        delete from cmc_contract_comment where comment_id in 
+        <foreach item="commentId" collection="array" open="(" separator="," close=")">
+            #{commentId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,147 @@
+<?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.CmcContractMapper">
+
+    <resultMap type="CmcContract" id="CmcContractResult">
+        <result property="contractId"    column="contract_id"    />
+        <result property="contractNumber"    column="contract_number"    />
+        <result property="contractName"    column="contract_name"    />
+        <result property="partyA"    column="party_a"    />
+        <result property="contactPerson"    column="contact_person"    />
+        <result property="telephone"    column="telephone"    />
+        <result property="projectType"    column="project_type"    />
+        <result property="projectSource"    column="project_source"    />
+        <result property="undertakingDept"    column="undertaking_dept"    />
+        <result property="amount"    column="amount"    />
+        <result property="deposit"    column="deposit"    />
+        <result property="contractDocument"    column="contract_document"    />
+        <result property="drafter"    column="drafter"    />
+        <result property="draftTime"    column="draft_time"    />
+        <result property="projectIds"    column="project_ids"    />
+        <result property="remark"    column="remark"    />
+        <result property="signDate"    column="sign_date"    />
+        <result property="signRemark"    column="sign_remark"    />
+        <result property="signScan"    column="sign_scan"    />
+        <result property="commentType"    column="comment_type"    />
+    </resultMap>
+
+    <sql id="selectCmcContractVo">
+        select contract_id, contract_number, contract_name, party_a, contact_person, telephone, project_type, project_source, undertaking_dept, amount, deposit, contract_document, drafter, draft_time, project_ids, remark, sign_date, sign_remark, sign_scan, comment_type from cmc_contract
+    </sql>
+
+    <select id="selectCmcContractList" parameterType="CmcContract" resultMap="CmcContractResult">
+        <include refid="selectCmcContractVo"/>
+        <where>
+            <if test="contractNumber != null  and contractNumber != ''"> and contract_number like concat('%', #{contractNumber}, '%')</if>
+            <if test="contractName != null  and contractName != ''"> and contract_name like concat('%', #{contractName}, '%')</if>
+            <if test="partyA != null  and partyA != ''"> and party_a like concat('%', #{partyA}, '%')</if>
+            <if test="contactPerson != null  and contactPerson != ''"> and contact_person like concat('%', #{contactPerson}, '%')</if>
+            <if test="telephone != null  and telephone != ''"> and telephone like concat('%', #{telephone}, '%')</if>
+            <if test="projectType != null  and projectType != ''"> and project_type like concat('%', #{projectType}, '%')</if>
+            <if test="projectSource != null  and projectSource != ''"> and project_source = #{projectSource}</if>
+            <if test="undertakingDept != null  and undertakingDept != ''"> and undertaking_dept = #{undertakingDept}</if>
+            <if test="amount != null "> and amount = #{amount}</if>
+            <if test="deposit != null "> and deposit = #{deposit}</if>
+            <if test="contractDocument != null  and contractDocument != ''"> and contract_document = #{contractDocument}</if>
+            <if test="drafter != null "> and drafter = #{drafter}</if>
+            <if test="draftTime != null "> and draft_time = #{draftTime}</if>
+            <if test="projectIds != null  and projectIds != ''"> and project_ids = #{projectIds}</if>
+            <if test="signDate != null "> and sign_date = #{signDate}</if>
+            <if test="signRemark != null  and signRemark != ''"> and sign_remark = #{signRemark}</if>
+            <if test="signScan != null  and signScan != ''"> and sign_scan = #{signScan}</if>
+            <if test="commentType != null  and commentType != ''"> and comment_type = #{commentType}</if>
+        </where>
+    </select>
+
+    <select id="selectCmcContractByContractId" parameterType="String" resultMap="CmcContractResult">
+        <include refid="selectCmcContractVo"/>
+        where contract_id = #{contractId}
+    </select>
+
+    <insert id="insertCmcContract" parameterType="CmcContract">
+        insert into cmc_contract
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="contractId != null">contract_id,</if>
+            <if test="contractNumber != null">contract_number,</if>
+            <if test="contractName != null">contract_name,</if>
+            <if test="partyA != null">party_a,</if>
+            <if test="contactPerson != null">contact_person,</if>
+            <if test="telephone != null">telephone,</if>
+            <if test="projectType != null">project_type,</if>
+            <if test="projectSource != null">project_source,</if>
+            <if test="undertakingDept != null">undertaking_dept,</if>
+            <if test="amount != null">amount,</if>
+            <if test="deposit != null">deposit,</if>
+            <if test="contractDocument != null">contract_document,</if>
+            <if test="drafter != null">drafter,</if>
+            <if test="draftTime != null">draft_time,</if>
+            <if test="projectIds != null">project_ids,</if>
+            <if test="remark != null">remark,</if>
+            <if test="signDate != null">sign_date,</if>
+            <if test="signRemark != null">sign_remark,</if>
+            <if test="signScan != null">sign_scan,</if>
+            <if test="commentType != null">comment_type,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="contractId != null">#{contractId},</if>
+            <if test="contractNumber != null">#{contractNumber},</if>
+            <if test="contractName != null">#{contractName},</if>
+            <if test="partyA != null">#{partyA},</if>
+            <if test="contactPerson != null">#{contactPerson},</if>
+            <if test="telephone != null">#{telephone},</if>
+            <if test="projectType != null">#{projectType},</if>
+            <if test="projectSource != null">#{projectSource},</if>
+            <if test="undertakingDept != null">#{undertakingDept},</if>
+            <if test="amount != null">#{amount},</if>
+            <if test="deposit != null">#{deposit},</if>
+            <if test="contractDocument != null">#{contractDocument},</if>
+            <if test="drafter != null">#{drafter},</if>
+            <if test="draftTime != null">#{draftTime},</if>
+            <if test="projectIds != null">#{projectIds},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="signDate != null">#{signDate},</if>
+            <if test="signRemark != null">#{signRemark},</if>
+            <if test="signScan != null">#{signScan},</if>
+            <if test="commentType != null">#{commentType},</if>
+        </trim>
+    </insert>
+
+    <update id="updateCmcContract" parameterType="CmcContract">
+        update cmc_contract
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="contractNumber != null">contract_number = #{contractNumber},</if>
+            <if test="contractName != null">contract_name = #{contractName},</if>
+            <if test="partyA != null">party_a = #{partyA},</if>
+            <if test="contactPerson != null">contact_person = #{contactPerson},</if>
+            <if test="telephone != null">telephone = #{telephone},</if>
+            <if test="projectType != null">project_type = #{projectType},</if>
+            <if test="projectSource != null">project_source = #{projectSource},</if>
+            <if test="undertakingDept != null">undertaking_dept = #{undertakingDept},</if>
+            <if test="amount != null">amount = #{amount},</if>
+            <if test="deposit != null">deposit = #{deposit},</if>
+            <if test="contractDocument != null">contract_document = #{contractDocument},</if>
+            <if test="drafter != null">drafter = #{drafter},</if>
+            <if test="draftTime != null">draft_time = #{draftTime},</if>
+            <if test="projectIds != null">project_ids = #{projectIds},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="signDate != null">sign_date = #{signDate},</if>
+            <if test="signRemark != null">sign_remark = #{signRemark},</if>
+            <if test="signScan != null">sign_scan = #{signScan},</if>
+            <if test="commentType != null">comment_type = #{commentType},</if>
+        </trim>
+        where contract_id = #{contractId}
+    </update>
+
+    <delete id="deleteCmcContractByContractId" parameterType="String">
+        delete from cmc_contract where contract_id = #{contractId}
+    </delete>
+
+    <delete id="deleteCmcContractByContractIds" parameterType="String">
+        delete from cmc_contract where contract_id in
+        <foreach item="contractId" collection="array" open="(" separator="," close=")">
+            #{contractId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,82 @@
+<?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.CmcContractPaymentMapper">
+    
+    <resultMap type="CmcContractPayment" id="CmcContractPaymentResult">
+        <result property="paymentId"    column="payment_id"    />
+        <result property="contractId"    column="contract_id"    />
+        <result property="paymentCondition"    column="payment_condition"    />
+        <result property="paymentPercentage"    column="payment_percentage"    />
+        <result property="paymentAmount"    column="payment_amount"    />
+        <result property="paymentTime"    column="payment_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectCmcContractPaymentVo">
+        select payment_id, contract_id, payment_condition, payment_percentage, payment_amount, payment_time, remark from cmc_contract_payment
+    </sql>
+
+    <select id="selectCmcContractPaymentList" parameterType="CmcContractPayment" resultMap="CmcContractPaymentResult">
+        <include refid="selectCmcContractPaymentVo"/>
+        <where>  
+            <if test="contractId != null  and contractId != ''"> and contract_id like concat('%', #{contractId}, '%')</if>
+            <if test="paymentCondition != null  and paymentCondition != ''"> and payment_condition = #{paymentCondition}</if>
+            <if test="paymentPercentage != null  and paymentPercentage != ''"> and payment_percentage = #{paymentPercentage}</if>
+            <if test="paymentAmount != null  and paymentAmount != ''"> and payment_amount = #{paymentAmount}</if>
+            <if test="paymentTime != null "> and payment_time = #{paymentTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcContractPaymentByPaymentId" parameterType="String" resultMap="CmcContractPaymentResult">
+        <include refid="selectCmcContractPaymentVo"/>
+        where payment_id = #{paymentId}
+    </select>
+        
+    <insert id="insertCmcContractPayment" parameterType="CmcContractPayment">
+        insert into cmc_contract_payment
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="paymentId != null">payment_id,</if>
+            <if test="contractId != null">contract_id,</if>
+            <if test="paymentCondition != null">payment_condition,</if>
+            <if test="paymentPercentage != null">payment_percentage,</if>
+            <if test="paymentAmount != null">payment_amount,</if>
+            <if test="paymentTime != null">payment_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="paymentId != null">#{paymentId},</if>
+            <if test="contractId != null">#{contractId},</if>
+            <if test="paymentCondition != null">#{paymentCondition},</if>
+            <if test="paymentPercentage != null">#{paymentPercentage},</if>
+            <if test="paymentAmount != null">#{paymentAmount},</if>
+            <if test="paymentTime != null">#{paymentTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcContractPayment" parameterType="CmcContractPayment">
+        update cmc_contract_payment
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="contractId != null">contract_id = #{contractId},</if>
+            <if test="paymentCondition != null">payment_condition = #{paymentCondition},</if>
+            <if test="paymentPercentage != null">payment_percentage = #{paymentPercentage},</if>
+            <if test="paymentAmount != null">payment_amount = #{paymentAmount},</if>
+            <if test="paymentTime != null">payment_time = #{paymentTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where payment_id = #{paymentId}
+    </update>
+
+    <delete id="deleteCmcContractPaymentByPaymentId" parameterType="String">
+        delete from cmc_contract_payment where payment_id = #{paymentId}
+    </delete>
+
+    <delete id="deleteCmcContractPaymentByPaymentIds" parameterType="String">
+        delete from cmc_contract_payment where payment_id in 
+        <foreach item="paymentId" collection="array" open="(" separator="," close=")">
+            #{paymentId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.oa.mapper.CmcContractWorkMapper">
+    
+    <resultMap type="CmcContractWork" id="CmcContractWorkResult">
+        <result property="workId"    column="work_id"    />
+        <result property="contractId"    column="contract_id"    />
+        <result property="content"    column="content"    />
+        <result property="scale"    column="scale"    />
+        <result property="unit"    column="unit"    />
+        <result property="workload"    column="workload"    />
+        <result property="deadline"    column="deadline"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectCmcContractWorkVo">
+        select work_id, contract_id, content, scale, unit, workload, deadline, remark from cmc_contract_work
+    </sql>
+
+    <select id="selectCmcContractWorkList" parameterType="CmcContractWork" resultMap="CmcContractWorkResult">
+        <include refid="selectCmcContractWorkVo"/>
+        <where>  
+            <if test="contractId != null  and contractId != ''"> and contract_id like concat('%', #{contractId}, '%')</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="scale != null  and scale != ''"> and scale = #{scale}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="workload != null  and workload != ''"> and workload = #{workload}</if>
+            <if test="deadline != null "> and deadline = #{deadline}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcContractWorkByWorkId" parameterType="String" resultMap="CmcContractWorkResult">
+        <include refid="selectCmcContractWorkVo"/>
+        where work_id = #{workId}
+    </select>
+        
+    <insert id="insertCmcContractWork" parameterType="CmcContractWork">
+        insert into cmc_contract_work
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="workId != null">work_id,</if>
+            <if test="contractId != null">contract_id,</if>
+            <if test="content != null">content,</if>
+            <if test="scale != null">scale,</if>
+            <if test="unit != null">unit,</if>
+            <if test="workload != null">workload,</if>
+            <if test="deadline != null">deadline,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="workId != null">#{workId},</if>
+            <if test="contractId != null">#{contractId},</if>
+            <if test="content != null">#{content},</if>
+            <if test="scale != null">#{scale},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="workload != null">#{workload},</if>
+            <if test="deadline != null">#{deadline},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcContractWork" parameterType="CmcContractWork">
+        update cmc_contract_work
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="contractId != null">contract_id = #{contractId},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="scale != null">scale = #{scale},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="workload != null">workload = #{workload},</if>
+            <if test="deadline != null">deadline = #{deadline},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where work_id = #{workId}
+    </update>
+
+    <delete id="deleteCmcContractWorkByWorkId" parameterType="String">
+        delete from cmc_contract_work where work_id = #{workId}
+    </delete>
+
+    <delete id="deleteCmcContractWorkByWorkIds" parameterType="String">
+        delete from cmc_contract_work where work_id in 
+        <foreach item="workId" collection="array" open="(" separator="," close=")">
+            #{workId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -14,6 +14,7 @@
         <result property="partyA"    column="party_a"    />
         <result property="contactPerson"    column="contact_person"    />
         <result property="telephone"    column="telephone"    />
+        <result property="contractId"    column="contract_id"    />
         <result property="projectType"    column="project_type"    />
         <result property="projectLevel"    column="project_level"    />
         <result property="projectRegistrant"    column="project_registrant"    />
@@ -23,7 +24,7 @@
     </resultMap>
 
     <sql id="selectCmcProjectVo">
-        select project_id, project_number, project_name, project_leader, is_finished, project_source, party_a, contact_person, telephone, project_type, project_level, project_registrant, undertaking_dept, create_time, remark from cmc_project
+        select project_id, project_number, project_name, project_leader, is_finished, project_source, party_a, contact_person, telephone, contract_id, project_type, project_level, project_registrant, undertaking_dept, create_time, remark from cmc_project
     </sql>
 
     <select id="selectCmcProjectList" parameterType="CmcProject" resultMap="CmcProjectResult">
@@ -36,6 +37,7 @@
             <if test="partyA != null  and partyA != ''"> and party_a like concat('%', #{partyA}, '%')</if>
             <if test="contactPerson != null  and contactPerson != ''"> and contact_person like concat('%', #{contactPerson}, '%')</if>
             <if test="telephone != null  and telephone != ''"> and telephone like concat('%', #{telephone}, '%')</if>
+            <if test="contractId != null  and contractId != ''"> and contract_id like concat('%', #{contractId}, '%')</if>
             <if test="projectType != null  and projectType != ''"> and project_type like concat('%', #{projectType}, '%')</if>
             <if test="projectLevel != null  and projectLevel != ''"> and project_level = #{projectLevel}</if>
         </where>
@@ -58,6 +60,7 @@
             <if test="partyA != null">party_a,</if>
             <if test="contactPerson != null">contact_person,</if>
             <if test="telephone != null">telephone,</if>
+            <if test="contractId != null">contract_id,</if>
             <if test="projectType != null">project_type,</if>
             <if test="projectLevel != null">project_level,</if>
             <if test="projectRegistrant != null">project_registrant,</if>
@@ -75,6 +78,7 @@
             <if test="partyA != null">#{partyA},</if>
             <if test="contactPerson != null">#{contactPerson},</if>
             <if test="telephone != null">#{telephone},</if>
+            <if test="contractId != null">#{contractId},</if>
             <if test="projectType != null">#{projectType},</if>
             <if test="projectLevel != null">#{projectLevel},</if>
             <if test="projectRegistrant != null">#{projectRegistrant},</if>
@@ -95,6 +99,7 @@
             <if test="partyA != null">party_a = #{partyA},</if>
             <if test="contactPerson != null">contact_person = #{contactPerson},</if>
             <if test="telephone != null">telephone = #{telephone},</if>
+            <if test="contractId != null">contract_id = #{contractId},</if>
             <if test="projectType != null">project_type = #{projectType},</if>
             <if test="projectLevel != null">project_level = #{projectLevel},</if>
             <if test="projectRegistrant != null">project_registrant = #{projectRegistrant},</if>

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc合同评审列表
+export function listContract(query) {
+  return request({
+    url: '/oa/contract/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc合同评审详细
+export function getContract(contractId) {
+  return request({
+    url: '/oa/contract/' + contractId,
+    method: 'get'
+  })
+}
+
+// 新增cmc合同评审
+export function addContract(data) {
+  return request({
+    url: '/oa/contract',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc合同评审
+export function updateContract(data) {
+  return request({
+    url: '/oa/contract',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc合同评审
+export function delContract(contractId) {
+  return request({
+    url: '/oa/contract/' + contractId,
+    method: 'delete'
+  })
+}

oa-ui/src/api/oa/contract/contractComment.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc合同意见列表
+export function listContractComment(query) {
+  return request({
+    url: '/oa/contractComment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc合同意见详细
+export function getContractComment(commentId) {
+  return request({
+    url: '/oa/contractComment/' + commentId,
+    method: 'get'
+  })
+}
+
+// 新增cmc合同意见
+export function addContractComment(data) {
+  return request({
+    url: '/oa/contractComment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc合同意见
+export function updateContractComment(data) {
+  return request({
+    url: '/oa/contractComment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc合同意见
+export function delContractComment(commentId) {
+  return request({
+    url: '/oa/contractComment/' + commentId,
+    method: 'delete'
+  })
+}

oa-ui/src/api/oa/contract/contractPayment.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc合同回款列表
+export function listContractPayment(query) {
+  return request({
+    url: '/oa/contractPayment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc合同回款详细
+export function getContractPayment(paymentId) {
+  return request({
+    url: '/oa/contractPayment/' + paymentId,
+    method: 'get'
+  })
+}
+
+// 新增cmc合同回款
+export function addContractPayment(data) {
+  return request({
+    url: '/oa/contractPayment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc合同回款
+export function updateContractPayment(data) {
+  return request({
+    url: '/oa/contractPayment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc合同回款
+export function delContractPayment(paymentId) {
+  return request({
+    url: '/oa/contractPayment/' + paymentId,
+    method: 'delete'
+  })
+}

oa-ui/src/api/oa/contract/contractWork.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc合同内容列表
+export function listContractWork(query) {
+  return request({
+    url: '/oa/contractWork/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc合同内容详细
+export function getContractWork(workId) {
+  return request({
+    url: '/oa/contractWork/' + workId,
+    method: 'get'
+  })
+}
+
+// 新增cmc合同内容
+export function addContractWork(data) {
+  return request({
+    url: '/oa/contractWork',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc合同内容
+export function updateContractWork(data) {
+  return request({
+    url: '/oa/contractWork',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc合同内容
+export function delContractWork(workId) {
+  return request({
+    url: '/oa/contractWork/' + workId,
+    method: 'delete'
+  })
+}

oa-ui/src/views/oa/contract/comment.vue

@@ -0,0 +1,324 @@
+<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="contractId">
+        <el-input
+          v-model="queryParams.contractId"
+          placeholder="请输入合同id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="会审部门" prop="deptId">
+        <el-input
+          v-model="queryParams.deptId"
+          placeholder="请输入会审部门"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="会审人" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入会审人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="会审意见" prop="comment">
+        <el-input
+          v-model="queryParams.comment"
+          placeholder="请输入会审意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="会审日期" prop="commentTime">
+        <el-date-picker clearable
+          v-model="queryParams.commentTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择会审日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="是否签名" prop="isSign">
+        <el-input
+          v-model="queryParams.isSign"
+          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:contractComment: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:contractComment: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:contractComment: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:contractComment:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="contractCommentList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="合同会审意见id" align="center" prop="commentId" />
+      <el-table-column label="合同id" align="center" prop="contractId" />
+      <el-table-column label="会审部门" align="center" prop="deptId" />
+      <el-table-column label="会审人" align="center" prop="userId" />
+      <el-table-column label="会审意见" align="center" prop="comment" />
+      <el-table-column label="会审日期" align="center" prop="commentTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.commentTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否签名" align="center" prop="isSign" />
+      <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:contractComment:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:contractComment: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="contractId">
+          <el-input v-model="form.contractId" placeholder="请输入合同id" />
+        </el-form-item>
+        <el-form-item label="会审部门" prop="deptId">
+          <el-input v-model="form.deptId" placeholder="请输入会审部门" />
+        </el-form-item>
+        <el-form-item label="会审人" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入会审人" />
+        </el-form-item>
+        <el-form-item label="会审意见" prop="comment">
+          <el-input v-model="form.comment" placeholder="请输入会审意见" />
+        </el-form-item>
+        <el-form-item label="会审日期" prop="commentTime">
+          <el-date-picker clearable
+            v-model="form.commentTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择会审日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="是否签名" prop="isSign">
+          <el-input v-model="form.isSign" 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 { listContractComment, getContractComment, delContractComment, addContractComment, updateContractComment } from "@/api/oa/contract/contractComment";
+
+export default {
+  name: "ContractComment",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc合同意见表格数据
+      contractCommentList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        contractId: null,
+        deptId: null,
+        userId: null,
+        comment: null,
+        commentTime: null,
+        isSign: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc合同意见列表 */
+    getList() {
+      this.loading = true;
+      listContractComment(this.queryParams).then(response => {
+        this.contractCommentList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        commentId: null,
+        contractId: null,
+        deptId: null,
+        userId: null,
+        comment: null,
+        commentTime: null,
+        isSign: 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.commentId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc合同意见";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const commentId = row.commentId || this.ids
+      getContractComment(commentId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc合同意见";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.commentId != null) {
+            updateContractComment(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addContractComment(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const commentIds = row.commentId || this.ids;
+      this.$modal.confirm('是否确认删除cmc合同意见编号为"' + commentIds + '"的数据项？').then(function() {
+        return delContractComment(commentIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/contractComment/export', {
+        ...this.queryParams
+      }, `contractComment_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -0,0 +1,481 @@
+<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="contractNumber">
+        <el-input
+          v-model="queryParams.contractNumber"
+          placeholder="请输入合同编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="合同名称" prop="contractName">
+        <el-input
+          v-model="queryParams.contractName"
+          placeholder="请输入合同名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="甲方单位" prop="partyA">
+        <el-input
+          v-model="queryParams.partyA"
+          placeholder="请输入甲方单位"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="甲方单位联系人" prop="contactPerson">
+        <el-input
+          v-model="queryParams.contactPerson"
+          placeholder="请输入甲方单位联系人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="甲方单位联系电话" prop="telephone">
+        <el-input
+          v-model="queryParams.telephone"
+          placeholder="请输入甲方单位联系电话"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目来源" prop="projectSource">
+        <el-input
+          v-model="queryParams.projectSource"
+          placeholder="请输入项目来源"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="拟承担部门" prop="undertakingDept">
+        <el-input
+          v-model="queryParams.undertakingDept"
+          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="deposit">
+        <el-input
+          v-model="queryParams.deposit"
+          placeholder="请输入履约保证金"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="合同文件" prop="contractDocument">
+        <el-input
+          v-model="queryParams.contractDocument"
+          placeholder="请输入合同文件"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="拟稿人" prop="drafter">
+        <el-input
+          v-model="queryParams.drafter"
+          placeholder="请输入拟稿人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="拟稿日期" prop="draftTime">
+        <el-date-picker clearable
+          v-model="queryParams.draftTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择拟稿日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="关联项目" prop="projectIds">
+        <el-input
+          v-model="queryParams.projectIds"
+          placeholder="请输入关联项目"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="签订日期" prop="signDate">
+        <el-date-picker clearable
+          v-model="queryParams.signDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择签订日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="签订备注" prop="signRemark">
+        <el-input
+          v-model="queryParams.signRemark"
+          placeholder="请输入签订备注"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="签订扫描件" prop="signScan">
+        <el-input
+          v-model="queryParams.signScan"
+          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:contract: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:contract: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:contract: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:contract:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="contractList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="合同id" align="center" prop="contractId" />
+      <el-table-column label="合同编号" align="center" prop="contractNumber" />
+      <el-table-column label="合同名称" align="center" prop="contractName" />
+      <el-table-column label="甲方单位" align="center" prop="partyA" />
+      <el-table-column label="甲方单位联系人" align="center" prop="contactPerson" />
+      <el-table-column label="甲方单位联系电话" align="center" prop="telephone" />
+      <el-table-column label="项目类型" align="center" prop="projectType" />
+      <el-table-column label="项目来源" align="center" prop="projectSource" />
+      <el-table-column label="拟承担部门" align="center" prop="undertakingDept" />
+      <el-table-column label="合同金额" align="center" prop="amount" />
+      <el-table-column label="履约保证金" align="center" prop="deposit" />
+      <el-table-column label="合同文件" align="center" prop="contractDocument" />
+      <el-table-column label="拟稿人" align="center" prop="drafter" />
+      <el-table-column label="拟稿日期" align="center" prop="draftTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.draftTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="关联项目" align="center" prop="projectIds" />
+      <el-table-column label="合同备注" align="center" prop="remark" />
+      <el-table-column label="签订日期" align="center" prop="signDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.signDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="签订备注" align="center" prop="signRemark" />
+      <el-table-column label="签订扫描件" align="center" prop="signScan" />
+      <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:contract:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:contract: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="contractNumber">
+          <el-input v-model="form.contractNumber" placeholder="请输入合同编号" />
+        </el-form-item>
+        <el-form-item label="合同名称" prop="contractName">
+          <el-input v-model="form.contractName" placeholder="请输入合同名称" />
+        </el-form-item>
+        <el-form-item label="甲方单位" prop="partyA">
+          <el-input v-model="form.partyA" placeholder="请输入甲方单位" />
+        </el-form-item>
+        <el-form-item label="甲方单位联系人" prop="contactPerson">
+          <el-input v-model="form.contactPerson" placeholder="请输入甲方单位联系人" />
+        </el-form-item>
+        <el-form-item label="甲方单位联系电话" prop="telephone">
+          <el-input v-model="form.telephone" placeholder="请输入甲方单位联系电话" />
+        </el-form-item>
+        <el-form-item label="项目来源" prop="projectSource">
+          <el-input v-model="form.projectSource" placeholder="请输入项目来源" />
+        </el-form-item>
+        <el-form-item label="拟承担部门" prop="undertakingDept">
+          <el-input v-model="form.undertakingDept" 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="deposit">
+          <el-input v-model="form.deposit" placeholder="请输入履约保证金" />
+        </el-form-item>
+        <el-form-item label="合同文件" prop="contractDocument">
+          <el-input v-model="form.contractDocument" placeholder="请输入合同文件" />
+        </el-form-item>
+        <el-form-item label="拟稿人" prop="drafter">
+          <el-input v-model="form.drafter" placeholder="请输入拟稿人" />
+        </el-form-item>
+        <el-form-item label="拟稿日期" prop="draftTime">
+          <el-date-picker clearable
+            v-model="form.draftTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择拟稿日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="关联项目" prop="projectIds">
+          <el-input v-model="form.projectIds" placeholder="请输入关联项目" />
+        </el-form-item>
+        <el-form-item label="合同备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入合同备注" />
+        </el-form-item>
+        <el-form-item label="签订日期" prop="signDate">
+          <el-date-picker clearable
+            v-model="form.signDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择签订日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="签订备注" prop="signRemark">
+          <el-input v-model="form.signRemark" placeholder="请输入签订备注" />
+        </el-form-item>
+        <el-form-item label="签订扫描件" prop="signScan">
+          <el-input v-model="form.signScan" 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 { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
+
+export default {
+  name: "Contract",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc合同评审表格数据
+      contractList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        contractNumber: null,
+        contractName: null,
+        partyA: null,
+        contactPerson: null,
+        telephone: null,
+        projectType: null,
+        projectSource: null,
+        undertakingDept: null,
+        amount: null,
+        deposit: null,
+        contractDocument: null,
+        drafter: null,
+        draftTime: null,
+        projectIds: null,
+        signDate: null,
+        signRemark: null,
+        signScan: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc合同评审列表 */
+    getList() {
+      this.loading = true;
+      listContract(this.queryParams).then(response => {
+        this.contractList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        contractId: null,
+        contractNumber: null,
+        contractName: null,
+        partyA: null,
+        contactPerson: null,
+        telephone: null,
+        projectType: null,
+        projectSource: null,
+        undertakingDept: null,
+        amount: null,
+        deposit: null,
+        contractDocument: null,
+        drafter: null,
+        draftTime: null,
+        projectIds: null,
+        remark: null,
+        signDate: null,
+        signRemark: null,
+        signScan: 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.contractId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc合同评审";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const contractId = row.contractId || this.ids
+      getContract(contractId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc合同评审";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.contractId != null) {
+            updateContract(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addContract(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const contractIds = row.contractId || this.ids;
+      this.$modal.confirm('是否确认删除cmc合同评审编号为"' + contractIds + '"的数据项？').then(function() {
+        return delContract(contractIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/contract/export', {
+        ...this.queryParams
+      }, `contract_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

oa-ui/src/views/oa/contract/payment.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="contractId">
+        <el-input
+          v-model="queryParams.contractId"
+          placeholder="请输入合同id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="回款条件" prop="paymentCondition">
+        <el-input
+          v-model="queryParams.paymentCondition"
+          placeholder="请输入回款条件"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="回款比例" prop="paymentPercentage">
+        <el-input
+          v-model="queryParams.paymentPercentage"
+          placeholder="请输入回款比例"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="回款金额" prop="paymentAmount">
+        <el-input
+          v-model="queryParams.paymentAmount"
+          placeholder="请输入回款金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="回款预计时间" prop="paymentTime">
+        <el-date-picker clearable
+          v-model="queryParams.paymentTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择回款预计时间">
+        </el-date-picker>
+      </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:contractPayment: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:contractPayment: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:contractPayment: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:contractPayment:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="contractPaymentList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="合同回款id" align="center" prop="paymentId" />
+      <el-table-column label="合同id" align="center" prop="contractId" />
+      <el-table-column label="回款条件" align="center" prop="paymentCondition" />
+      <el-table-column label="回款比例" align="center" prop="paymentPercentage" />
+      <el-table-column label="回款金额" align="center" prop="paymentAmount" />
+      <el-table-column label="回款预计时间" align="center" prop="paymentTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.paymentTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <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:contractPayment:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:contractPayment: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="contractId">
+          <el-input v-model="form.contractId" placeholder="请输入合同id" />
+        </el-form-item>
+        <el-form-item label="回款条件" prop="paymentCondition">
+          <el-input v-model="form.paymentCondition" placeholder="请输入回款条件" />
+        </el-form-item>
+        <el-form-item label="回款比例" prop="paymentPercentage">
+          <el-input v-model="form.paymentPercentage" placeholder="请输入回款比例" />
+        </el-form-item>
+        <el-form-item label="回款金额" prop="paymentAmount">
+          <el-input v-model="form.paymentAmount" placeholder="请输入回款金额" />
+        </el-form-item>
+        <el-form-item label="回款预计时间" prop="paymentTime">
+          <el-date-picker clearable
+            v-model="form.paymentTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择回款预计时间">
+          </el-date-picker>
+        </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 { listContractPayment, getContractPayment, delContractPayment, addContractPayment, updateContractPayment } from "@/api/oa/contract/contractPayment";
+
+export default {
+  name: "ContractPayment",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc合同回款表格数据
+      contractPaymentList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        contractId: null,
+        paymentCondition: null,
+        paymentPercentage: null,
+        paymentAmount: null,
+        paymentTime: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc合同回款列表 */
+    getList() {
+      this.loading = true;
+      listContractPayment(this.queryParams).then(response => {
+        this.contractPaymentList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        paymentId: null,
+        contractId: null,
+        paymentCondition: null,
+        paymentPercentage: null,
+        paymentAmount: null,
+        paymentTime: 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.paymentId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc合同回款";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const paymentId = row.paymentId || this.ids
+      getContractPayment(paymentId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc合同回款";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.paymentId != null) {
+            updateContractPayment(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addContractPayment(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const paymentIds = row.paymentId || this.ids;
+      this.$modal.confirm('是否确认删除cmc合同回款编号为"' + paymentIds + '"的数据项？').then(function() {
+        return delContractPayment(paymentIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/contractPayment/export', {
+        ...this.queryParams
+      }, `contractPayment_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

oa-ui/src/views/oa/contract/work.vue

@@ -0,0 +1,321 @@
+<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="contractId">
+        <el-input
+          v-model="queryParams.contractId"
+          placeholder="请输入合同id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="等级或比例尺" prop="scale">
+        <el-input
+          v-model="queryParams.scale"
+          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 label="工作量" prop="workload">
+        <el-input
+          v-model="queryParams.workload"
+          placeholder="请输入工作量"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="要求完成时间" prop="deadline">
+        <el-date-picker clearable
+          v-model="queryParams.deadline"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择要求完成时间">
+        </el-date-picker>
+      </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:contractWork: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:contractWork: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:contractWork: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:contractWork:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="contractWorkList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="工作内容id" align="center" prop="workId" />
+      <el-table-column label="合同id" align="center" prop="contractId" />
+      <el-table-column label="工作内容" align="center" prop="content" />
+      <el-table-column label="等级或比例尺" align="center" prop="scale" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="工作量" align="center" prop="workload" />
+      <el-table-column label="要求完成时间" align="center" prop="deadline" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.deadline, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <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:contractWork:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:contractWork: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="contractId">
+          <el-input v-model="form.contractId" placeholder="请输入合同id" />
+        </el-form-item>
+        <el-form-item label="工作内容">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="等级或比例尺" prop="scale">
+          <el-input v-model="form.scale" 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="workload">
+          <el-input v-model="form.workload" placeholder="请输入工作量" />
+        </el-form-item>
+        <el-form-item label="要求完成时间" prop="deadline">
+          <el-date-picker clearable
+            v-model="form.deadline"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择要求完成时间">
+          </el-date-picker>
+        </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 { listContractWork, getContractWork, delContractWork, addContractWork, updateContractWork } from "@/api/oa/contract/contractWork";
+
+export default {
+  name: "ContractWork",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc合同内容表格数据
+      contractWorkList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        contractId: null,
+        content: null,
+        scale: null,
+        unit: null,
+        workload: null,
+        deadline: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc合同内容列表 */
+    getList() {
+      this.loading = true;
+      listContractWork(this.queryParams).then(response => {
+        this.contractWorkList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        workId: null,
+        contractId: null,
+        content: null,
+        scale: null,
+        unit: null,
+        workload: null,
+        deadline: 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.workId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc合同内容";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const workId = row.workId || this.ids
+      getContractWork(workId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc合同内容";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.workId != null) {
+            updateContractWork(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addContractWork(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const workIds = row.workId || this.ids;
+      this.$modal.confirm('是否确认删除cmc合同内容编号为"' + workIds + '"的数据项？').then(function() {
+        return delContractWork(workIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/contractWork/export', {
+        ...this.queryParams
+      }, `contractWork_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>