合同相关表

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcPartnerController.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.CmcPartner;
+import com.ruoyi.oa.service.ICmcPartnerService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc合作单位Controller
+ * 
+ * @author cmc
+ * @date 2024-04-18
+ */
+@RestController
+@RequestMapping("/oa/partner")
+public class CmcPartnerController extends BaseController
+{
+    @Autowired
+    private ICmcPartnerService cmcPartnerService;
+
+    /**
+     * 查询cmc合作单位列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:partner:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CmcPartner cmcPartner)
+    {
+        startPage();
+        List<CmcPartner> list = cmcPartnerService.selectCmcPartnerList(cmcPartner);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc合作单位列表
+     */
+    @PreAuthorize("@ss.hasPermi('oa:partner:export')")
+    @Log(title = "cmc合作单位", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcPartner cmcPartner)
+    {
+        List<CmcPartner> list = cmcPartnerService.selectCmcPartnerList(cmcPartner);
+        ExcelUtil<CmcPartner> util = new ExcelUtil<CmcPartner>(CmcPartner.class);
+        util.exportExcel(response, list, "cmc合作单位数据");
+    }
+
+    /**
+     * 获取cmc合作单位详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('oa:partner:query')")
+    @GetMapping(value = "/{partnerId}")
+    public AjaxResult getInfo(@PathVariable("partnerId") String partnerId)
+    {
+        return success(cmcPartnerService.selectCmcPartnerByPartnerId(partnerId));
+    }
+
+    /**
+     * 新增cmc合作单位
+     */
+    @PreAuthorize("@ss.hasPermi('oa:partner:add')")
+    @Log(title = "cmc合作单位", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcPartner cmcPartner)
+    {
+        return toAjax(cmcPartnerService.insertCmcPartner(cmcPartner));
+    }
+
+    /**
+     * 修改cmc合作单位
+     */
+    @PreAuthorize("@ss.hasPermi('oa:partner:edit')")
+    @Log(title = "cmc合作单位", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcPartner cmcPartner)
+    {
+        return toAjax(cmcPartnerService.updateCmcPartner(cmcPartner));
+    }
+
+    /**
+     * 删除cmc合作单位
+     */
+    @PreAuthorize("@ss.hasPermi('oa:partner:remove')")
+    @Log(title = "cmc合作单位", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{partnerIds}")
+    public AjaxResult remove(@PathVariable String[] partnerIds)
+    {
+        return toAjax(cmcPartnerService.deleteCmcPartnerByPartnerIds(partnerIds));
+    }
+}

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

@@ -0,0 +1,98 @@
+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.CmcSubContract;
+import com.ruoyi.oa.service.ICmcSubContractService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc分包合同评审Controller
+ * 
+ * @author cmc
+ * @date 2024-04-18
+ */
+@RestController
+@RequestMapping("/oa/subContract")
+public class CmcSubContractController extends BaseController
+{
+    @Autowired
+    private ICmcSubContractService cmcSubContractService;
+
+    /**
+     * 查询cmc分包合同评审列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcSubContract cmcSubContract)
+    {
+        startPage();
+        List<CmcSubContract> list = cmcSubContractService.selectCmcSubContractList(cmcSubContract);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc分包合同评审列表
+     */
+    @Log(title = "cmc分包合同评审", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcSubContract cmcSubContract)
+    {
+        List<CmcSubContract> list = cmcSubContractService.selectCmcSubContractList(cmcSubContract);
+        ExcelUtil<CmcSubContract> util = new ExcelUtil<CmcSubContract>(CmcSubContract.class);
+        util.exportExcel(response, list, "cmc分包合同评审数据");
+    }
+
+    /**
+     * 获取cmc分包合同评审详细信息
+     */
+    @GetMapping(value = "/{subContractId}")
+    public AjaxResult getInfo(@PathVariable("subContractId") String subContractId)
+    {
+        return success(cmcSubContractService.selectCmcSubContractBySubContractId(subContractId));
+    }
+
+    /**
+     * 新增cmc分包合同评审
+     */
+    @Log(title = "cmc分包合同评审", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcSubContract cmcSubContract)
+    {
+        return toAjax(cmcSubContractService.insertCmcSubContract(cmcSubContract));
+    }
+
+    /**
+     * 修改cmc分包合同评审
+     */
+    @Log(title = "cmc分包合同评审", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcSubContract cmcSubContract)
+    {
+        return toAjax(cmcSubContractService.updateCmcSubContract(cmcSubContract));
+    }
+
+    /**
+     * 删除cmc分包合同评审
+     */
+    @Log(title = "cmc分包合同评审", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{subContractIds}")
+    public AjaxResult remove(@PathVariable String[] subContractIds)
+    {
+        return toAjax(cmcSubContractService.deleteCmcSubContractBySubContractIds(subContractIds));
+    }
+}

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

@@ -12,7 +12,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * cmc合同评审对象 cmc_contract
  *
  * @author cmc
- * @date 2024-03-15
+ * @date 2024-04-18
  */
 public class CmcContract extends BaseEntity
 {
@@ -25,33 +25,8 @@ public class CmcContract extends BaseEntity
     @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;
+    /** 项目组 */
+    private String[] projectIds;
 
     /** 合同金额 */
     @Excel(name = "合同金额")
@@ -74,10 +49,6 @@ public class CmcContract extends BaseEntity
     @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")
@@ -113,69 +84,16 @@ public class CmcContract extends BaseEntity
     {
         return contractNumber;
     }
-    public void setContractName(String contractName)
-    {
-        this.contractName = contractName;
-    }
-
-    public String getContractName()
-    {
-        return contractName;
-    }
-    public void setPartyA(String partyA)
+    public void setProjectIds(String[] projectIds)
     {
-        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;
+        this.projectIds = projectIds;
     }
 
-    public String getProjectSource()
-    {
-        return projectSource;
-    }
-    public void setUndertakingDept(String undertakingDept)
+    public String[] getProjectIds()
     {
-        this.undertakingDept = undertakingDept;
+        return projectIds;
     }
 
-    public String getUndertakingDept()
-    {
-        return undertakingDept;
-    }
     public void setAmount(BigDecimal amount)
     {
         this.amount = amount;
@@ -221,15 +139,6 @@ public class CmcContract extends BaseEntity
     {
         return draftTime;
     }
-    public void setProjectIds(String projectIds)
-    {
-        this.projectIds = projectIds;
-    }
-
-    public String getProjectIds()
-    {
-        return projectIds;
-    }
     public void setSignDate(Date signDate)
     {
         this.signDate = signDate;
@@ -272,19 +181,11 @@ public class CmcContract extends BaseEntity
         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())

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

@@ -36,6 +36,10 @@ public class CmcContractComment extends BaseEntity
     @Excel(name = "会审意见")
     private String comment;
 
+    /** 会审附件 */
+    @Excel(name = "会审附件")
+    private String document;
+
     /** 会审日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "会审日期", width = 30, dateFormat = "yyyy-MM-dd")

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

@@ -9,9 +9,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * cmc合同回款对象 cmc_contract_payment
- * 
+ *
  * @author cmc
- * @date 2024-03-15
+ * @date 2024-04-18
  */
 public class CmcContractPayment extends BaseEntity
 {
@@ -24,6 +24,10 @@ public class CmcContractPayment extends BaseEntity
     @Excel(name = "合同id")
     private String contractId;
 
+    /** 分包合同id */
+    @Excel(name = "分包合同id")
+    private String subContractId;
+
     /** 回款条件 */
     @Excel(name = "回款条件")
     private String paymentCondition;
@@ -41,57 +45,66 @@ public class CmcContractPayment extends BaseEntity
     @Excel(name = "回款预计时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date paymentTime;
 
-    public void setPaymentId(String paymentId) 
+    public void setPaymentId(String paymentId)
     {
         this.paymentId = paymentId;
     }
 
-    public String getPaymentId() 
+    public String getPaymentId()
     {
         return paymentId;
     }
-    public void setContractId(String contractId) 
+    public void setContractId(String contractId)
     {
         this.contractId = contractId;
     }
 
-    public String getContractId() 
+    public String getContractId()
     {
         return contractId;
     }
-    public void setPaymentCondition(String paymentCondition) 
+    public void setSubContractId(String subContractId)
+    {
+        this.subContractId = subContractId;
+    }
+
+    public String getSubContractId()
+    {
+        return subContractId;
+    }
+    public void setPaymentCondition(String paymentCondition)
     {
         this.paymentCondition = paymentCondition;
     }
 
-    public String getPaymentCondition() 
+    public String getPaymentCondition()
     {
         return paymentCondition;
     }
-    public void setPaymentPercentage(String paymentPercentage) 
+    public void setPaymentPercentage(String paymentPercentage)
     {
         this.paymentPercentage = paymentPercentage;
     }
 
-    public String getPaymentPercentage() 
+    public String getPaymentPercentage()
     {
         return paymentPercentage;
     }
-    public void setPaymentAmount(String paymentAmount) 
+    public void setPaymentAmount(String paymentAmount)
     {
         this.paymentAmount = paymentAmount;
     }
 
-    public String getPaymentAmount() 
+    public String getPaymentAmount()
     {
         return paymentAmount;
     }
-    public void setPaymentTime(Date paymentTime) 
+    public void setPaymentTime(Date paymentTime)
     {
         this.paymentTime = paymentTime;
     }
 
-    public Date getPaymentTime() 
+    public Date getPaymentTime()
     {
         return paymentTime;
     }
@@ -99,13 +112,14 @@ public class CmcContractPayment extends BaseEntity
     @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();
+                .append("paymentId", getPaymentId())
+                .append("contractId", getContractId())
+                .append("subContractId", getSubContractId())
+                .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

@@ -9,9 +9,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * cmc合同内容对象 cmc_contract_work
- * 
+ *
  * @author cmc
- * @date 2024-03-15
+ * @date 2024-04-18
  */
 public class CmcContractWork extends BaseEntity
 {
@@ -24,6 +24,10 @@ public class CmcContractWork extends BaseEntity
     @Excel(name = "合同id")
     private String contractId;
 
+    /** 分包合同id */
+    @Excel(name = "分包合同id")
+    private String subContractId;
+
     /** 工作内容 */
     @Excel(name = "工作内容")
     private String content;
@@ -45,66 +49,75 @@ public class CmcContractWork extends BaseEntity
     @Excel(name = "要求完成时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date deadline;
 
-    public void setWorkId(String workId) 
+    public void setWorkId(String workId)
     {
         this.workId = workId;
     }
 
-    public String getWorkId() 
+    public String getWorkId()
     {
         return workId;
     }
-    public void setContractId(String contractId) 
+    public void setContractId(String contractId)
     {
         this.contractId = contractId;
     }
 
-    public String getContractId() 
+    public String getContractId()
     {
         return contractId;
     }
-    public void setContent(String content) 
+    public void setSubContractId(String subContractId)
+    {
+        this.subContractId = subContractId;
+    }
+
+    public String getSubContractId()
+    {
+        return subContractId;
+    }
+    public void setContent(String content)
     {
         this.content = content;
     }
 
-    public String getContent() 
+    public String getContent()
     {
         return content;
     }
-    public void setScale(String scale) 
+    public void setScale(String scale)
     {
         this.scale = scale;
     }
 
-    public String getScale() 
+    public String getScale()
     {
         return scale;
     }
-    public void setUnit(String unit) 
+    public void setUnit(String unit)
     {
         this.unit = unit;
     }
 
-    public String getUnit() 
+    public String getUnit()
     {
         return unit;
     }
-    public void setWorkload(String workload) 
+    public void setWorkload(String workload)
     {
         this.workload = workload;
     }
 
-    public String getWorkload() 
+    public String getWorkload()
     {
         return workload;
     }
-    public void setDeadline(Date deadline) 
+    public void setDeadline(Date deadline)
     {
         this.deadline = deadline;
     }
 
-    public Date getDeadline() 
+    public Date getDeadline()
     {
         return deadline;
     }
@@ -112,14 +125,15 @@ public class CmcContractWork extends BaseEntity
     @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();
+                .append("workId", getWorkId())
+                .append("contractId", getContractId())
+                .append("subContractId", getSubContractId())
+                .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/CmcPartner.java

@@ -0,0 +1,51 @@
+package com.ruoyi.oa.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * cmc合作单位对象 cmc_partner
+ * 
+ * @author cmc
+ * @date 2024-04-18
+ */
+public class CmcPartner extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 合作单位id */
+    private String partnerId;
+
+    /** 单位名称 */
+    @Excel(name = "单位名称")
+    private String partnerName;
+
+    public void setPartnerId(String partnerId) 
+    {
+        this.partnerId = partnerId;
+    }
+
+    public String getPartnerId() 
+    {
+        return partnerId;
+    }
+    public void setPartnerName(String partnerName) 
+    {
+        this.partnerName = partnerName;
+    }
+
+    public String getPartnerName() 
+    {
+        return partnerName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("partnerId", getPartnerId())
+            .append("partnerName", getPartnerName())
+            .toString();
+    }
+}

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

@@ -55,10 +55,6 @@ public class CmcProject extends BaseEntity
     @Excel(name = "联系电话")
     private String telephone;
 
-    /** 合同编码 */
-    @Excel(name = "合同编码")
-    private String contractId;
-
     /** 项目类型 */
     @Excel(name = "项目类型")
     private String projectType;
@@ -206,15 +202,6 @@ 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;
@@ -381,7 +368,6 @@ 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/domain/CmcProjectContract.java

@@ -0,0 +1,50 @@
+package com.ruoyi.oa.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * cmc项目合同对象 cmc_project_contract
+ * 
+ * @author cmc
+ * @date 2024-04-18
+ */
+public class CmcProjectContract extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 项目id */
+    private String projectId;
+
+    /** 合同id */
+    private String contractId;
+
+    public void setProjectId(String projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId() 
+    {
+        return projectId;
+    }
+    public void setContractId(String contractId) 
+    {
+        this.contractId = contractId;
+    }
+
+    public String getContractId() 
+    {
+        return contractId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("projectId", getProjectId())
+            .append("contractId", getContractId())
+            .toString();
+    }
+}

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

@@ -0,0 +1,197 @@
+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_sub_contract
+ * 
+ * @author cmc
+ * @date 2024-04-18
+ */
+public class CmcSubContract extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 分包合同id（ht2024w002） */
+    private String subContractId;
+
+    /** 主合同id */
+    @Excel(name = "主合同id")
+    private String contractId;
+
+    /** 合同名称 */
+    @Excel(name = "合同名称")
+    private String subContractName;
+
+    /** 分包合同金额 */
+    @Excel(name = "分包合同金额")
+    private BigDecimal subAmount;
+
+    /** 承接单位id */
+    @Excel(name = "承接单位id")
+    private String partnerId;
+
+    /** 承接单位联系人 */
+    @Excel(name = "承接单位联系人")
+    private String contactPerson;
+
+    /** 拟稿人 */
+    @Excel(name = "拟稿人")
+    private Long drafter;
+
+    /** 拟稿日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "拟稿日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date draftTime;
+
+    /** 签订日期 */
+    @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 setSubContractId(String subContractId) 
+    {
+        this.subContractId = subContractId;
+    }
+
+    public String getSubContractId() 
+    {
+        return subContractId;
+    }
+    public void setContractId(String contractId) 
+    {
+        this.contractId = contractId;
+    }
+
+    public String getContractId() 
+    {
+        return contractId;
+    }
+    public void setSubContractName(String subContractName) 
+    {
+        this.subContractName = subContractName;
+    }
+
+    public String getSubContractName() 
+    {
+        return subContractName;
+    }
+    public void setSubAmount(BigDecimal subAmount) 
+    {
+        this.subAmount = subAmount;
+    }
+
+    public BigDecimal getSubAmount() 
+    {
+        return subAmount;
+    }
+    public void setPartnerId(String partnerId) 
+    {
+        this.partnerId = partnerId;
+    }
+
+    public String getPartnerId() 
+    {
+        return partnerId;
+    }
+    public void setContactPerson(String contactPerson) 
+    {
+        this.contactPerson = contactPerson;
+    }
+
+    public String getContactPerson() 
+    {
+        return contactPerson;
+    }
+    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 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("subContractId", getSubContractId())
+            .append("contractId", getContractId())
+            .append("subContractName", getSubContractName())
+            .append("subAmount", getSubAmount())
+            .append("partnerId", getPartnerId())
+            .append("contactPerson", getContactPerson())
+            .append("drafter", getDrafter())
+            .append("draftTime", getDraftTime())
+            .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/mapper/CmcPartnerMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcPartner;
+
+/**
+ * cmc合作单位Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-04-18
+ */
+public interface CmcPartnerMapper 
+{
+    /**
+     * 查询cmc合作单位
+     * 
+     * @param partnerId cmc合作单位主键
+     * @return cmc合作单位
+     */
+    public CmcPartner selectCmcPartnerByPartnerId(String partnerId);
+
+    /**
+     * 查询cmc合作单位列表
+     * 
+     * @param cmcPartner cmc合作单位
+     * @return cmc合作单位集合
+     */
+    public List<CmcPartner> selectCmcPartnerList(CmcPartner cmcPartner);
+
+    /**
+     * 新增cmc合作单位
+     * 
+     * @param cmcPartner cmc合作单位
+     * @return 结果
+     */
+    public int insertCmcPartner(CmcPartner cmcPartner);
+
+    /**
+     * 修改cmc合作单位
+     * 
+     * @param cmcPartner cmc合作单位
+     * @return 结果
+     */
+    public int updateCmcPartner(CmcPartner cmcPartner);
+
+    /**
+     * 删除cmc合作单位
+     * 
+     * @param partnerId cmc合作单位主键
+     * @return 结果
+     */
+    public int deleteCmcPartnerByPartnerId(String partnerId);
+
+    /**
+     * 批量删除cmc合作单位
+     * 
+     * @param partnerIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcPartnerByPartnerIds(String[] partnerIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcProjectContract;
+
+/**
+ * cmc项目合同Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-04-18
+ */
+public interface CmcProjectContractMapper 
+{
+    /**
+     * 查询cmc项目合同
+     * 
+     * @param projectId cmc项目合同主键
+     * @return cmc项目合同
+     */
+    public CmcProjectContract selectCmcProjectContractByProjectId(String projectId);
+
+    /**
+     * 查询cmc项目合同列表
+     * 
+     * @param cmcProjectContract cmc项目合同
+     * @return cmc项目合同集合
+     */
+    public List<CmcProjectContract> selectCmcProjectContractList(CmcProjectContract cmcProjectContract);
+
+    /**
+     * 新增cmc项目合同
+     * 
+     * @param cmcProjectContract cmc项目合同
+     * @return 结果
+     */
+    public int insertCmcProjectContract(CmcProjectContract cmcProjectContract);
+
+    /**
+     * 修改cmc项目合同
+     * 
+     * @param cmcProjectContract cmc项目合同
+     * @return 结果
+     */
+    public int updateCmcProjectContract(CmcProjectContract cmcProjectContract);
+
+    /**
+     * 删除cmc项目合同
+     * 
+     * @param projectId cmc项目合同主键
+     * @return 结果
+     */
+    public int deleteCmcProjectContractByProjectId(String projectId);
+
+    /**
+     * 批量删除cmc项目合同
+     * 
+     * @param projectIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcProjectContractByProjectIds(String[] projectIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcSubContract;
+
+/**
+ * cmc分包合同评审Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-04-18
+ */
+public interface CmcSubContractMapper 
+{
+    /**
+     * 查询cmc分包合同评审
+     * 
+     * @param subContractId cmc分包合同评审主键
+     * @return cmc分包合同评审
+     */
+    public CmcSubContract selectCmcSubContractBySubContractId(String subContractId);
+
+    /**
+     * 查询cmc分包合同评审列表
+     * 
+     * @param cmcSubContract cmc分包合同评审
+     * @return cmc分包合同评审集合
+     */
+    public List<CmcSubContract> selectCmcSubContractList(CmcSubContract cmcSubContract);
+
+    /**
+     * 新增cmc分包合同评审
+     * 
+     * @param cmcSubContract cmc分包合同评审
+     * @return 结果
+     */
+    public int insertCmcSubContract(CmcSubContract cmcSubContract);
+
+    /**
+     * 修改cmc分包合同评审
+     * 
+     * @param cmcSubContract cmc分包合同评审
+     * @return 结果
+     */
+    public int updateCmcSubContract(CmcSubContract cmcSubContract);
+
+    /**
+     * 删除cmc分包合同评审
+     * 
+     * @param subContractId cmc分包合同评审主键
+     * @return 结果
+     */
+    public int deleteCmcSubContractBySubContractId(String subContractId);
+
+    /**
+     * 批量删除cmc分包合同评审
+     * 
+     * @param subContractIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcSubContractBySubContractIds(String[] subContractIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcPartner;
+
+/**
+ * cmc合作单位Service接口
+ * 
+ * @author cmc
+ * @date 2024-04-18
+ */
+public interface ICmcPartnerService 
+{
+    /**
+     * 查询cmc合作单位
+     * 
+     * @param partnerId cmc合作单位主键
+     * @return cmc合作单位
+     */
+    public CmcPartner selectCmcPartnerByPartnerId(String partnerId);
+
+    /**
+     * 查询cmc合作单位列表
+     * 
+     * @param cmcPartner cmc合作单位
+     * @return cmc合作单位集合
+     */
+    public List<CmcPartner> selectCmcPartnerList(CmcPartner cmcPartner);
+
+    /**
+     * 新增cmc合作单位
+     * 
+     * @param cmcPartner cmc合作单位
+     * @return 结果
+     */
+    public int insertCmcPartner(CmcPartner cmcPartner);
+
+    /**
+     * 修改cmc合作单位
+     * 
+     * @param cmcPartner cmc合作单位
+     * @return 结果
+     */
+    public int updateCmcPartner(CmcPartner cmcPartner);
+
+    /**
+     * 批量删除cmc合作单位
+     * 
+     * @param partnerIds 需要删除的cmc合作单位主键集合
+     * @return 结果
+     */
+    public int deleteCmcPartnerByPartnerIds(String[] partnerIds);
+
+    /**
+     * 删除cmc合作单位信息
+     * 
+     * @param partnerId cmc合作单位主键
+     * @return 结果
+     */
+    public int deleteCmcPartnerByPartnerId(String partnerId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcProjectContract;
+
+/**
+ * cmc项目合同Service接口
+ * 
+ * @author cmc
+ * @date 2024-04-18
+ */
+public interface ICmcProjectContractService 
+{
+    /**
+     * 查询cmc项目合同
+     * 
+     * @param projectId cmc项目合同主键
+     * @return cmc项目合同
+     */
+    public CmcProjectContract selectCmcProjectContractByProjectId(String projectId);
+
+    /**
+     * 查询cmc项目合同列表
+     * 
+     * @param cmcProjectContract cmc项目合同
+     * @return cmc项目合同集合
+     */
+    public List<CmcProjectContract> selectCmcProjectContractList(CmcProjectContract cmcProjectContract);
+
+    /**
+     * 新增cmc项目合同
+     * 
+     * @param cmcProjectContract cmc项目合同
+     * @return 结果
+     */
+    public int insertCmcProjectContract(CmcProjectContract cmcProjectContract);
+
+    /**
+     * 修改cmc项目合同
+     * 
+     * @param cmcProjectContract cmc项目合同
+     * @return 结果
+     */
+    public int updateCmcProjectContract(CmcProjectContract cmcProjectContract);
+
+    /**
+     * 批量删除cmc项目合同
+     * 
+     * @param projectIds 需要删除的cmc项目合同主键集合
+     * @return 结果
+     */
+    public int deleteCmcProjectContractByProjectIds(String[] projectIds);
+
+    /**
+     * 删除cmc项目合同信息
+     * 
+     * @param projectId cmc项目合同主键
+     * @return 结果
+     */
+    public int deleteCmcProjectContractByProjectId(String projectId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcSubContract;
+
+/**
+ * cmc分包合同评审Service接口
+ * 
+ * @author cmc
+ * @date 2024-04-18
+ */
+public interface ICmcSubContractService 
+{
+    /**
+     * 查询cmc分包合同评审
+     * 
+     * @param subContractId cmc分包合同评审主键
+     * @return cmc分包合同评审
+     */
+    public CmcSubContract selectCmcSubContractBySubContractId(String subContractId);
+
+    /**
+     * 查询cmc分包合同评审列表
+     * 
+     * @param cmcSubContract cmc分包合同评审
+     * @return cmc分包合同评审集合
+     */
+    public List<CmcSubContract> selectCmcSubContractList(CmcSubContract cmcSubContract);
+
+    /**
+     * 新增cmc分包合同评审
+     * 
+     * @param cmcSubContract cmc分包合同评审
+     * @return 结果
+     */
+    public int insertCmcSubContract(CmcSubContract cmcSubContract);
+
+    /**
+     * 修改cmc分包合同评审
+     * 
+     * @param cmcSubContract cmc分包合同评审
+     * @return 结果
+     */
+    public int updateCmcSubContract(CmcSubContract cmcSubContract);
+
+    /**
+     * 批量删除cmc分包合同评审
+     * 
+     * @param subContractIds 需要删除的cmc分包合同评审主键集合
+     * @return 结果
+     */
+    public int deleteCmcSubContractBySubContractIds(String[] subContractIds);
+
+    /**
+     * 删除cmc分包合同评审信息
+     * 
+     * @param subContractId cmc分包合同评审主键
+     * @return 结果
+     */
+    public int deleteCmcSubContractBySubContractId(String subContractId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcPartnerServiceImpl.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.CmcPartnerMapper;
+import com.ruoyi.oa.domain.CmcPartner;
+import com.ruoyi.oa.service.ICmcPartnerService;
+
+/**
+ * cmc合作单位Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-04-18
+ */
+@Service
+public class CmcPartnerServiceImpl implements ICmcPartnerService 
+{
+    @Autowired
+    private CmcPartnerMapper cmcPartnerMapper;
+
+    /**
+     * 查询cmc合作单位
+     * 
+     * @param partnerId cmc合作单位主键
+     * @return cmc合作单位
+     */
+    @Override
+    public CmcPartner selectCmcPartnerByPartnerId(String partnerId)
+    {
+        return cmcPartnerMapper.selectCmcPartnerByPartnerId(partnerId);
+    }
+
+    /**
+     * 查询cmc合作单位列表
+     * 
+     * @param cmcPartner cmc合作单位
+     * @return cmc合作单位
+     */
+    @Override
+    public List<CmcPartner> selectCmcPartnerList(CmcPartner cmcPartner)
+    {
+        return cmcPartnerMapper.selectCmcPartnerList(cmcPartner);
+    }
+
+    /**
+     * 新增cmc合作单位
+     * 
+     * @param cmcPartner cmc合作单位
+     * @return 结果
+     */
+    @Override
+    public int insertCmcPartner(CmcPartner cmcPartner)
+    {
+        return cmcPartnerMapper.insertCmcPartner(cmcPartner);
+    }
+
+    /**
+     * 修改cmc合作单位
+     * 
+     * @param cmcPartner cmc合作单位
+     * @return 结果
+     */
+    @Override
+    public int updateCmcPartner(CmcPartner cmcPartner)
+    {
+        return cmcPartnerMapper.updateCmcPartner(cmcPartner);
+    }
+
+    /**
+     * 批量删除cmc合作单位
+     * 
+     * @param partnerIds 需要删除的cmc合作单位主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcPartnerByPartnerIds(String[] partnerIds)
+    {
+        return cmcPartnerMapper.deleteCmcPartnerByPartnerIds(partnerIds);
+    }
+
+    /**
+     * 删除cmc合作单位信息
+     * 
+     * @param partnerId cmc合作单位主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcPartnerByPartnerId(String partnerId)
+    {
+        return cmcPartnerMapper.deleteCmcPartnerByPartnerId(partnerId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcProjectContractServiceImpl.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.CmcProjectContractMapper;
+import com.ruoyi.oa.domain.CmcProjectContract;
+import com.ruoyi.oa.service.ICmcProjectContractService;
+
+/**
+ * cmc项目合同Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-04-18
+ */
+@Service
+public class CmcProjectContractServiceImpl implements ICmcProjectContractService 
+{
+    @Autowired
+    private CmcProjectContractMapper cmcProjectContractMapper;
+
+    /**
+     * 查询cmc项目合同
+     * 
+     * @param projectId cmc项目合同主键
+     * @return cmc项目合同
+     */
+    @Override
+    public CmcProjectContract selectCmcProjectContractByProjectId(String projectId)
+    {
+        return cmcProjectContractMapper.selectCmcProjectContractByProjectId(projectId);
+    }
+
+    /**
+     * 查询cmc项目合同列表
+     * 
+     * @param cmcProjectContract cmc项目合同
+     * @return cmc项目合同
+     */
+    @Override
+    public List<CmcProjectContract> selectCmcProjectContractList(CmcProjectContract cmcProjectContract)
+    {
+        return cmcProjectContractMapper.selectCmcProjectContractList(cmcProjectContract);
+    }
+
+    /**
+     * 新增cmc项目合同
+     * 
+     * @param cmcProjectContract cmc项目合同
+     * @return 结果
+     */
+    @Override
+    public int insertCmcProjectContract(CmcProjectContract cmcProjectContract)
+    {
+        return cmcProjectContractMapper.insertCmcProjectContract(cmcProjectContract);
+    }
+
+    /**
+     * 修改cmc项目合同
+     * 
+     * @param cmcProjectContract cmc项目合同
+     * @return 结果
+     */
+    @Override
+    public int updateCmcProjectContract(CmcProjectContract cmcProjectContract)
+    {
+        return cmcProjectContractMapper.updateCmcProjectContract(cmcProjectContract);
+    }
+
+    /**
+     * 批量删除cmc项目合同
+     * 
+     * @param projectIds 需要删除的cmc项目合同主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcProjectContractByProjectIds(String[] projectIds)
+    {
+        return cmcProjectContractMapper.deleteCmcProjectContractByProjectIds(projectIds);
+    }
+
+    /**
+     * 删除cmc项目合同信息
+     * 
+     * @param projectId cmc项目合同主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcProjectContractByProjectId(String projectId)
+    {
+        return cmcProjectContractMapper.deleteCmcProjectContractByProjectId(projectId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcSubContractServiceImpl.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.CmcSubContractMapper;
+import com.ruoyi.oa.domain.CmcSubContract;
+import com.ruoyi.oa.service.ICmcSubContractService;
+
+/**
+ * cmc分包合同评审Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-04-18
+ */
+@Service
+public class CmcSubContractServiceImpl implements ICmcSubContractService 
+{
+    @Autowired
+    private CmcSubContractMapper cmcSubContractMapper;
+
+    /**
+     * 查询cmc分包合同评审
+     * 
+     * @param subContractId cmc分包合同评审主键
+     * @return cmc分包合同评审
+     */
+    @Override
+    public CmcSubContract selectCmcSubContractBySubContractId(String subContractId)
+    {
+        return cmcSubContractMapper.selectCmcSubContractBySubContractId(subContractId);
+    }
+
+    /**
+     * 查询cmc分包合同评审列表
+     * 
+     * @param cmcSubContract cmc分包合同评审
+     * @return cmc分包合同评审
+     */
+    @Override
+    public List<CmcSubContract> selectCmcSubContractList(CmcSubContract cmcSubContract)
+    {
+        return cmcSubContractMapper.selectCmcSubContractList(cmcSubContract);
+    }
+
+    /**
+     * 新增cmc分包合同评审
+     * 
+     * @param cmcSubContract cmc分包合同评审
+     * @return 结果
+     */
+    @Override
+    public int insertCmcSubContract(CmcSubContract cmcSubContract)
+    {
+        return cmcSubContractMapper.insertCmcSubContract(cmcSubContract);
+    }
+
+    /**
+     * 修改cmc分包合同评审
+     * 
+     * @param cmcSubContract cmc分包合同评审
+     * @return 结果
+     */
+    @Override
+    public int updateCmcSubContract(CmcSubContract cmcSubContract)
+    {
+        return cmcSubContractMapper.updateCmcSubContract(cmcSubContract);
+    }
+
+    /**
+     * 批量删除cmc分包合同评审
+     * 
+     * @param subContractIds 需要删除的cmc分包合同评审主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcSubContractBySubContractIds(String[] subContractIds)
+    {
+        return cmcSubContractMapper.deleteCmcSubContractBySubContractIds(subContractIds);
+    }
+
+    /**
+     * 删除cmc分包合同评审信息
+     * 
+     * @param subContractId cmc分包合同评审主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcSubContractBySubContractId(String subContractId)
+    {
+        return cmcSubContractMapper.deleteCmcSubContractBySubContractId(subContractId);
+    }
+}

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

@@ -7,19 +7,11 @@
     <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"    />
@@ -28,26 +20,18 @@
     </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
+        select contract_id, contract_number, amount, deposit, contract_document, drafter, draft_time, 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="contractNumber != null  and contractNumber != ''"> and contract_number = #{contractNumber}</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>
@@ -65,19 +49,11 @@
         <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>
@@ -87,19 +63,11 @@
         <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>
@@ -112,19 +80,11 @@
         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>

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

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.oa.mapper.CmcContractPaymentMapper">
-    
+
     <resultMap type="CmcContractPayment" id="CmcContractPaymentResult">
         <result property="paymentId"    column="payment_id"    />
         <result property="contractId"    column="contract_id"    />
+        <result property="subContractId"    column="sub_contract_id"    />
         <result property="paymentCondition"    column="payment_condition"    />
         <result property="paymentPercentage"    column="payment_percentage"    />
         <result property="paymentAmount"    column="payment_amount"    />
@@ -15,51 +16,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcContractPaymentVo">
-        select payment_id, contract_id, payment_condition, payment_percentage, payment_amount, payment_time, remark from cmc_contract_payment
+        select payment_id, contract_id, sub_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>
+        <where>
+            <if test="contractId != null  and contractId != ''"> and contract_id = #{contractId}</if>
+            <if test="subContractId != null  and subContractId != ''"> and sub_contract_id = #{subContractId}</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="subContractId != null">sub_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>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="paymentId != null">#{paymentId},</if>
             <if test="contractId != null">#{contractId},</if>
+            <if test="subContractId != null">#{subContractId},</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>
+        </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="subContractId != null">sub_contract_id = #{subContractId},</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>
@@ -74,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCmcContractPaymentByPaymentIds" parameterType="String">
-        delete from cmc_contract_payment where payment_id in 
+        delete from cmc_contract_payment where payment_id in
         <foreach item="paymentId" collection="array" open="(" separator="," close=")">
             #{paymentId}
         </foreach>

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

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.oa.mapper.CmcContractWorkMapper">
-    
+
     <resultMap type="CmcContractWork" id="CmcContractWorkResult">
         <result property="workId"    column="work_id"    />
         <result property="contractId"    column="contract_id"    />
+        <result property="subContractId"    column="sub_contract_id"    />
         <result property="content"    column="content"    />
         <result property="scale"    column="scale"    />
         <result property="unit"    column="unit"    />
@@ -16,13 +17,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcContractWorkVo">
-        select work_id, contract_id, content, scale, unit, workload, deadline, remark from cmc_contract_work
+        select work_id, contract_id, sub_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>
+        <where>
+            <if test="contractId != null  and contractId != ''"> and contract_id = #{contractId}</if>
+            <if test="subContractId != null  and subContractId != ''"> and sub_contract_id = #{subContractId}</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>
@@ -30,40 +32,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="subContractId != null">sub_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>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="workId != null">#{workId},</if>
             <if test="contractId != null">#{contractId},</if>
+            <if test="subContractId != null">#{subContractId},</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>
     </insert>
 
     <update id="updateCmcContractWork" parameterType="CmcContractWork">
         update cmc_contract_work
         <trim prefix="SET" suffixOverrides=",">
             <if test="contractId != null">contract_id = #{contractId},</if>
+            <if test="subContractId != null">sub_contract_id = #{subContractId},</if>
             <if test="content != null">content = #{content},</if>
             <if test="scale != null">scale = #{scale},</if>
             <if test="unit != null">unit = #{unit},</if>
@@ -79,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCmcContractWorkByWorkIds" parameterType="String">
-        delete from cmc_contract_work where work_id in 
+        delete from cmc_contract_work where work_id in
         <foreach item="workId" collection="array" open="(" separator="," close=")">
             #{workId}
         </foreach>

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

@@ -0,0 +1,58 @@
+<?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.CmcPartnerMapper">
+    
+    <resultMap type="CmcPartner" id="CmcPartnerResult">
+        <result property="partnerId"    column="partner_id"    />
+        <result property="partnerName"    column="partner_name"    />
+    </resultMap>
+
+    <sql id="selectCmcPartnerVo">
+        select partner_id, partner_name from cmc_partner
+    </sql>
+
+    <select id="selectCmcPartnerList" parameterType="CmcPartner" resultMap="CmcPartnerResult">
+        <include refid="selectCmcPartnerVo"/>
+        <where>  
+            <if test="partnerName != null  and partnerName != ''"> and partner_name like concat('%', #{partnerName}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcPartnerByPartnerId" parameterType="String" resultMap="CmcPartnerResult">
+        <include refid="selectCmcPartnerVo"/>
+        where partner_id = #{partnerId}
+    </select>
+        
+    <insert id="insertCmcPartner" parameterType="CmcPartner">
+        insert into cmc_partner
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="partnerId != null">partner_id,</if>
+            <if test="partnerName != null">partner_name,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="partnerId != null">#{partnerId},</if>
+            <if test="partnerName != null">#{partnerName},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcPartner" parameterType="CmcPartner">
+        update cmc_partner
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="partnerName != null">partner_name = #{partnerName},</if>
+        </trim>
+        where partner_id = #{partnerId}
+    </update>
+
+    <delete id="deleteCmcPartnerByPartnerId" parameterType="String">
+        delete from cmc_partner where partner_id = #{partnerId}
+    </delete>
+
+    <delete id="deleteCmcPartnerByPartnerIds" parameterType="String">
+        delete from cmc_partner where partner_id in 
+        <foreach item="partnerId" collection="array" open="(" separator="," close=")">
+            #{partnerId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,57 @@
+<?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.CmcProjectContractMapper">
+    
+    <resultMap type="CmcProjectContract" id="CmcProjectContractResult">
+        <result property="projectId"    column="project_id"    />
+        <result property="contractId"    column="contract_id"    />
+    </resultMap>
+
+    <sql id="selectCmcProjectContractVo">
+        select project_id, contract_id from cmc_project_contract
+    </sql>
+
+    <select id="selectCmcProjectContractList" parameterType="CmcProjectContract" resultMap="CmcProjectContractResult">
+        <include refid="selectCmcProjectContractVo"/>
+        <where>  
+        </where>
+    </select>
+    
+    <select id="selectCmcProjectContractByProjectId" parameterType="String" resultMap="CmcProjectContractResult">
+        <include refid="selectCmcProjectContractVo"/>
+        where project_id = #{projectId}
+    </select>
+        
+    <insert id="insertCmcProjectContract" parameterType="CmcProjectContract">
+        insert into cmc_project_contract
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">project_id,</if>
+            <if test="contractId != null">contract_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">#{projectId},</if>
+            <if test="contractId != null">#{contractId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcProjectContract" parameterType="CmcProjectContract">
+        update cmc_project_contract
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="contractId != null">contract_id = #{contractId},</if>
+        </trim>
+        where project_id = #{projectId}
+    </update>
+
+    <delete id="deleteCmcProjectContractByProjectId" parameterType="String">
+        delete from cmc_project_contract where project_id = #{projectId}
+    </delete>
+
+    <delete id="deleteCmcProjectContractByProjectIds" parameterType="String">
+        delete from cmc_project_contract where project_id in 
+        <foreach item="projectId" collection="array" open="(" separator="," close=")">
+            #{projectId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -14,7 +14,6 @@
         <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"    />
@@ -43,7 +42,7 @@
     </resultMap>
 
     <sql id="selectCmcProjectVo">
-        select p.project_id, p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a, p.contact_person, p.telephone, p.contract_id, p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark, p.budget_id, p.technical_id from cmc_project as p
+        select p.project_id, p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a, p.contact_person, p.telephone, p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark, p.budget_id, p.technical_id from cmc_project as p
         left join sys_user as u on u.user_id = p.project_leader
         left join sys_user as u1 on u1.user_id = p.project_registrant
     </sql>
@@ -59,7 +58,6 @@
             <if test="partyA != null  and partyA != ''"> and p.party_a = #{partyA}</if>
             <if test="contactPerson != null  and contactPerson != ''"> and p.contact_person = #{contactPerson}</if>
             <if test="telephone != null  and telephone != ''"> and p.telephone = #{telephone}</if>
-            <if test="contractId != null  and contractId != ''"> and p.contract_id = #{contractId}</if>
             <if test="projectType != null  and projectType != ''"> and p.project_type = #{projectType}</if>
             <if test="projectLevel != null  and projectLevel != ''"> and p.project_level = #{projectLevel}</if>
             <if test="projectRegistrant != null "> and p.project_registrant = #{projectRegistrant}</if>
@@ -91,7 +89,6 @@
             <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>
@@ -116,7 +113,6 @@
             <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>
@@ -144,7 +140,6 @@
             <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-back/ruoyi-system/src/main/resources/mapper/oa/CmcSubContractMapper.xml

@@ -0,0 +1,112 @@
+<?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.CmcSubContractMapper">
+    
+    <resultMap type="CmcSubContract" id="CmcSubContractResult">
+        <result property="subContractId"    column="sub_contract_id"    />
+        <result property="contractId"    column="contract_id"    />
+        <result property="subContractName"    column="sub_contract_name"    />
+        <result property="subAmount"    column="sub_amount"    />
+        <result property="partnerId"    column="partner_id"    />
+        <result property="contactPerson"    column="contact_person"    />
+        <result property="drafter"    column="drafter"    />
+        <result property="draftTime"    column="draft_time"    />
+        <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="selectCmcSubContractVo">
+        select sub_contract_id, contract_id, sub_contract_name, sub_amount, partner_id, contact_person, drafter, draft_time, remark, sign_date, sign_remark, sign_scan, comment_type from cmc_sub_contract
+    </sql>
+
+    <select id="selectCmcSubContractList" parameterType="CmcSubContract" resultMap="CmcSubContractResult">
+        <include refid="selectCmcSubContractVo"/>
+        <where>  
+            <if test="contractId != null  and contractId != ''"> and contract_id = #{contractId}</if>
+            <if test="subContractName != null  and subContractName != ''"> and sub_contract_name like concat('%', #{subContractName}, '%')</if>
+            <if test="subAmount != null "> and sub_amount = #{subAmount}</if>
+            <if test="partnerId != null  and partnerId != ''"> and partner_id = #{partnerId}</if>
+            <if test="contactPerson != null  and contactPerson != ''"> and contact_person = #{contactPerson}</if>
+            <if test="drafter != null "> and drafter = #{drafter}</if>
+            <if test="draftTime != null "> and draft_time = #{draftTime}</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="selectCmcSubContractBySubContractId" parameterType="String" resultMap="CmcSubContractResult">
+        <include refid="selectCmcSubContractVo"/>
+        where sub_contract_id = #{subContractId}
+    </select>
+        
+    <insert id="insertCmcSubContract" parameterType="CmcSubContract">
+        insert into cmc_sub_contract
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="subContractId != null">sub_contract_id,</if>
+            <if test="contractId != null">contract_id,</if>
+            <if test="subContractName != null">sub_contract_name,</if>
+            <if test="subAmount != null">sub_amount,</if>
+            <if test="partnerId != null">partner_id,</if>
+            <if test="contactPerson != null">contact_person,</if>
+            <if test="drafter != null">drafter,</if>
+            <if test="draftTime != null">draft_time,</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="subContractId != null">#{subContractId},</if>
+            <if test="contractId != null">#{contractId},</if>
+            <if test="subContractName != null">#{subContractName},</if>
+            <if test="subAmount != null">#{subAmount},</if>
+            <if test="partnerId != null">#{partnerId},</if>
+            <if test="contactPerson != null">#{contactPerson},</if>
+            <if test="drafter != null">#{drafter},</if>
+            <if test="draftTime != null">#{draftTime},</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="updateCmcSubContract" parameterType="CmcSubContract">
+        update cmc_sub_contract
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="contractId != null">contract_id = #{contractId},</if>
+            <if test="subContractName != null">sub_contract_name = #{subContractName},</if>
+            <if test="subAmount != null">sub_amount = #{subAmount},</if>
+            <if test="partnerId != null">partner_id = #{partnerId},</if>
+            <if test="contactPerson != null">contact_person = #{contactPerson},</if>
+            <if test="drafter != null">drafter = #{drafter},</if>
+            <if test="draftTime != null">draft_time = #{draftTime},</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 sub_contract_id = #{subContractId}
+    </update>
+
+    <delete id="deleteCmcSubContractBySubContractId" parameterType="String">
+        delete from cmc_sub_contract where sub_contract_id = #{subContractId}
+    </delete>
+
+    <delete id="deleteCmcSubContractBySubContractIds" parameterType="String">
+        delete from cmc_sub_contract where sub_contract_id in 
+        <foreach item="subContractId" collection="array" open="(" separator="," close=")">
+            #{subContractId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc分包合同评审列表
+export function listSubContract(query) {
+  return request({
+    url: '/oa/subContract/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc分包合同评审详细
+export function getSubContract(subContractId) {
+  return request({
+    url: '/oa/subContract/' + subContractId,
+    method: 'get'
+  })
+}
+
+// 新增cmc分包合同评审
+export function addSubContract(data) {
+  return request({
+    url: '/oa/subContract',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc分包合同评审
+export function updateSubContract(data) {
+  return request({
+    url: '/oa/subContract',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc分包合同评审
+export function delSubContract(subContractId) {
+  return request({
+    url: '/oa/subContract/' + subContractId,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc合作单位列表
+export function listPartner(query) {
+  return request({
+    url: '/oa/partner/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc合作单位详细
+export function getPartner(partnerId) {
+  return request({
+    url: '/oa/partner/' + partnerId,
+    method: 'get'
+  })
+}
+
+// 新增cmc合作单位
+export function addPartner(data) {
+  return request({
+    url: '/oa/partner',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc合作单位
+export function updatePartner(data) {
+  return request({
+    url: '/oa/partner',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc合作单位
+export function delPartner(partnerId) {
+  return request({
+    url: '/oa/partner/' + partnerId,
+    method: 'delete'
+  })
+}

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

@@ -9,54 +9,6 @@
           @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"
@@ -97,14 +49,6 @@
           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"
@@ -185,13 +129,6 @@
       <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" />
@@ -201,7 +138,6 @@
           <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">
@@ -210,6 +146,7 @@
       </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" prop="commentType" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -244,24 +181,6 @@
         <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>
@@ -282,9 +201,6 @@
             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>
@@ -341,22 +257,15 @@ export default {
         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
+        signScan: null,
+        commentType: null
       },
       // 表单参数
       form: {},
@@ -388,23 +297,16 @@ export default {
       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
+        signScan: null,
+        commentType: null
       };
       this.resetForm("form");
     },

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

@@ -9,6 +9,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="分包合同id" prop="subContractId">
+        <el-input
+          v-model="queryParams.subContractId"
+          placeholder="请输入分包合同id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="回款条件" prop="paymentCondition">
         <el-input
           v-model="queryParams.paymentCondition"
@@ -55,7 +63,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['oa:contractPayment:add']"
+          v-hasPermi="['oa:payment:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -66,7 +74,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['oa:contractPayment:edit']"
+          v-hasPermi="['oa:payment:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -77,7 +85,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['oa:contractPayment:remove']"
+          v-hasPermi="['oa:payment:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -87,16 +95,17 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['oa:contractPayment:export']"
+          v-hasPermi="['oa:payment: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 v-loading="loading" :data="paymentList" @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="分包合同id" align="center" prop="subContractId" />
       <el-table-column label="回款条件" align="center" prop="paymentCondition" />
       <el-table-column label="回款比例" align="center" prop="paymentPercentage" />
       <el-table-column label="回款金额" align="center" prop="paymentAmount" />
@@ -113,14 +122,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:contractPayment:edit']"
+            v-hasPermi="['oa:payment:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:contractPayment:remove']"
+            v-hasPermi="['oa:payment:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -140,6 +149,9 @@
         <el-form-item label="合同id" prop="contractId">
           <el-input v-model="form.contractId" placeholder="请输入合同id" />
         </el-form-item>
+        <el-form-item label="分包合同id" prop="subContractId">
+          <el-input v-model="form.subContractId" placeholder="请输入分包合同id" />
+        </el-form-item>
         <el-form-item label="回款条件" prop="paymentCondition">
           <el-input v-model="form.paymentCondition" placeholder="请输入回款条件" />
         </el-form-item>
@@ -170,10 +182,10 @@
 </template>
 
 <script>
-import { listContractPayment, getContractPayment, delContractPayment, addContractPayment, updateContractPayment } from "@/api/oa/contract/contractPayment";
+import { listPayment, getPayment, delPayment, addPayment, updatePayment } from "@/api/oa/contract/contractPayment";
 
 export default {
-  name: "ContractPayment",
+  name: "Payment",
   data() {
     return {
       // 遮罩层
@@ -189,7 +201,7 @@ export default {
       // 总条数
       total: 0,
       // cmc合同回款表格数据
-      contractPaymentList: [],
+      paymentList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -199,6 +211,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         contractId: null,
+        subContractId: null,
         paymentCondition: null,
         paymentPercentage: null,
         paymentAmount: null,
@@ -218,8 +231,8 @@ export default {
     /** 查询cmc合同回款列表 */
     getList() {
       this.loading = true;
-      listContractPayment(this.queryParams).then(response => {
-        this.contractPaymentList = response.rows;
+      listPayment(this.queryParams).then(response => {
+        this.paymentList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -234,6 +247,7 @@ export default {
       this.form = {
         paymentId: null,
         contractId: null,
+        subContractId: null,
         paymentCondition: null,
         paymentPercentage: null,
         paymentAmount: null,
@@ -268,7 +282,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const paymentId = row.paymentId || this.ids
-      getContractPayment(paymentId).then(response => {
+      getPayment(paymentId).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改cmc合同回款";
@@ -279,13 +293,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.paymentId != null) {
-            updateContractPayment(this.form).then(response => {
+            updatePayment(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addContractPayment(this.form).then(response => {
+            addPayment(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -298,7 +312,7 @@ export default {
     handleDelete(row) {
       const paymentIds = row.paymentId || this.ids;
       this.$modal.confirm('是否确认删除cmc合同回款编号为"' + paymentIds + '"的数据项？').then(function() {
-        return delContractPayment(paymentIds);
+        return delPayment(paymentIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
@@ -306,9 +320,9 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('oa/contractPayment/export', {
+      this.download('oa/payment/export', {
         ...this.queryParams
-      }, `contractPayment_${new Date().getTime()}.xlsx`)
+      }, `payment_${new Date().getTime()}.xlsx`)
     }
   }
 };

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

@@ -0,0 +1,397 @@
+<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="subContractName">
+        <el-input
+          v-model="queryParams.subContractName"
+          placeholder="请输入合同名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分包合同金额" prop="subAmount">
+        <el-input
+          v-model="queryParams.subAmount"
+          placeholder="请输入分包合同金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="承接单位id" prop="partnerId">
+        <el-input
+          v-model="queryParams.partnerId"
+          placeholder="请输入承接单位id"
+          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="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="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:subContract: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:subContract: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:subContract: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:subContract:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="subContractList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="分包合同id" align="center" prop="subContractId" />
+      <el-table-column label="主合同id" align="center" prop="contractId" />
+      <el-table-column label="合同名称" align="center" prop="subContractName" />
+      <el-table-column label="分包合同金额" align="center" prop="subAmount" />
+      <el-table-column label="承接单位id" align="center" prop="partnerId" />
+      <el-table-column label="承接单位联系人" align="center" prop="contactPerson" />
+      <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="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" prop="commentType" />
+      <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:subContract:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:subContract: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="subContractName">
+          <el-input v-model="form.subContractName" placeholder="请输入合同名称" />
+        </el-form-item>
+        <el-form-item label="分包合同金额" prop="subAmount">
+          <el-input v-model="form.subAmount" placeholder="请输入分包合同金额" />
+        </el-form-item>
+        <el-form-item label="承接单位id" prop="partnerId">
+          <el-input v-model="form.partnerId" placeholder="请输入承接单位id" />
+        </el-form-item>
+        <el-form-item label="承接单位联系人" prop="contactPerson">
+          <el-input v-model="form.contactPerson" 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="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 { listSubContract, getSubContract, delSubContract, addSubContract, updateSubContract } from "@/api/oa/contract/subContract";
+
+export default {
+  name: "SubContract",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc分包合同评审表格数据
+      subContractList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        contractId: null,
+        subContractName: null,
+        subAmount: null,
+        partnerId: null,
+        contactPerson: null,
+        drafter: null,
+        draftTime: null,
+        signDate: null,
+        signRemark: null,
+        signScan: null,
+        commentType: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc分包合同评审列表 */
+    getList() {
+      this.loading = true;
+      listSubContract(this.queryParams).then(response => {
+        this.subContractList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        subContractId: null,
+        contractId: null,
+        subContractName: null,
+        subAmount: null,
+        partnerId: null,
+        contactPerson: null,
+        drafter: null,
+        draftTime: null,
+        remark: null,
+        signDate: null,
+        signRemark: null,
+        signScan: null,
+        commentType: 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.subContractId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc分包合同评审";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const subContractId = row.subContractId || this.ids
+      getSubContract(subContractId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc分包合同评审";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.subContractId != null) {
+            updateSubContract(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSubContract(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const subContractIds = row.subContractId || this.ids;
+      this.$modal.confirm('是否确认删除cmc分包合同评审编号为"' + subContractIds + '"的数据项？').then(function() {
+        return delSubContract(subContractIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/subContract/export', {
+        ...this.queryParams
+      }, `subContract_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -9,6 +9,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="分包合同id" prop="subContractId">
+        <el-input
+          v-model="queryParams.subContractId"
+          placeholder="请输入分包合同id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="等级或比例尺" prop="scale">
         <el-input
           v-model="queryParams.scale"
@@ -55,7 +63,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['oa:contractWork:add']"
+          v-hasPermi="['oa:work:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -66,7 +74,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['oa:contractWork:edit']"
+          v-hasPermi="['oa:work:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -77,7 +85,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['oa:contractWork:remove']"
+          v-hasPermi="['oa:work:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -87,16 +95,17 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['oa:contractWork:export']"
+          v-hasPermi="['oa:work: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 v-loading="loading" :data="workList" @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="分包合同id" align="center" prop="subContractId" />
       <el-table-column label="工作内容" align="center" prop="content" />
       <el-table-column label="等级或比例尺" align="center" prop="scale" />
       <el-table-column label="单位" align="center" prop="unit" />
@@ -114,14 +123,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:contractWork:edit']"
+            v-hasPermi="['oa:work:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:contractWork:remove']"
+            v-hasPermi="['oa:work:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -141,6 +150,9 @@
         <el-form-item label="合同id" prop="contractId">
           <el-input v-model="form.contractId" placeholder="请输入合同id" />
         </el-form-item>
+        <el-form-item label="分包合同id" prop="subContractId">
+          <el-input v-model="form.subContractId" placeholder="请输入分包合同id" />
+        </el-form-item>
         <el-form-item label="工作内容">
           <editor v-model="form.content" :min-height="192"/>
         </el-form-item>
@@ -174,10 +186,10 @@
 </template>
 
 <script>
-import { listContractWork, getContractWork, delContractWork, addContractWork, updateContractWork } from "@/api/oa/contract/contractWork";
+import { listWork, getWork, delWork, addWork, updateWork } from "@/api/oa/contract/contractWork";
 
 export default {
-  name: "ContractWork",
+  name: "Work",
   data() {
     return {
       // 遮罩层
@@ -193,7 +205,7 @@ export default {
       // 总条数
       total: 0,
       // cmc合同内容表格数据
-      contractWorkList: [],
+      workList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -203,6 +215,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         contractId: null,
+        subContractId: null,
         content: null,
         scale: null,
         unit: null,
@@ -223,8 +236,8 @@ export default {
     /** 查询cmc合同内容列表 */
     getList() {
       this.loading = true;
-      listContractWork(this.queryParams).then(response => {
-        this.contractWorkList = response.rows;
+      listWork(this.queryParams).then(response => {
+        this.workList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -239,6 +252,7 @@ export default {
       this.form = {
         workId: null,
         contractId: null,
+        subContractId: null,
         content: null,
         scale: null,
         unit: null,
@@ -274,7 +288,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const workId = row.workId || this.ids
-      getContractWork(workId).then(response => {
+      getWork(workId).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改cmc合同内容";
@@ -285,13 +299,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.workId != null) {
-            updateContractWork(this.form).then(response => {
+            updateWork(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addContractWork(this.form).then(response => {
+            addWork(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -304,7 +318,7 @@ export default {
     handleDelete(row) {
       const workIds = row.workId || this.ids;
       this.$modal.confirm('是否确认删除cmc合同内容编号为"' + workIds + '"的数据项？').then(function() {
-        return delContractWork(workIds);
+        return delWork(workIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
@@ -312,9 +326,9 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('oa/contractWork/export', {
+      this.download('oa/work/export', {
         ...this.queryParams
-      }, `contractWork_${new Date().getTime()}.xlsx`)
+      }, `work_${new Date().getTime()}.xlsx`)
     }
   }
 };

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

@@ -0,0 +1,245 @@
+<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="partnerName">
+        <el-input
+          v-model="queryParams.partnerName"
+          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:partner: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:partner: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:partner: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:partner:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="partnerList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="合作单位id" align="center" prop="partnerId" />
+      <el-table-column label="单位名称" align="center" prop="partnerName" />
+      <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:partner:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:partner: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="partnerName">
+          <el-input v-model="form.partnerName" 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 { listPartner, getPartner, delPartner, addPartner, updatePartner } from "@/api/oa/partner/partner";
+
+export default {
+  name: "Partner",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc合作单位表格数据
+      partnerList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        partnerName: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc合作单位列表 */
+    getList() {
+      this.loading = true;
+      listPartner(this.queryParams).then(response => {
+        this.partnerList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        partnerId: null,
+        partnerName: 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.partnerId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc合作单位";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const partnerId = row.partnerId || this.ids
+      getPartner(partnerId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc合作单位";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.partnerId != null) {
+            updatePartner(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPartner(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const partnerIds = row.partnerId || this.ids;
+      this.$modal.confirm('是否确认删除cmc合作单位编号为"' + partnerIds + '"的数据项？').then(function() {
+        return delPartner(partnerIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/partner/export', {
+        ...this.queryParams
+      }, `partner_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>