存单位id

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

@@ -2,6 +2,12 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.SnowFlake;
+import com.ruoyi.oa.domain.CmcPartner;
+import com.ruoyi.oa.domain.CmcPartyA;
+import com.ruoyi.oa.service.ICmcPartnerService;
+import com.ruoyi.oa.service.ICmcPartyAService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,6 +39,12 @@ public class CmcBrandProjectController extends BaseController
     @Autowired
     private ICmcBrandProjectService cmcBrandProjectService;
 
+    @Autowired
+    private ICmcPartnerService cmcPartnerService;
+
+    @Autowired
+    private ICmcPartyAService cmcPartyAService;
+
     /**
      * 查询cmc品牌项目列表
      */
@@ -72,6 +84,23 @@ public class CmcBrandProjectController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcBrandProject cmcBrandProject)
     {
+        if (!cmcBrandProject.getPartnerId().matches("-?\\d+(\\.\\d+)?")) {
+            CmcPartner cmcPartner = new CmcPartner();
+            cmcPartner.setPartnerId(new SnowFlake().generateId());
+            cmcPartner.setPartnerName(cmcBrandProject.getPartnerId());
+            cmcPartner.setTelephone(cmcBrandProject.getTelephone());
+            cmcPartner.setContactPerson(cmcBrandProject.getContactPerson());
+            cmcPartnerService.insertCmcPartner(cmcPartner);
+            cmcBrandProject.setPartnerId(cmcPartner.getPartnerId());
+        }
+        if (!cmcBrandProject.getPartyAId().matches("-?\\d+(\\.\\d+)?")) {
+            CmcPartyA cmcPartyA = new CmcPartyA();
+            cmcPartyA.setPartyAId(new SnowFlake().generateId());
+            cmcPartyA.setPartyAName(cmcBrandProject.getPartnerId());
+            cmcPartyAService.insertCmcPartyA(cmcPartyA);
+            cmcBrandProject.setPartyAId(cmcPartyA.getPartyAId());
+        }
+        cmcBrandProject.setProjectId(new SnowFlake().generateId());
         return toAjax(cmcBrandProjectService.insertCmcBrandProject(cmcBrandProject));
     }
 

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

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcBrandProjectProgress;
+import com.ruoyi.oa.service.ICmcBrandProjectProgressService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc品牌项目进度Controller
+ * 
+ * @author cmc
+ * @date 2024-06-12
+ */
+@RestController
+@RequestMapping("/oa/brandProgress")
+public class CmcBrandProjectProgressController extends BaseController
+{
+    @Autowired
+    private ICmcBrandProjectProgressService cmcBrandProjectProgressService;
+
+    /**
+     * 查询cmc品牌项目进度列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcBrandProjectProgress cmcBrandProjectProgress)
+    {
+        startPage();
+        List<CmcBrandProjectProgress> list = cmcBrandProjectProgressService.selectCmcBrandProjectProgressList(cmcBrandProjectProgress);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc品牌项目进度列表
+     */
+    @Log(title = "cmc品牌项目进度", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcBrandProjectProgress cmcBrandProjectProgress)
+    {
+        List<CmcBrandProjectProgress> list = cmcBrandProjectProgressService.selectCmcBrandProjectProgressList(cmcBrandProjectProgress);
+        ExcelUtil<CmcBrandProjectProgress> util = new ExcelUtil<CmcBrandProjectProgress>(CmcBrandProjectProgress.class);
+        util.exportExcel(response, list, "cmc品牌项目进度数据");
+    }
+
+    /**
+     * 获取cmc品牌项目进度详细信息
+     */
+    @GetMapping(value = "/{progressId}")
+    public AjaxResult getInfo(@PathVariable("progressId") Long progressId)
+    {
+        return success(cmcBrandProjectProgressService.selectCmcBrandProjectProgressByProgressId(progressId));
+    }
+
+    /**
+     * 新增cmc品牌项目进度
+     */
+    @Log(title = "cmc品牌项目进度", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcBrandProjectProgress cmcBrandProjectProgress)
+    {
+        return toAjax(cmcBrandProjectProgressService.insertCmcBrandProjectProgress(cmcBrandProjectProgress));
+    }
+
+    /**
+     * 修改cmc品牌项目进度
+     */
+    @Log(title = "cmc品牌项目进度", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcBrandProjectProgress cmcBrandProjectProgress)
+    {
+        return toAjax(cmcBrandProjectProgressService.updateCmcBrandProjectProgress(cmcBrandProjectProgress));
+    }
+
+    /**
+     * 删除cmc品牌项目进度
+     */
+    @Log(title = "cmc品牌项目进度", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{progressIds}")
+    public AjaxResult remove(@PathVariable Long[] progressIds)
+    {
+        return toAjax(cmcBrandProjectProgressService.deleteCmcBrandProjectProgressByProgressIds(progressIds));
+    }
+}

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

@@ -2,6 +2,8 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.SnowFlake;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -72,6 +74,7 @@ public class CmcPartnerController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcPartner cmcPartner)
     {
+        cmcPartner.setPartnerId(new SnowFlake().generateId());
         return toAjax(cmcPartnerService.insertCmcPartner(cmcPartner));
     }
 

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

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcPartyA;
+import com.ruoyi.oa.service.ICmcPartyAService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc业主单位Controller
+ * 
+ * @author cmc
+ * @date 2024-06-12
+ */
+@RestController
+@RequestMapping("/oa/partyA")
+public class CmcPartyAController extends BaseController
+{
+    @Autowired
+    private ICmcPartyAService cmcPartyAService;
+
+    /**
+     * 查询cmc业主单位列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcPartyA cmcPartyA)
+    {
+        startPage();
+        List<CmcPartyA> list = cmcPartyAService.selectCmcPartyAList(cmcPartyA);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc业主单位列表
+     */
+    @Log(title = "cmc业主单位", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcPartyA cmcPartyA)
+    {
+        List<CmcPartyA> list = cmcPartyAService.selectCmcPartyAList(cmcPartyA);
+        ExcelUtil<CmcPartyA> util = new ExcelUtil<CmcPartyA>(CmcPartyA.class);
+        util.exportExcel(response, list, "cmc业主单位数据");
+    }
+
+    /**
+     * 获取cmc业主单位详细信息
+     */
+    @GetMapping(value = "/{partyAId}")
+    public AjaxResult getInfo(@PathVariable("partyAId") String partyAId)
+    {
+        return success(cmcPartyAService.selectCmcPartyAByPartyAId(partyAId));
+    }
+
+    /**
+     * 新增cmc业主单位
+     */
+    @Log(title = "cmc业主单位", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcPartyA cmcPartyA)
+    {
+        return toAjax(cmcPartyAService.insertCmcPartyA(cmcPartyA));
+    }
+
+    /**
+     * 修改cmc业主单位
+     */
+    @Log(title = "cmc业主单位", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcPartyA cmcPartyA)
+    {
+        return toAjax(cmcPartyAService.updateCmcPartyA(cmcPartyA));
+    }
+
+    /**
+     * 删除cmc业主单位
+     */
+    @Log(title = "cmc业主单位", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{partyAIds}")
+    public AjaxResult remove(@PathVariable String[] partyAIds)
+    {
+        return toAjax(cmcPartyAService.deleteCmcPartyAByPartyAIds(partyAIds));
+    }
+}

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

@@ -7,8 +7,10 @@ import javax.servlet.http.HttpServletResponse;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SnowFlake;
+import com.ruoyi.oa.domain.CmcPartyA;
 import com.ruoyi.oa.domain.CmcProjectWork;
 import com.ruoyi.oa.domain.CmcTechnical;
+import com.ruoyi.oa.service.ICmcPartyAService;
 import com.ruoyi.oa.service.ICmcProjectWorkService;
 import com.ruoyi.oa.service.ICmcTechnicalService;
 import com.ruoyi.system.service.ISysDeptService;
@@ -38,7 +40,7 @@ public class CmcProjectController extends BaseController
     private ICmcProjectService cmcProjectService;
 
     @Autowired
-    private ICmcTechnicalService cmcTechnicalService;
+    private ICmcPartyAService cmcPartyAService;
 
     @Autowired
     private ICmcProjectWorkService cmcProjectWorkService;
@@ -58,12 +60,12 @@ public class CmcProjectController extends BaseController
         startPage();
         List<CmcProject> list = cmcProjectService.selectCmcProjectList(cmcProject);
         for (CmcProject project : list) {
-            String underTakingDept = cmcProject.getUndertakingDept();
+            String underTakingDept = project.getUndertakingDept();
             StringBuilder underTakingDeptName = new StringBuilder();
             if (underTakingDept != null && !underTakingDept.equals("") && underTakingDept.split(",").length > 0) {
                 for (String dept : underTakingDept.split(","))
                     underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append("、");
-                cmcProject.setUndertakingDeptName(underTakingDeptName.substring(0, underTakingDeptName.length() - 1));
+                project.setUndertakingDeptName(underTakingDeptName.substring(0, underTakingDeptName.length() - 1));
             }
         }
         return getDataTable(list);
@@ -123,6 +125,13 @@ public class CmcProjectController extends BaseController
     {
         cmcProject.setRegisterTime(new Date());
         cmcProject.setIsFinished("0");
+        if (!cmcProject.getPartyAId().matches("-?\\d+(\\.\\d+)?")) {
+            CmcPartyA cmcPartyA = new CmcPartyA();
+            cmcPartyA.setPartyAId(new SnowFlake().generateId());
+            cmcPartyA.setPartyAName(cmcProject.getPartyAId());
+            cmcPartyAService.insertCmcPartyA(cmcPartyA);
+            cmcProject.setPartyAId(cmcPartyA.getPartyAId());
+        }
         return toAjax(cmcProjectService.insertCmcProject(cmcProject));
     }
 

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

@@ -84,6 +84,7 @@ public class CmcSubContractController extends BaseController
             CmcPartner cmcPartner = new CmcPartner();
             cmcPartner.setPartnerId(new SnowFlake().generateId());
             cmcPartner.setPartnerName(cmcSubContract.getPartnerId());
+            cmcPartner.setTelephone(cmcSubContract.getTelephone());
             cmcPartner.setContactPerson(cmcSubContract.getContactPerson());
             cmcPartnerService.insertCmcPartner(cmcPartner);
             cmcSubContract.setPartnerId(cmcPartner.getPartnerId());

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

@@ -2,6 +2,10 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.SnowFlake;
+import com.ruoyi.oa.domain.CmcPartyA;
+import com.ruoyi.oa.service.ICmcPartyAService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,6 +37,9 @@ public class CmcTenderController extends BaseController
     @Autowired
     private ICmcTenderService cmcTenderService;
 
+    @Autowired
+    private ICmcPartyAService cmcPartyAService;
+
     /**
      * 查询投标管理列表
      */
@@ -72,6 +79,13 @@ public class CmcTenderController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcTender cmcTender)
     {
+        if (!cmcTender.getPartyAId().matches("-?\\d+(\\.\\d+)?")) {
+            CmcPartyA cmcPartyA = new CmcPartyA();
+            cmcPartyA.setPartyAId(new SnowFlake().generateId());
+            cmcPartyA.setPartyAName(cmcTender.getPartyAId());
+            cmcPartyAService.insertCmcPartyA(cmcPartyA);
+            cmcTender.setPartyAId(cmcPartyA.getPartyAId());
+        }
         return toAjax(cmcTenderService.insertCmcTender(cmcTender));
     }
 

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

@@ -28,8 +28,10 @@ public class CmcBrandProject extends BaseEntity
     private String projectName;
 
     /** 甲方单位 */
+    private String partyAId;
+
     @Excel(name = "甲方单位")
-    private String partyA;
+    private CmcPartyA partyA;
 
     /** 甲方单位联系人 */
     @Excel(name = "甲方单位联系人")
@@ -40,9 +42,11 @@ public class CmcBrandProject extends BaseEntity
     private String aPhone;
 
     /** 合作单位 */
-    @Excel(name = "合作单位")
     private String partnerId;
 
+    @Excel(name = "合作单位")
+    private CmcPartner partner;
+
     /** 合作单位联系人 */
     @Excel(name = "合作单位联系人")
     private String contactPerson;
@@ -59,6 +63,10 @@ public class CmcBrandProject extends BaseEntity
     @Excel(name = "合同金额")
     private BigDecimal amount;
 
+    /** 项目概况 */
+    @Excel(name = "项目概况")
+    private String content;
+
     public void setProjectId(String projectId) 
     {
         this.projectId = projectId;
@@ -86,12 +94,21 @@ public class CmcBrandProject extends BaseEntity
     {
         return projectName;
     }
-    public void setPartyA(String partyA) 
+    public void setPartyAId(String partyAId)
+    {
+        this.partyAId = partyAId;
+    }
+
+    public String getPartyAId()
+    {
+        return partyAId;
+    }
+    public void setPartyA(CmcPartyA partyA)
     {
         this.partyA = partyA;
     }
 
-    public String getPartyA() 
+    public CmcPartyA getPartyA()
     {
         return partyA;
     }
@@ -122,6 +139,15 @@ public class CmcBrandProject extends BaseEntity
     {
         return partnerId;
     }
+    public void setPartner(CmcPartner partner)
+    {
+        this.partner = partner;
+    }
+
+    public CmcPartner getPartner()
+    {
+        return partner;
+    }
     public void setContactPerson(String contactPerson) 
     {
         this.contactPerson = contactPerson;
@@ -158,6 +184,15 @@ public class CmcBrandProject extends BaseEntity
     {
         return amount;
     }
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public String getContent()
+    {
+        return content;
+    }
 
     @Override
     public String toString() {
@@ -165,7 +200,7 @@ public class CmcBrandProject extends BaseEntity
             .append("projectId", getProjectId())
             .append("projectNumber", getProjectNumber())
             .append("projectName", getProjectName())
-            .append("partyA", getPartyA())
+            .append("partyAId", getPartyAId())
             .append("aPerson", getaPerson())
             .append("aPhone", getaPhone())
             .append("partnerId", getPartnerId())
@@ -173,6 +208,7 @@ public class CmcBrandProject extends BaseEntity
             .append("telephone", getTelephone())
             .append("duration", getDuration())
             .append("amount", getAmount())
+            .append("content", getContent())
             .append("remark", getRemark())
             .toString();
     }

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

@@ -0,0 +1,96 @@
+package com.ruoyi.oa.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * cmc品牌项目进度对象 cmc_brand_project_progress
+ * 
+ * @author cmc
+ * @date 2024-06-12
+ */
+public class CmcBrandProjectProgress extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 项目进度id */
+    private Long progressId;
+
+    /** 项目id */
+    @Excel(name = "项目id")
+    private String projectId;
+
+    /** 累计进度 */
+    @Excel(name = "累计进度")
+    private String percentage;
+
+    /** 截至日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "截至日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date date;
+
+    /** 完成进度说明 */
+    @Excel(name = "完成进度说明")
+    private String situation;
+
+    public void setProgressId(Long progressId) 
+    {
+        this.progressId = progressId;
+    }
+
+    public Long getProgressId() 
+    {
+        return progressId;
+    }
+    public void setProjectId(String projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId() 
+    {
+        return projectId;
+    }
+    public void setPercentage(String percentage) 
+    {
+        this.percentage = percentage;
+    }
+
+    public String getPercentage() 
+    {
+        return percentage;
+    }
+    public void setDate(Date date) 
+    {
+        this.date = date;
+    }
+
+    public Date getDate() 
+    {
+        return date;
+    }
+    public void setSituation(String situation) 
+    {
+        this.situation = situation;
+    }
+
+    public String getSituation() 
+    {
+        return situation;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("progressId", getProgressId())
+            .append("projectId", getProjectId())
+            .append("percentage", getPercentage())
+            .append("date", getDate())
+            .append("situation", getSituation())
+            .toString();
+    }
+}

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

@@ -7,9 +7,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * cmc合作单位对象 cmc_partner
- * 
+ *
  * @author cmc
- * @date 2024-04-18
+ * @date 2024-06-12
  */
 public class CmcPartner extends BaseEntity
 {
@@ -26,6 +26,34 @@ public class CmcPartner extends BaseEntity
     @Excel(name = "联系人")
     private String contactPerson;
 
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String telephone;
+
+    /** 资质等级 */
+    @Excel(name = "资质等级")
+    private String qualification;
+
+    /** 内业规模 */
+    @Excel(name = "内业规模")
+    private Long inWorker;
+
+    /** 外业规模 */
+    @Excel(name = "外业规模")
+    private Long outWorker;
+
+    /** 主要技术装备 */
+    @Excel(name = "主要技术装备")
+    private String equipment;
+
+    /** 擅长业务方向 */
+    @Excel(name = "擅长业务方向")
+    private String strength;
+
+    /** 履约能力评价 */
+    @Excel(name = "履约能力评价")
+    private String fulfill;
+
     public void setPartnerId(String partnerId)
     {
         this.partnerId = partnerId;
@@ -35,12 +63,12 @@ public class CmcPartner extends BaseEntity
     {
         return partnerId;
     }
-    public void setPartnerName(String partnerName) 
+    public void setPartnerName(String partnerName)
     {
         this.partnerName = partnerName;
     }
 
-    public String getPartnerName() 
+    public String getPartnerName()
     {
         return partnerName;
     }
@@ -53,13 +81,84 @@ public class CmcPartner extends BaseEntity
     {
         return contactPerson;
     }
+    public void setTelephone(String telephone)
+    {
+        this.telephone = telephone;
+    }
+
+    public String getTelephone()
+    {
+        return telephone;
+    }
+    public void setQualification(String qualification)
+    {
+        this.qualification = qualification;
+    }
+
+    public String getQualification()
+    {
+        return qualification;
+    }
+    public void setInWorker(Long inWorker)
+    {
+        this.inWorker = inWorker;
+    }
+
+    public Long getInWorker()
+    {
+        return inWorker;
+    }
+    public void setOutWorker(Long outWorker)
+    {
+        this.outWorker = outWorker;
+    }
+
+    public Long getOutWorker()
+    {
+        return outWorker;
+    }
+    public void setEquipment(String equipment)
+    {
+        this.equipment = equipment;
+    }
+
+    public String getEquipment()
+    {
+        return equipment;
+    }
+    public void setStrength(String strength)
+    {
+        this.strength = strength;
+    }
+
+    public String getStrength()
+    {
+        return strength;
+    }
+    public void setFulfill(String fulfill)
+    {
+        this.fulfill = fulfill;
+    }
+
+    public String getFulfill()
+    {
+        return fulfill;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("partnerId", getPartnerId())
-            .append("partnerName", getPartnerName())
-            .append("contactPerson", getContactPerson())
-            .toString();
+                .append("partnerId", getPartnerId())
+                .append("partnerName", getPartnerName())
+                .append("contactPerson", getContactPerson())
+                .append("telephone", getTelephone())
+                .append("qualification", getQualification())
+                .append("inWorker", getInWorker())
+                .append("outWorker", getOutWorker())
+                .append("equipment", getEquipment())
+                .append("strength", getStrength())
+                .append("fulfill", getFulfill())
+                .append("remark", getRemark())
+                .toString();
     }
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcPartyA.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_party_a
+ * 
+ * @author cmc
+ * @date 2024-06-12
+ */
+public class CmcPartyA extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 合作单位id */
+    private String partyAId;
+
+    /** 单位名称 */
+    @Excel(name = "单位名称")
+    private String partyAName;
+
+    public void setPartyAId(String partyAId) 
+    {
+        this.partyAId = partyAId;
+    }
+
+    public String getPartyAId() 
+    {
+        return partyAId;
+    }
+    public void setPartyAName(String partyAName) 
+    {
+        this.partyAName = partyAName;
+    }
+
+    public String getPartyAName()
+    {
+        return partyAName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("partyAId", getPartyAId())
+            .append("partyAName", getPartyAName())
+            .toString();
+    }
+}

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

@@ -50,8 +50,10 @@ public class CmcProject extends BaseEntity
     private String projectSource;
 
     /** 甲方单位 */
+    private String partyAId;
+
     @Excel(name = "甲方单位")
-    private String partyA;
+    private CmcPartyA partyA;
 
     /** 联系人 */
     @Excel(name = "联系人")
@@ -209,12 +211,21 @@ public class CmcProject extends BaseEntity
     {
         return projectSource;
     }
-    public void setPartyA(String partyA)
+    public void setPartyAId(String partyAId)
+    {
+        this.partyAId = partyAId;
+    }
+
+    public String getPartyAId()
+    {
+        return partyAId;
+    }
+    public void setPartyA(CmcPartyA partyA)
     {
         this.partyA = partyA;
     }
 
-    public String getPartyA()
+    public CmcPartyA getPartyA()
     {
         return partyA;
     }
@@ -489,7 +500,7 @@ public class CmcProject extends BaseEntity
                 .append("projectLeader", getProjectLeader())
                 .append("isFinished", getIsFinished())
                 .append("projectSource", getProjectSource())
-                .append("partyA", getPartyA())
+                .append("partyAId", getPartyAId())
                 .append("contactPerson", getContactPerson())
                 .append("telephone", getTelephone())
                 .append("projectType", getProjectType())

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

@@ -42,6 +42,10 @@ public class CmcSubContract extends BaseEntity
     @Excel(name = "承接单位联系人")
     private String contactPerson;
 
+    /** 承接单位联系电话 */
+    @Excel(name = "承接单位联系电话")
+    private String telephone;
+
     /** 合同文件 */
     @Excel(name = "合同文件")
     private String contractDocument;
@@ -143,6 +147,15 @@ public class CmcSubContract extends BaseEntity
     {
         return contactPerson;
     }
+    public void setTelephone(String telephone)
+    {
+        this.telephone = telephone;
+    }
+
+    public String getTelephone()
+    {
+        return telephone;
+    }
     public void setContractDocument(String contractDocument)
     {
         this.contractDocument = contractDocument;
@@ -262,6 +275,7 @@ public class CmcSubContract extends BaseEntity
             .append("subAmount", getSubAmount())
             .append("partnerId", getPartnerId())
             .append("contactPerson", getContactPerson())
+            .append("telephone", getTelephone())
             .append("drafter", getDrafter())
             .append("draftTime", getDraftTime())
             .append("remark", getRemark())

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

@@ -28,8 +28,10 @@ public class CmcTender extends BaseEntity
     private String projectName;
 
     /** 招标业主 */
+    private String partyAId;
+
     @Excel(name = "招标业主")
-    private String partyA;
+    private CmcPartyA partyA;
 
     /** 业主联系人 */
     @Excel(name = "业主联系人")
@@ -170,12 +172,21 @@ public class CmcTender extends BaseEntity
     {
         return projectName;
     }
-    public void setPartyA(String partyA) 
+    public void setPartyAId(String partyAId) 
+    {
+        this.partyAId = partyAId;
+    }
+
+    public String getPartyAId() 
+    {
+        return partyAId;
+    }
+    public void setPartyA(CmcPartyA partyA)
     {
         this.partyA = partyA;
     }
 
-    public String getPartyA() 
+    public CmcPartyA getPartyA()
     {
         return partyA;
     }
@@ -472,7 +483,7 @@ public class CmcTender extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("tenderId", getTenderId())
             .append("projectName", getProjectName())
-            .append("partyA", getPartyA())
+            .append("partyAId", getPartyAId())
             .append("aPerson", getaPerson())
             .append("aPhone", getaPhone())
             .append("agent", getAgent())

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcBrandProjectProgress;
+
+/**
+ * cmc品牌项目进度Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-06-12
+ */
+public interface CmcBrandProjectProgressMapper 
+{
+    /**
+     * 查询cmc品牌项目进度
+     * 
+     * @param progressId cmc品牌项目进度主键
+     * @return cmc品牌项目进度
+     */
+    public CmcBrandProjectProgress selectCmcBrandProjectProgressByProgressId(Long progressId);
+
+    /**
+     * 查询cmc品牌项目进度列表
+     * 
+     * @param cmcBrandProjectProgress cmc品牌项目进度
+     * @return cmc品牌项目进度集合
+     */
+    public List<CmcBrandProjectProgress> selectCmcBrandProjectProgressList(CmcBrandProjectProgress cmcBrandProjectProgress);
+
+    /**
+     * 新增cmc品牌项目进度
+     * 
+     * @param cmcBrandProjectProgress cmc品牌项目进度
+     * @return 结果
+     */
+    public int insertCmcBrandProjectProgress(CmcBrandProjectProgress cmcBrandProjectProgress);
+
+    /**
+     * 修改cmc品牌项目进度
+     * 
+     * @param cmcBrandProjectProgress cmc品牌项目进度
+     * @return 结果
+     */
+    public int updateCmcBrandProjectProgress(CmcBrandProjectProgress cmcBrandProjectProgress);
+
+    /**
+     * 删除cmc品牌项目进度
+     * 
+     * @param progressId cmc品牌项目进度主键
+     * @return 结果
+     */
+    public int deleteCmcBrandProjectProgressByProgressId(Long progressId);
+
+    /**
+     * 批量删除cmc品牌项目进度
+     * 
+     * @param progressIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcBrandProjectProgressByProgressIds(Long[] progressIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcPartyA;
+
+/**
+ * cmc业主单位Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-06-12
+ */
+public interface CmcPartyAMapper 
+{
+    /**
+     * 查询cmc业主单位
+     * 
+     * @param partyAId cmc业主单位主键
+     * @return cmc业主单位
+     */
+    public CmcPartyA selectCmcPartyAByPartyAId(String partyAId);
+
+    /**
+     * 查询cmc业主单位列表
+     * 
+     * @param cmcPartyA cmc业主单位
+     * @return cmc业主单位集合
+     */
+    public List<CmcPartyA> selectCmcPartyAList(CmcPartyA cmcPartyA);
+
+    /**
+     * 新增cmc业主单位
+     * 
+     * @param cmcPartyA cmc业主单位
+     * @return 结果
+     */
+    public int insertCmcPartyA(CmcPartyA cmcPartyA);
+
+    /**
+     * 修改cmc业主单位
+     * 
+     * @param cmcPartyA cmc业主单位
+     * @return 结果
+     */
+    public int updateCmcPartyA(CmcPartyA cmcPartyA);
+
+    /**
+     * 删除cmc业主单位
+     * 
+     * @param partyAId cmc业主单位主键
+     * @return 结果
+     */
+    public int deleteCmcPartyAByPartyAId(String partyAId);
+
+    /**
+     * 批量删除cmc业主单位
+     * 
+     * @param partyAIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcPartyAByPartyAIds(String[] partyAIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcBrandProjectProgress;
+
+/**
+ * cmc品牌项目进度Service接口
+ * 
+ * @author cmc
+ * @date 2024-06-12
+ */
+public interface ICmcBrandProjectProgressService 
+{
+    /**
+     * 查询cmc品牌项目进度
+     * 
+     * @param progressId cmc品牌项目进度主键
+     * @return cmc品牌项目进度
+     */
+    public CmcBrandProjectProgress selectCmcBrandProjectProgressByProgressId(Long progressId);
+
+    /**
+     * 查询cmc品牌项目进度列表
+     * 
+     * @param cmcBrandProjectProgress cmc品牌项目进度
+     * @return cmc品牌项目进度集合
+     */
+    public List<CmcBrandProjectProgress> selectCmcBrandProjectProgressList(CmcBrandProjectProgress cmcBrandProjectProgress);
+
+    /**
+     * 新增cmc品牌项目进度
+     * 
+     * @param cmcBrandProjectProgress cmc品牌项目进度
+     * @return 结果
+     */
+    public int insertCmcBrandProjectProgress(CmcBrandProjectProgress cmcBrandProjectProgress);
+
+    /**
+     * 修改cmc品牌项目进度
+     * 
+     * @param cmcBrandProjectProgress cmc品牌项目进度
+     * @return 结果
+     */
+    public int updateCmcBrandProjectProgress(CmcBrandProjectProgress cmcBrandProjectProgress);
+
+    /**
+     * 批量删除cmc品牌项目进度
+     * 
+     * @param progressIds 需要删除的cmc品牌项目进度主键集合
+     * @return 结果
+     */
+    public int deleteCmcBrandProjectProgressByProgressIds(Long[] progressIds);
+
+    /**
+     * 删除cmc品牌项目进度信息
+     * 
+     * @param progressId cmc品牌项目进度主键
+     * @return 结果
+     */
+    public int deleteCmcBrandProjectProgressByProgressId(Long progressId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcPartyA;
+
+/**
+ * cmc业主单位Service接口
+ * 
+ * @author cmc
+ * @date 2024-06-12
+ */
+public interface ICmcPartyAService 
+{
+    /**
+     * 查询cmc业主单位
+     * 
+     * @param partyAId cmc业主单位主键
+     * @return cmc业主单位
+     */
+    public CmcPartyA selectCmcPartyAByPartyAId(String partyAId);
+
+    /**
+     * 查询cmc业主单位列表
+     * 
+     * @param cmcPartyA cmc业主单位
+     * @return cmc业主单位集合
+     */
+    public List<CmcPartyA> selectCmcPartyAList(CmcPartyA cmcPartyA);
+
+    /**
+     * 新增cmc业主单位
+     * 
+     * @param cmcPartyA cmc业主单位
+     * @return 结果
+     */
+    public int insertCmcPartyA(CmcPartyA cmcPartyA);
+
+    /**
+     * 修改cmc业主单位
+     * 
+     * @param cmcPartyA cmc业主单位
+     * @return 结果
+     */
+    public int updateCmcPartyA(CmcPartyA cmcPartyA);
+
+    /**
+     * 批量删除cmc业主单位
+     * 
+     * @param partyAIds 需要删除的cmc业主单位主键集合
+     * @return 结果
+     */
+    public int deleteCmcPartyAByPartyAIds(String[] partyAIds);
+
+    /**
+     * 删除cmc业主单位信息
+     * 
+     * @param partyAId cmc业主单位主键
+     * @return 结果
+     */
+    public int deleteCmcPartyAByPartyAId(String partyAId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcBrandProjectProgressServiceImpl.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.CmcBrandProjectProgressMapper;
+import com.ruoyi.oa.domain.CmcBrandProjectProgress;
+import com.ruoyi.oa.service.ICmcBrandProjectProgressService;
+
+/**
+ * cmc品牌项目进度Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-06-12
+ */
+@Service
+public class CmcBrandProjectProgressServiceImpl implements ICmcBrandProjectProgressService 
+{
+    @Autowired
+    private CmcBrandProjectProgressMapper cmcBrandProjectProgressMapper;
+
+    /**
+     * 查询cmc品牌项目进度
+     * 
+     * @param progressId cmc品牌项目进度主键
+     * @return cmc品牌项目进度
+     */
+    @Override
+    public CmcBrandProjectProgress selectCmcBrandProjectProgressByProgressId(Long progressId)
+    {
+        return cmcBrandProjectProgressMapper.selectCmcBrandProjectProgressByProgressId(progressId);
+    }
+
+    /**
+     * 查询cmc品牌项目进度列表
+     * 
+     * @param cmcBrandProjectProgress cmc品牌项目进度
+     * @return cmc品牌项目进度
+     */
+    @Override
+    public List<CmcBrandProjectProgress> selectCmcBrandProjectProgressList(CmcBrandProjectProgress cmcBrandProjectProgress)
+    {
+        return cmcBrandProjectProgressMapper.selectCmcBrandProjectProgressList(cmcBrandProjectProgress);
+    }
+
+    /**
+     * 新增cmc品牌项目进度
+     * 
+     * @param cmcBrandProjectProgress cmc品牌项目进度
+     * @return 结果
+     */
+    @Override
+    public int insertCmcBrandProjectProgress(CmcBrandProjectProgress cmcBrandProjectProgress)
+    {
+        return cmcBrandProjectProgressMapper.insertCmcBrandProjectProgress(cmcBrandProjectProgress);
+    }
+
+    /**
+     * 修改cmc品牌项目进度
+     * 
+     * @param cmcBrandProjectProgress cmc品牌项目进度
+     * @return 结果
+     */
+    @Override
+    public int updateCmcBrandProjectProgress(CmcBrandProjectProgress cmcBrandProjectProgress)
+    {
+        return cmcBrandProjectProgressMapper.updateCmcBrandProjectProgress(cmcBrandProjectProgress);
+    }
+
+    /**
+     * 批量删除cmc品牌项目进度
+     * 
+     * @param progressIds 需要删除的cmc品牌项目进度主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcBrandProjectProgressByProgressIds(Long[] progressIds)
+    {
+        return cmcBrandProjectProgressMapper.deleteCmcBrandProjectProgressByProgressIds(progressIds);
+    }
+
+    /**
+     * 删除cmc品牌项目进度信息
+     * 
+     * @param progressId cmc品牌项目进度主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcBrandProjectProgressByProgressId(Long progressId)
+    {
+        return cmcBrandProjectProgressMapper.deleteCmcBrandProjectProgressByProgressId(progressId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcPartyAServiceImpl.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.CmcPartyAMapper;
+import com.ruoyi.oa.domain.CmcPartyA;
+import com.ruoyi.oa.service.ICmcPartyAService;
+
+/**
+ * cmc业主单位Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-06-12
+ */
+@Service
+public class CmcPartyAServiceImpl implements ICmcPartyAService 
+{
+    @Autowired
+    private CmcPartyAMapper cmcPartyAMapper;
+
+    /**
+     * 查询cmc业主单位
+     * 
+     * @param partyAId cmc业主单位主键
+     * @return cmc业主单位
+     */
+    @Override
+    public CmcPartyA selectCmcPartyAByPartyAId(String partyAId)
+    {
+        return cmcPartyAMapper.selectCmcPartyAByPartyAId(partyAId);
+    }
+
+    /**
+     * 查询cmc业主单位列表
+     * 
+     * @param cmcPartyA cmc业主单位
+     * @return cmc业主单位
+     */
+    @Override
+    public List<CmcPartyA> selectCmcPartyAList(CmcPartyA cmcPartyA)
+    {
+        return cmcPartyAMapper.selectCmcPartyAList(cmcPartyA);
+    }
+
+    /**
+     * 新增cmc业主单位
+     * 
+     * @param cmcPartyA cmc业主单位
+     * @return 结果
+     */
+    @Override
+    public int insertCmcPartyA(CmcPartyA cmcPartyA)
+    {
+        return cmcPartyAMapper.insertCmcPartyA(cmcPartyA);
+    }
+
+    /**
+     * 修改cmc业主单位
+     * 
+     * @param cmcPartyA cmc业主单位
+     * @return 结果
+     */
+    @Override
+    public int updateCmcPartyA(CmcPartyA cmcPartyA)
+    {
+        return cmcPartyAMapper.updateCmcPartyA(cmcPartyA);
+    }
+
+    /**
+     * 批量删除cmc业主单位
+     * 
+     * @param partyAIds 需要删除的cmc业主单位主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcPartyAByPartyAIds(String[] partyAIds)
+    {
+        return cmcPartyAMapper.deleteCmcPartyAByPartyAIds(partyAIds);
+    }
+
+    /**
+     * 删除cmc业主单位信息
+     * 
+     * @param partyAId cmc业主单位主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcPartyAByPartyAId(String partyAId)
+    {
+        return cmcPartyAMapper.deleteCmcPartyAByPartyAId(partyAId);
+    }
+}

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

@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="projectId"    column="project_id"    />
         <result property="projectNumber"    column="project_number"    />
         <result property="projectName"    column="project_name"    />
-        <result property="partyA"    column="party_a"    />
+        <result property="partyAId"    column="party_a_id"    />
         <result property="aPerson"    column="a_person"    />
         <result property="aPhone"    column="a_phone"    />
         <result property="partnerId"    column="partner_id"    />
@@ -16,32 +16,47 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="telephone"    column="telephone"    />
         <result property="duration"    column="duration"    />
         <result property="amount"    column="amount"    />
+        <result property="content"    column="content"    />
         <result property="remark"    column="remark"    />
+        <association property="partner"    javaType="CmcPartner"         resultMap="CmcPartnerResult" />
+        <association property="partyA"    javaType="CmcPartyA"         resultMap="CmcPartyAResult" />
+    </resultMap>
+
+    <resultMap type="CmcPartner" id="CmcPartnerResult">
+        <result property="partnerId"    column="partner_id"    />
+        <result property="partnerName"    column="partner_name"    />
+    </resultMap>
+
+    <resultMap type="CmcPartyA" id="CmcPartyAResult">
+        <result property="partyAId"    column="party_a_id"    />
+        <result property="partyAName"    column="party_a_name"    />
     </resultMap>
 
     <sql id="selectCmcBrandProjectVo">
-        select project_id, project_number, project_name, party_a, a_person, a_phone, partner_id, contact_person, telephone, duration, amount, remark from cmc_brand_project
+        select bp.project_id, bp.project_number, bp.project_name, bp.party_a_id, pa.party_a_name, bp.a_person, bp.a_phone, bp.partner_id, p.partner_name, bp.contact_person, bp.telephone, bp.duration, bp.amount, bp.content, bp.remark from cmc_brand_project as bp
+        left join cmc_partner as p on p.partner_id = bp.partner_id
+        left join cmc_party_a as pa on pa.party_a_id = bp.party_a_id
     </sql>
 
     <select id="selectCmcBrandProjectList" parameterType="CmcBrandProject" resultMap="CmcBrandProjectResult">
         <include refid="selectCmcBrandProjectVo"/>
         <where>  
-            <if test="projectNumber != null  and projectNumber != ''"> and project_number = #{projectNumber}</if>
-            <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
-            <if test="partyA != null  and partyA != ''"> and party_a = #{partyA}</if>
-            <if test="aPerson != null  and aPerson != ''"> and a_person = #{aPerson}</if>
-            <if test="aPhone != null  and aPhone != ''"> and a_phone = #{aPhone}</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="telephone != null  and telephone != ''"> and telephone = #{telephone}</if>
-            <if test="duration != null  and duration != ''"> and duration = #{duration}</if>
-            <if test="amount != null "> and amount = #{amount}</if>
+            <if test="projectNumber != null  and projectNumber != ''"> and bp.project_number = #{projectNumber}</if>
+            <if test="projectName != null  and projectName != ''"> and bp.project_name like concat('%', #{projectName}, '%')</if>
+            <if test="partyAId != null  and partyAId != ''"> and bp.party_a_id = #{partyAId}</if>
+            <if test="aPerson != null  and aPerson != ''"> and bp.a_person = #{aPerson}</if>
+            <if test="aPhone != null  and aPhone != ''"> and bp.a_phone = #{aPhone}</if>
+            <if test="partnerId != null  and partnerId != ''"> and bp.partner_id = #{partnerId}</if>
+            <if test="contactPerson != null  and contactPerson != ''"> and bp.contact_person = #{contactPerson}</if>
+            <if test="telephone != null  and telephone != ''"> and bp.telephone = #{telephone}</if>
+            <if test="duration != null  and duration != ''"> and bp.duration = #{duration}</if>
+            <if test="amount != null "> and bp.amount = #{amount}</if>
         </where>
     </select>
     
     <select id="selectCmcBrandProjectByProjectId" parameterType="String" resultMap="CmcBrandProjectResult">
         <include refid="selectCmcBrandProjectVo"/>
-        where project_id = #{projectId}
+        where bp.project_id = #{projectId}
     </select>
         
     <insert id="insertCmcBrandProject" parameterType="CmcBrandProject">
@@ -50,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null">project_id,</if>
             <if test="projectNumber != null">project_number,</if>
             <if test="projectName != null">project_name,</if>
-            <if test="partyA != null">party_a,</if>
+            <if test="partyAId != null">party_a_id,</if>
             <if test="aPerson != null">a_person,</if>
             <if test="aPhone != null">a_phone,</if>
             <if test="partnerId != null">partner_id,</if>
@@ -58,13 +73,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="telephone != null">telephone,</if>
             <if test="duration != null">duration,</if>
             <if test="amount != null">amount,</if>
+            <if test="content != null">content,</if>
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectId != null">#{projectId},</if>
             <if test="projectNumber != null">#{projectNumber},</if>
             <if test="projectName != null">#{projectName},</if>
-            <if test="partyA != null">#{partyA},</if>
+            <if test="partyAId != null">#{partyAId},</if>
             <if test="aPerson != null">#{aPerson},</if>
             <if test="aPhone != null">#{aPhone},</if>
             <if test="partnerId != null">#{partnerId},</if>
@@ -72,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="telephone != null">#{telephone},</if>
             <if test="duration != null">#{duration},</if>
             <if test="amount != null">#{amount},</if>
+            <if test="content != null">#{content},</if>
             <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
@@ -81,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="projectNumber != null">project_number = #{projectNumber},</if>
             <if test="projectName != null">project_name = #{projectName},</if>
-            <if test="partyA != null">party_a = #{partyA},</if>
+            <if test="partyAId != null">party_a_id = #{partyAId},</if>
             <if test="aPerson != null">a_person = #{aPerson},</if>
             <if test="aPhone != null">a_phone = #{aPhone},</if>
             <if test="partnerId != null">partner_id = #{partnerId},</if>
@@ -89,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="telephone != null">telephone = #{telephone},</if>
             <if test="duration != null">duration = #{duration},</if>
             <if test="amount != null">amount = #{amount},</if>
+            <if test="content != null">content = #{content},</if>
             <if test="remark != null">remark = #{remark},</if>
         </trim>
         where project_id = #{projectId}

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

@@ -0,0 +1,72 @@
+<?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.CmcBrandProjectProgressMapper">
+    
+    <resultMap type="CmcBrandProjectProgress" id="CmcBrandProjectProgressResult">
+        <result property="progressId"    column="progress_id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="percentage"    column="percentage"    />
+        <result property="date"    column="date"    />
+        <result property="situation"    column="situation"    />
+    </resultMap>
+
+    <sql id="selectCmcBrandProjectProgressVo">
+        select progress_id, project_id, percentage, date, situation from cmc_brand_project_progress
+    </sql>
+
+    <select id="selectCmcBrandProjectProgressList" parameterType="CmcBrandProjectProgress" resultMap="CmcBrandProjectProgressResult">
+        <include refid="selectCmcBrandProjectProgressVo"/>
+        <where>  
+            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
+            <if test="percentage != null  and percentage != ''"> and percentage = #{percentage}</if>
+            <if test="date != null "> and date = #{date}</if>
+            <if test="situation != null  and situation != ''"> and situation = #{situation}</if>
+        </where>
+        order by date asc
+    </select>
+    
+    <select id="selectCmcBrandProjectProgressByProgressId" parameterType="Long" resultMap="CmcBrandProjectProgressResult">
+        <include refid="selectCmcBrandProjectProgressVo"/>
+        where progress_id = #{progressId}
+    </select>
+        
+    <insert id="insertCmcBrandProjectProgress" parameterType="CmcBrandProjectProgress" useGeneratedKeys="true" keyProperty="progressId">
+        insert into cmc_brand_project_progress
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">project_id,</if>
+            <if test="percentage != null">percentage,</if>
+            <if test="date != null">date,</if>
+            <if test="situation != null">situation,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">#{projectId},</if>
+            <if test="percentage != null">#{percentage},</if>
+            <if test="date != null">#{date},</if>
+            <if test="situation != null">#{situation},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcBrandProjectProgress" parameterType="CmcBrandProjectProgress">
+        update cmc_brand_project_progress
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="percentage != null">percentage = #{percentage},</if>
+            <if test="date != null">date = #{date},</if>
+            <if test="situation != null">situation = #{situation},</if>
+        </trim>
+        where progress_id = #{progressId}
+    </update>
+
+    <delete id="deleteCmcBrandProjectProgressByProgressId" parameterType="Long">
+        delete from cmc_brand_project_progress where progress_id = #{progressId}
+    </delete>
+
+    <delete id="deleteCmcBrandProjectProgressByProgressIds" parameterType="String">
+        delete from cmc_brand_project_progress where progress_id in 
+        <foreach item="progressId" collection="array" open="(" separator="," close=")">
+            #{progressId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -30,7 +30,7 @@
     <resultMap type="CmcTender" id="CmcTenderResult">
         <result property="tenderId"    column="tender_id"    />
         <result property="projectName"    column="project_name"    />
-        <result property="partyA"    column="party_a"    />
+        <result property="partyAId"    column="party_a_id"    />
         <result property="aPerson"    column="a_person"    />
         <result property="aPhone"    column="a_phone"    />
         <result property="agent"    column="agent"    />
@@ -49,7 +49,7 @@
     </resultMap>
 
     <sql id="selectCmcContractVo">
-        select c.contract_id, c.contract_code, c.contract_number, c.tender_id, t.project_name as project_name, t.party_a as party_a, t.a_person as a_person,
+        select c.contract_id, c.contract_code, c.contract_number, c.tender_id, t.project_name as project_name, t.party_a_id as party_a_id, t.a_person as a_person,
                t.a_phone as a_phone, t.agent as agent, t.agent_person as agent_person, t.agent_phone as agent_phone, c.amount, c.deposit, c.contract_document,
                c.drafter, u.nick_name as draft_nick_name, c.draft_time, c.remark, c.sign_date, c.sign_remark, c.sign_scan, c.comment_type, c.manager_comment, c.manager_user_id, u1.nick_name as manager_nick_name,
                c.manager_time from cmc_contract as c

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

@@ -1,43 +1,76 @@
 <?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.CmcPartnerMapper">
-    
+
     <resultMap type="CmcPartner" id="CmcPartnerResult">
         <result property="partnerId"    column="partner_id"    />
         <result property="partnerName"    column="partner_name"    />
         <result property="contactPerson"    column="contact_person"    />
+        <result property="telephone"    column="telephone"    />
+        <result property="qualification"    column="qualification"    />
+        <result property="inWorker"    column="in_worker"    />
+        <result property="outWorker"    column="out_worker"    />
+        <result property="equipment"    column="equipment"    />
+        <result property="strength"    column="strength"    />
+        <result property="fulfill"    column="fulfill"    />
+        <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectCmcPartnerVo">
-        select partner_id, partner_name, contact_person from cmc_partner
+        select partner_id, partner_name, contact_person, telephone, qualification, in_worker, out_worker, equipment, strength, fulfill, remark from cmc_partner
     </sql>
 
     <select id="selectCmcPartnerList" parameterType="CmcPartner" resultMap="CmcPartnerResult">
         <include refid="selectCmcPartnerVo"/>
-        <where>  
+        <where>
             <if test="partnerName != null  and partnerName != ''"> and partner_name like concat('%', #{partnerName}, '%')</if>
+            <if test="contactPerson != null  and contactPerson != ''"> and contact_person = #{contactPerson}</if>
+            <if test="telephone != null  and telephone != ''"> and telephone = #{telephone}</if>
+            <if test="qualification != null  and qualification != ''"> and qualification = #{qualification}</if>
+            <if test="inWorker != null "> and in_worker = #{inWorker}</if>
+            <if test="outWorker != null "> and out_worker = #{outWorker}</if>
+            <if test="equipment != null  and equipment != ''"> and equipment = #{equipment}</if>
+            <if test="strength != null  and strength != ''"> and strength = #{strength}</if>
+            <if test="fulfill != null  and fulfill != ''"> and fulfill = #{fulfill}</if>
         </where>
+        order by partner_id + 0 asc
     </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>
             <if test="contactPerson != null">contact_person,</if>
-         </trim>
+            <if test="telephone != null">telephone,</if>
+            <if test="qualification != null">qualification,</if>
+            <if test="inWorker != null">in_worker,</if>
+            <if test="outWorker != null">out_worker,</if>
+            <if test="equipment != null">equipment,</if>
+            <if test="strength != null">strength,</if>
+            <if test="fulfill != null">fulfill,</if>
+            <if test="remark != null">remark,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="partnerId != null">#{partnerId},</if>
             <if test="partnerName != null">#{partnerName},</if>
             <if test="contactPerson != null">#{contactPerson},</if>
-         </trim>
+            <if test="telephone != null">#{telephone},</if>
+            <if test="qualification != null">#{qualification},</if>
+            <if test="inWorker != null">#{inWorker},</if>
+            <if test="outWorker != null">#{outWorker},</if>
+            <if test="equipment != null">#{equipment},</if>
+            <if test="strength != null">#{strength},</if>
+            <if test="fulfill != null">#{fulfill},</if>
+            <if test="remark != null">#{remark},</if>
+        </trim>
     </insert>
 
     <update id="updateCmcPartner" parameterType="CmcPartner">
@@ -45,6 +78,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="partnerName != null">partner_name = #{partnerName},</if>
             <if test="contactPerson != null">contact_person = #{contactPerson},</if>
+            <if test="telephone != null">telephone = #{telephone},</if>
+            <if test="qualification != null">qualification = #{qualification},</if>
+            <if test="inWorker != null">in_worker = #{inWorker},</if>
+            <if test="outWorker != null">out_worker = #{outWorker},</if>
+            <if test="equipment != null">equipment = #{equipment},</if>
+            <if test="strength != null">strength = #{strength},</if>
+            <if test="fulfill != null">fulfill = #{fulfill},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where partner_id = #{partnerId}
     </update>
@@ -54,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCmcPartnerByPartnerIds" parameterType="String">
-        delete from cmc_partner where partner_id in 
+        delete from cmc_partner where partner_id in
         <foreach item="partnerId" collection="array" open="(" separator="," close=")">
             #{partnerId}
         </foreach>

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

@@ -0,0 +1,59 @@
+<?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.CmcPartyAMapper">
+    
+    <resultMap type="CmcPartyA" id="CmcPartyAResult">
+        <result property="partyAId"    column="party_a_id"    />
+        <result property="partyAName"    column="party_a_name"    />
+    </resultMap>
+
+    <sql id="selectCmcPartyAVo">
+        select party_a_id, party_a_name from cmc_party_a
+    </sql>
+
+    <select id="selectCmcPartyAList" parameterType="CmcPartyA" resultMap="CmcPartyAResult">
+        <include refid="selectCmcPartyAVo"/>
+        <where>  
+            <if test="partyAName != null  and partyAName != ''"> and party_a_name like concat('%', #{partyAName}, '%')</if>
+        </where>
+        order by party_a_id + 0 asc
+    </select>
+    
+    <select id="selectCmcPartyAByPartyAId" parameterType="String" resultMap="CmcPartyAResult">
+        <include refid="selectCmcPartyAVo"/>
+        where party_a_id = #{partyAId}
+    </select>
+        
+    <insert id="insertCmcPartyA" parameterType="CmcPartyA">
+        insert into cmc_party_a
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="partyAId != null">party_a_id,</if>
+            <if test="partyAName != null">party_a_name,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="partyAId != null">#{partyAId},</if>
+            <if test="partyAName != null">#{partyAName},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcPartyA" parameterType="CmcPartyA">
+        update cmc_party_a
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="partyAName != null">party_a_name = #{partyAName},</if>
+        </trim>
+        where party_a_id = #{partyAId}
+    </update>
+
+    <delete id="deleteCmcPartyAByPartyAId" parameterType="String">
+        delete from cmc_party_a where party_a_id = #{partyAId}
+    </delete>
+
+    <delete id="deleteCmcPartyAByPartyAIds" parameterType="String">
+        delete from cmc_party_a where party_a_id in 
+        <foreach item="partyAId" collection="array" open="(" separator="," close=")">
+            #{partyAId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -11,7 +11,7 @@
         <result property="projectLeader"    column="project_leader"    />
         <result property="isFinished"    column="is_finished"    />
         <result property="projectSource"    column="project_source"    />
-        <result property="partyA"    column="party_a"    />
+        <result property="partyAId"    column="party_a_id"    />
         <result property="contactPerson"    column="contact_person"    />
         <result property="telephone"    column="telephone"    />
         <result property="projectType"    column="project_type"    />
@@ -40,6 +40,7 @@
         <association property="projectLeaderUser"    javaType="SysUser"         resultMap="ProjectLeaderResult" />
         <association property="projectRegistrantUser"    javaType="SysUser"         resultMap="ProjectRegistrantResult" />
         <association property="technicalDirectorUser"    javaType="SysUser"         resultMap="TechnicalDirectorResult" />
+        <association property="partyA"    javaType="CmcPartyA"         resultMap="CmcPartyAResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="ProjectLeaderResult">
@@ -57,14 +58,20 @@
         <result property="nickName"    column="director_nick_name"    />
     </resultMap>
 
+    <resultMap type="CmcPartyA" id="CmcPartyAResult">
+        <result property="partyAId"    column="party_a_id"    />
+        <result property="partyAName"    column="party_a_name"    />
+    </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,
+        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_id, pa.party_a_name, 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.organize_document, p.organize_time,
                p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark, c.technical_director, u2.nick_name as director_nick_name, c.quality_inspector, p.project_kml, p.project_cp, p.kml_lng, p.kml_lat, p.cars, p.drivers, p.devices, p.participates, p.task_document 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
         left join cmc_technical as c on c.project_id = p.project_id
         left join sys_user as u2 on u2.user_id = c.technical_director
+        left join cmc_party_a as pa on pa.party_a_id = p.party_a_id
     </sql>
 
     <select id="selectCmcProjectList" parameterType="CmcProject" resultMap="CmcProjectResult">
@@ -75,7 +82,7 @@
             <if test="projectLeader != null "> and p.project_leader = #{projectLeader}</if>
             <if test="isFinished != null  and isFinished != ''"> and p.is_finished = #{isFinished}</if>
             <if test="projectSource != null  and projectSource != ''"> and p.project_source = #{projectSource}</if>
-            <if test="partyA != null  and partyA != ''"> and p.party_a = #{partyA}</if>
+            <if test="partyAId != null  and partyAId != ''"> and p.party_a_id = #{partyAId}</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="projectType != null  and projectType != ''"> and p.project_type = #{projectType}</if>
@@ -110,7 +117,7 @@
             <if test="projectLeader != null">project_leader,</if>
             <if test="isFinished != null">is_finished,</if>
             <if test="projectSource != null">project_source,</if>
-            <if test="partyA != null">party_a,</if>
+            <if test="partyAId != null">party_a_id,</if>
             <if test="contactPerson != null">contact_person,</if>
             <if test="telephone != null">telephone,</if>
             <if test="projectType != null">project_type,</if>
@@ -143,7 +150,7 @@
             <if test="projectLeader != null">#{projectLeader},</if>
             <if test="isFinished != null">#{isFinished},</if>
             <if test="projectSource != null">#{projectSource},</if>
-            <if test="partyA != null">#{partyA},</if>
+            <if test="partyAId != null">#{partyAId},</if>
             <if test="contactPerson != null">#{contactPerson},</if>
             <if test="telephone != null">#{telephone},</if>
             <if test="projectType != null">#{projectType},</if>
@@ -179,7 +186,7 @@
             <if test="projectLeader != null">project_leader = #{projectLeader},</if>
             <if test="isFinished != null">is_finished = #{isFinished},</if>
             <if test="projectSource != null">project_source = #{projectSource},</if>
-            <if test="partyA != null">party_a = #{partyA},</if>
+            <if test="partyAId != null">party_a_id = #{partyAId},</if>
             <if test="contactPerson != null">contact_person = #{contactPerson},</if>
             <if test="telephone != null">telephone = #{telephone},</if>
             <if test="projectType != null">project_type = #{projectType},</if>

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

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="subAmount"    column="sub_amount"    />
         <result property="partnerId"    column="partner_id"    />
         <result property="contactPerson"    column="contact_person"    />
+        <result property="telephone"    column="telephone"    />
         <result property="contractDocument"    column="contract_document"    />
         <result property="drafter"    column="drafter"    />
         <result property="draftTime"    column="draft_time"    />
@@ -37,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcSubContractVo">
-        select sc.sub_contract_id, sc.project_id, sc.sub_contract_name, sc.sub_amount, sc.partner_id, sc.contact_person, sc.contract_document, sc.drafter, u.nick_name as draft_nick_name, sc.draft_time,
+        select sc.sub_contract_id, sc.project_id, sc.sub_contract_name, sc.sub_amount, sc.partner_id, sc.contact_person, sc.telephone, sc.contract_document, sc.drafter, u.nick_name as draft_nick_name, sc.draft_time,
                sc.remark, sc.sign_date, sc.sign_remark, sc.sign_scan, sc.comment_type, sc.manager_comment, sc.manager_user_id, u1.nick_name as manager_nick_name, sc.manager_time from cmc_sub_contract as sc
         left join sys_user as u on u.user_id = sc.drafter
         left join sys_user as u1 on u1.user_id = sc.manager_user_id
@@ -51,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="subAmount != null "> and sc.sub_amount = #{subAmount}</if>
             <if test="partnerId != null  and partnerId != ''"> and sc.partner_id = #{partnerId}</if>
             <if test="contactPerson != null  and contactPerson != ''"> and sc.contact_person = #{contactPerson}</if>
+            <if test="telephone != null  and telephone != ''"> and sc.telephone = #{telephone}</if>
             <if test="contractDocument != null  and contractDocument != ''"> and sc.contract_document = #{contractDocument}</if>
             <if test="drafter != null "> and sc.drafter = #{drafter}</if>
             <if test="draftTime != null "> and sc.draft_time = #{draftTime}</if>
@@ -75,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="subAmount != null">sub_amount,</if>
             <if test="partnerId != null">partner_id,</if>
             <if test="contactPerson != null">contact_person,</if>
+            <if test="telephone != null">telephone,</if>
             <if test="contractDocument != null">contract_document,</if>
             <if test="drafter != null">drafter,</if>
             <if test="draftTime != null">draft_time,</if>
@@ -94,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="subAmount != null">#{subAmount},</if>
             <if test="partnerId != null">#{partnerId},</if>
             <if test="contactPerson != null">#{contactPerson},</if>
+            <if test="telephone != null">#{telephone},</if>
             <if test="contractDocument != null">#{contractDocument},</if>
             <if test="drafter != null">#{drafter},</if>
             <if test="draftTime != null">#{draftTime},</if>
@@ -116,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="telephone != null">telephone = #{telephone},</if>
             <if test="contractDocument != null">contract_document = #{contractDocument},</if>
             <if test="drafter != null">drafter = #{drafter},</if>
             <if test="draftTime != null">draft_time = #{draftTime},</if>

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

@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcTender" id="CmcTenderResult">
         <result property="tenderId"    column="tender_id"    />
         <result property="projectName"    column="project_name"    />
-        <result property="partyA"    column="party_a"    />
+        <result property="partyAId"    column="party_a_id"    />
         <result property="aPerson"    column="a_person"    />
         <result property="aPhone"    column="a_phone"    />
         <result property="agent"    column="agent"    />
@@ -39,6 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <association property="checkerUser"    javaType="SysUser"         resultMap="CheckerUserResult" />
         <association property="printerUser"    javaType="SysUser"         resultMap="PrinterUserResult" />
         <association property="tenderDept"    javaType="SysDept"         resultMap="SysDeptResult" />
+        <association property="tenderDept"    javaType="SysDept"         resultMap="SysDeptResult" />
+        <association property="partyA"    javaType="CmcPartyA"         resultMap="CmcPartyAResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="TrusteeUserResult">
@@ -76,8 +78,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName"    column="dept_name"    />
     </resultMap>
 
+    <resultMap type="CmcPartyA" id="CmcPartyAResult">
+        <result property="partyAId"    column="party_a_id"    />
+        <result property="partyAName"    column="party_a_name"    />
+    </resultMap>
+
     <sql id="selectCmcTenderVo">
-        select t.tender_id, t.project_name, t.party_a, t.a_person, t.a_phone, t.agent, t.agent_person, t.agent_phone, t.place, t.dept, t.trustee, t.budget, t.quote, t.deposit, t.tender_time,
+        select t.tender_id, t.project_name, t.party_a_id, pa.party_a_name, t.a_person, t.a_phone, t.agent, t.agent_person, t.agent_phone, t.place, t.dept, t.trustee, t.budget, t.quote, t.deposit, t.tender_time,
                t.bid_buy_deadline, t.bid_website, t.bid_document, t.project_briefly, t.business_writer, t.business_deadline, t.tech_writer, t.tech_deadline, t.tender_combiner, t.tender_checker,
                t.tender_printer, t.tender_document, u.nick_name as trustee_nick_name, u1.nick_name as business_nick_name, u2.nick_name as tech_nick_name, u3.nick_name as combiner_nick_name,
                u4.nick_name as checker_nick_name, u5.nick_name as printer_nick_name, d.dept_name from cmc_tender as t
@@ -88,13 +95,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_user as u4 on u4.user_id = t.tender_checker
         left join sys_user as u5 on u5.user_id = t.tender_printer
         left join sys_dept as d on d.dept_id = t.dept
+        left join cmc_party_a as pa on pa.party_a_id = t.party_a_id
     </sql>
 
     <select id="selectCmcTenderList" parameterType="CmcTender" resultMap="CmcTenderResult">
         <include refid="selectCmcTenderVo"/>
         <where>  
             <if test="projectName != null  and projectName != ''"> and t.project_name like concat('%', #{projectName}, '%')</if>
-            <if test="partyA != null  and partyA != ''"> and t.party_a like concat('%', #{partyA}, '%')</if>
+            <if test="partyAId != null  and partyAId != ''"> and t.party_a_id like concat('%', #{partyAId}, '%')</if>
             <if test="aPerson != null  and aPerson != ''"> and t.a_person like concat('%', #{aPerson}, '%')</if>
             <if test="aPhone != null  and aPhone != ''"> and t.a_phone like concat('%', #{aPhone}, '%')</if>
             <if test="agent != null  and agent != ''"> and t.agent like concat('%', #{agent}, '%')</if>
@@ -132,7 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="tenderId != null">tender_id,</if>
             <if test="projectName != null">project_name,</if>
-            <if test="partyA != null">party_a,</if>
+            <if test="partyAId != null">party_a_id,</if>
             <if test="aPerson != null">a_person,</if>
             <if test="aPhone != null">a_phone,</if>
             <if test="agent != null">agent,</if>
@@ -161,7 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="tenderId != null">#{tenderId},</if>
             <if test="projectName != null">#{projectName},</if>
-            <if test="partyA != null">#{partyA},</if>
+            <if test="partyAId != null">#{partyAId},</if>
             <if test="aPerson != null">#{aPerson},</if>
             <if test="aPhone != null">#{aPhone},</if>
             <if test="agent != null">#{agent},</if>
@@ -193,7 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update cmc_tender
         <trim prefix="SET" suffixOverrides=",">
             <if test="projectName != null">project_name = #{projectName},</if>
-            <if test="partyA != null">party_a = #{partyA},</if>
+            <if test="partyAId != null">party_a_id = #{partyAId},</if>
             <if test="aPerson != null">a_person = #{aPerson},</if>
             <if test="aPhone != null">a_phone = #{aPhone},</if>
             <if test="agent != null">agent = #{agent},</if>

oa-back/sql/sql.sql

@@ -338,9 +338,9 @@ insert into sys_role values('3', '人事管理员',	'staff', 3, 3, 1, 1, '0', '0
 insert into sys_role values('4', '设备管理员',	'device', 4, 4, 1, 1, '0', '0', 'admin', sysdate(), '', null, '设备管理员');
 insert into sys_role values('5', '车辆管理员',	'car', 5, 5, 1, 1, '0', '0', 'admin', sysdate(), '', null, '车辆管理员');
 insert into sys_role values('6', '资料归档员',	'archive', 6, 6, 1, 1, '0', '0', 'admin', sysdate(), '', null, '资料归档员');
-insert into sys_role values('7', '管理人员',	'leader', 7, 7, 1, 1, '0', '0', 'admin', sysdate(), '', null, '管理人员');
-insert into sys_role values('8', '经营人员',	'business', 8, 8, 1, 1, '0', '0', 'admin', sysdate(), '', null, '经营人员');
-
+insert into sys_role values('7', '管理层',		'leader', 7, 7, 1, 1, '0', '0', 'admin', sysdate(), '', null, '管理层');	
+insert into sys_role values('8', '经营管理员',	'business', 8, 8, 1, 1, '0', '0', 'admin', sysdate(), '', null, '经营管理员');
+insert into sys_role values('9', '项目管理员',	'project', 9, 9, 1, 1, '0', '0', 'admin', sysdate(), '', null, '项目管理员');
 
 -- ----------------------------
 -- 5、菜单权限表
@@ -380,12 +380,14 @@ insert into sys_menu values('4', 	'人事管理', '0', '4', 'staff',		null, '',
 insert into sys_menu values('5', 	'设备管理', '0', '5', 'device',		null, '', 1, 0, 'M', '0', '0', '', 'equipment',	'admin', sysdate(), '', null, '设备管理菜单');
 insert into sys_menu values('6', 	'车辆管理', '0', '6', 'car',		'oa/car/index', 			'', 1, 0, 'C', '0', '0', 'oa:car:list', 	'car',		'admin', sysdate(), '', null, '车辆管理菜单');
 insert into sys_menu values('7', 	'投标管理', '0', '7', 'tender',		'oa/tender/index', 			'', 1, 0, 'C', '0', '0', 'oa:tender:list', 	'guide',	'admin', sysdate(), '', null, '投标管理菜单');
-insert into sys_menu values('8', 	'品牌项目', '0', '8', 'brand',		'oa/brand/brandProject', 	'', 1, 0, 'C', '0', '0', 'oa:brand:list', 	'project',	'admin', sysdate(), '', null, '品牌项目管理菜单');
-insert into sys_menu values('9', 	'合同管理', '0', '9', 'contract',	'oa/contract/index', 		'', 1, 0, 'C', '0', '0', 'oa:contract:list','documentation',	'admin', sysdate(), '', null, '合同管理菜单');
-insert into sys_menu values('10', 	'项目台账', '0', '10', 'project',	'oa/project/index', 		'', 1, 0, 'C', '0', '0', 'oa:project:list', 'project',	'admin', sysdate(), '', null, '项目管理菜单');
-insert into sys_menu values('11', 	'单价管理', '0', '11', 'price',		'oa/price/index', 			'', 1, 0, 'C', '0', '0', 'oa:price:list', 	'money',	'admin', sysdate(), '', null, '单价管理菜单');
-insert into sys_menu values('12', 	'资料管理', '0', '12', 'file', 		'file/filesProject/index',  '', 1, 0, 'C', '0', '0', 'oa:archive:list',	'education','admin', sysdate(), '', NULL, '资料管理菜单');
-insert into sys_menu values('13', 	'一张图', 	'0', '13', 'gis', 		'file/index',  				'', 1, 0, 'C', '0', '0', '', 				'international','admin', sysdate(), '', NULL, '一张图菜单');
+insert into sys_menu values('8', 	'品牌项目', '0', '8', 'brand',		'oa/brand/brandProject', 	'', 1, 0, 'C', '0', '0', 'oa:brandProject:list', 'project',	'admin', sysdate(), '', null, '品牌项目管理菜单');
+insert into sys_menu values('9', 	'合作单位', '0', '9', 'partner', 	'oa/partner/index',  		'', 1, 0, 'C', '0', '0', 'oa:partner:list', 'titles',	'admin', sysdate(), '', NULL, '合作单位管理菜单');
+insert into sys_menu values('10', 	'承接合同', '0', '10', 'contract',	'oa/contract/index', 		'', 1, 0, 'C', '0', '0', 'oa:contract:list','documentation',	'admin', sysdate(), '', null, '承接合同菜单');
+insert into sys_menu values('11', 	'分包合同', '0', '11', 'subContract','oa/subContract/index', 	'', 1, 0, 'C', '0', '0', 'oa:subContract:list','documentation',	'admin', sysdate(), '', null, '分包合同菜单');
+insert into sys_menu values('12', 	'项目台账', '0', '12', 'project',	'oa/project/index', 		'', 1, 0, 'C', '0', '0', 'oa:project:list', 'project',	'admin', sysdate(), '', null, '项目管理菜单');
+insert into sys_menu values('13', 	'单价管理', '0', '13', 'price',		'oa/price/index', 			'', 1, 0, 'C', '0', '0', 'oa:price:list', 	'money',	'admin', sysdate(), '', null, '单价管理菜单');
+insert into sys_menu values('14', 	'资料管理', '0', '14', 'file', 		'file/filesProject/index',  '', 1, 0, 'C', '0', '0', 'oa:archive:list',	'education','admin', sysdate(), '', NULL, '资料管理菜单');
+insert into sys_menu values('15', 	'一张图', 	'0', '15', 'gis', 		'file/index',  				'', 1, 0, 'C', '0', '0', '', 				'international','admin', sysdate(), '', NULL, '一张图菜单');
 
 -- 二级菜单
 insert into sys_menu values('100',  '用户管理', '1',   '1', 'user',       'system/user/index',        '', 1, 0, 'C', '0', '0', 'system:user:list',        'user',          'admin', sysdate(), '', null, '用户管理菜单');
@@ -434,7 +436,7 @@ insert into sys_menu values('1014', '菜单新增', '102', '2',  '', '', '', 1,
 insert into sys_menu values('1015', '菜单修改', '102', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:menu:edit',           '#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1016', '菜单删除', '102', '4',  '', '', '', 1, 0, 'F', '0', '0', 'system:menu:remove',         '#', 'admin', sysdate(), '', null, '');
 -- 部门管理按钮
-insert into sys_menu values('1017', '部门查询', '103', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:dept:list',          '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1017', '部门查询', '103', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:dept:list',          	'#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1018', '部门查询', '103', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:dept:query',          '#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1019', '部门新增', '103', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:dept:add',            '#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1020', '部门修改', '103', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:dept:edit',           '#', 'admin', sysdate(), '', null, '');
@@ -508,47 +510,59 @@ insert into sys_menu values('1075', '投标修改', '7', '3', '#', '', '', 1, 0,
 insert into sys_menu values('1076', '投标删除', '7', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:tender:remove',          	'#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1077', '投标导出', '7', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:tender:export',          	'#', 'admin', sysdate(), '', null, '');
 -- 品牌项目管理按钮
-insert into sys_menu values('1078', '品牌项目查询', '8', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:brand:query',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1079', '品牌项目新增', '8', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:brand:add',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1080', '品牌项目修改', '8', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:brand:edit',            '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1081', '品牌项目删除', '8', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:brand:remove',          '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1082', '品牌项目导出', '8', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:brand:export',          '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1083', '合同查询', '9', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:contract:query',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1084', '合同新增', '9', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:contract:add',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1085', '合同修改', '9', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:contract:edit',             '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1086', '合同删除', '9', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:contract:remove',           '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1087', '合同导出', '9', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:contract:export',           '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1078', '品牌项目查询', '8', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:brandProject:query',	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1079', '品牌项目新增', '8', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:brandProject:add',		'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1080', '品牌项目修改', '8', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:brandProject:edit',     '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1081', '品牌项目删除', '8', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:brandProject:remove',   '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1082', '品牌项目导出', '8', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:brandProject:export',   '#', 'admin', sysdate(), '', null, '');
+-- 合作单位按钮
+insert into sys_menu values('1083', '合作单位查询', '9', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:partner:query',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1084', '合作单位新增', '9', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:partner:add',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1085', '合作单位修改', '9', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:partner:edit',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1086', '合作单位删除', '9', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:partner:remove',		'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1087', '合作单位导出', '9', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:partner:export',		'#', 'admin', sysdate(), '', null, '');
+-- 承接合同按钮
+insert into sys_menu values('1088', '承接合同查询', '10', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:contract:query',		'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1089', '承接合同新增', '10', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:contract:add',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1090', '承接合同修改', '10', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:contract:edit',        '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1091', '承接合同删除', '10', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:contract:remove',      '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1092', '承接合同导出', '10', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:contract:export',      '#', 'admin', sysdate(), '', null, '');
+-- 分包合同按钮
+insert into sys_menu values('1093', '分包合同查询', '11', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:subContract:query',	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1094', '分包合同新增', '11', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:subContract:add',		'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1095', '分包合同修改', '11', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:subContract:edit',     '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1096', '分包合同删除', '11', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:subContract:remove',   '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1097', '分包合同导出', '11', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:subContract:export',   '#', 'admin', sysdate(), '', null, '');
 -- 项目管理按钮
-insert into sys_menu values('1088', '项目查询', '10', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:query',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1089', '项目新增', '10', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:add',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1090', '项目修改', '10', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:edit',            	'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1091', '项目删除', '10', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:remove',          	'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1092', '项目导出', '10', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:export',          	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1098', '项目查询', '12', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:query',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1099', '项目新增', '12', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:add',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1100', '项目修改', '12', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:edit',            	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1101', '项目删除', '12', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:remove',          	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1102', '项目导出', '12', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:export',          	'#', 'admin', sysdate(), '', null, '');
 -- 项目管理按钮
-insert into sys_menu values('1093', '工资查询', '119', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:query',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1094', '工资新增', '119', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:add',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1095', '工资修改', '119', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:edit',            	'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1096', '工资删除', '119', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:remove',          	'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1097', '工资导出', '119', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:export',          	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1103', '工资查询', '119', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:query',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1104', '工资新增', '119', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:add',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1105', '工资修改', '119', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:edit',            	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1106', '工资删除', '119', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:remove',          	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1107', '工资导出', '119', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:export',          	'#', 'admin', sysdate(), '', null, '');
 -- 资料管理按钮
-insert into sys_menu values('1098', '资料查询', '12', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:query',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1099', '资料新增', '12', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:add',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1100', '资料修改', '12', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:edit',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1101', '资料删除', '12', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:remove',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1102', '资料导出', '12', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:export',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1108', '资料查询', '14', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:query',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1109', '资料新增', '14', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:add',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1110', '资料修改', '14', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:edit',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1111', '资料删除', '14', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:remove',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1112', '资料导出', '14', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:export',			'#', 'admin', sysdate(), '', null, '');
 -- 设备记录按钮
-insert into sys_menu values('1103', '记录查询', '5', '3', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:query',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1104', '记录新增', '5', '4', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:add',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1105', '记录修改', '5', '5', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:edit',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1106', '记录删除', '5', '6', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:remove',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1107', '记录导出', '5', '7', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:export',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1113', '记录查询', '5', '3', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:query',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1114', '记录新增', '5', '4', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:add',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1115', '记录修改', '5', '5', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:edit',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1116', '记录删除', '5', '6', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:remove',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1117', '记录导出', '5', '7', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:export',			'#', 'admin', sysdate(), '', null, '');
 -- 车辆记录按钮
-insert into sys_menu values('1108', '记录查询', '6', '6', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:query',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1109', '记录新增', '6', '7', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:add',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1110', '记录修改', '6', '8', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:edit',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1111', '记录删除', '6', '9', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:remove',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1112', '记录导出', '6', '10', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:export',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1118', '记录查询', '6', '6', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:query',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1119', '记录新增', '6', '7', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:add',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1120', '记录修改', '6', '8', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:edit',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1121', '记录删除', '6', '9', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:remove',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1122', '记录导出', '6', '10', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:export',			'#', 'admin', sysdate(), '', null, '');
 
 -- ----------------------------
 -- 6、用户和角色关联表  用户N-1角色
@@ -608,23 +622,18 @@ insert into `sys_user_role` values (21, 8);
 insert into `sys_user_role` values (22, 2);
 insert into `sys_user_role` values (22, 8);
 insert into `sys_user_role` values (23, 2);
-insert into `sys_user_role` values (23, 8);
 insert into `sys_user_role` values (24, 2);
-insert into `sys_user_role` values (24, 8);
 insert into `sys_user_role` values (25, 2);
-insert into `sys_user_role` values (25, 8);
 insert into `sys_user_role` values (26, 2);
-insert into `sys_user_role` values (26, 8);
 insert into `sys_user_role` values (27, 2);
-insert into `sys_user_role` values (27, 8);
 insert into `sys_user_role` values (28, 2);
-insert into `sys_user_role` values (28, 8);
 insert into `sys_user_role` values (29, 2);
 insert into `sys_user_role` values (30, 2);
 insert into `sys_user_role` values (31, 2);
 insert into `sys_user_role` values (32, 2);
 insert into `sys_user_role` values (33, 2);
 insert into `sys_user_role` values (34, 2);
+insert into `sys_user_role` values (34, 9);
 insert into `sys_user_role` values (35, 2);
 insert into `sys_user_role` values (36, 2);
 insert into `sys_user_role` values (37, 2);
@@ -840,6 +849,7 @@ insert into `sys_role_menu` values (7, 2032);
 insert into `sys_role_menu` values (7, 2033);
 insert into `sys_role_menu` values (8, 7);
 insert into `sys_role_menu` values (8, 8);
+insert into `sys_role_menu` values (8, 9);
 insert into `sys_role_menu` values (8, 13);
 insert into `sys_role_menu` values (8, 1073);
 insert into `sys_role_menu` values (8, 1074);
@@ -1606,7 +1616,7 @@ create table cmc_project  (
   project_leader		bigint					default null		comment '项目负责人',
   is_finished			char(1)					default null		comment '项目状态（0进行中、1已结束）',
   project_source		char(1)					default null		comment '项目来源（0院内、1院外）',
-  party_a				varchar(50)				default null		comment '甲方单位',
+  party_a_id			char(50)				default null		comment '甲方单位',
   contact_person		varchar(50)				default null		comment '联系人',
   telephone				char(50)				default null		comment '联系电话',
   project_type			varchar(20)				default null		comment '项目类型',
@@ -6499,7 +6509,7 @@ drop table if exists `cmc_tender`;
 create table `cmc_tender`  (
   `tender_id` 			char(19)  		not null 		comment '投标id（2024-001）',
   `project_name` 		varchar(50)  	default null 	comment '投标项目名称',
-  `party_a` 			varchar(50)  	default null 	comment '招标业主',
+  `party_a_id` 			char(19)  		default null 	comment '招标业主',
   `a_person` 			varchar(50)  	default null 	comment '业主联系人',
   `a_phone` 			varchar(50)  	default null 	comment '业主联系电话',
   `agent` 				varchar(50)  	default null 	comment '招标代理',
@@ -7290,6 +7300,7 @@ create table `cmc_sub_contract`  (
   `sub_amount` 				decimal(10, 2) 	default null comment '分包合同金额',
   `partner_id` 				char(19) 		default null comment '承接单位id',
   `contact_person` 			varchar(20)  	default null comment '承接单位联系人',
+  `telephone` 				varchar(20)  	default null comment '承接单位联系电话',
   `drafter` 				bigint			default null comment '拟稿人',
   `draft_time` 				date			default null comment '拟稿日期',
   `contract_document` 		varchar(255)  	default null comment '合同文件',
@@ -7323,7 +7334,119 @@ create table `cmc_project_contract`  (
 -- ----------------------------
 
 -- ----------------------------
+-- 54、cmc业主单位表
+-- ----------------------------
+drop table if exists `cmc_party_a`;
+create table `cmc_party_a`  (
+  `party_a_id` 				char(19)   		not null	 comment '合作单位id',
+  `party_a_name` 			varchar(50)  	default null comment '单位名称',
+  primary key (`party_a_id`)
+) engine = innodb comment = 'cmc业主单位表';
+
+-- ----------------------------
+-- 初始化-业主单位表数据
+-- ----------------------------
+insert into `cmc_party_a` values ('1', '巴中市国资运营集团建设工程有限公司');
+insert into `cmc_party_a` values ('2', '北京中咨路捷工程技术咨询有限公司');
+insert into `cmc_party_a` values ('3', '苍溪县发展和改革局');
+insert into `cmc_party_a` values ('4', '成都诚道交通科技研发有限公司');
+insert into `cmc_party_a` values ('5', '成都山海雨图科技有限公司');
+insert into `cmc_party_a` values ('6', '成都市交通规划勘察设计研究院有限公司');
+insert into `cmc_party_a` values ('7', '成都市金牛区人民政府西华街道办事处');
+insert into `cmc_party_a` values ('8', '成都市青白江区规划和自然资源局');
+insert into `cmc_party_a` values ('9', '成都市兴城投资集团有限公司');
+insert into `cmc_party_a` values ('10', '成都市兴光华城市建设有限公司');
+insert into `cmc_party_a` values ('11', '重庆情旅侠乡村旅游有限公司');
+insert into `cmc_party_a` values ('12', '重庆市勘测院');
+insert into `cmc_party_a` values ('13', '大唐观音岩水电开发有限公司');
+insert into `cmc_party_a` values ('14', '大邑县自然资源和规划局');
+insert into `cmc_party_a` values ('15', '都江堰市规划和自然资源局');
+insert into `cmc_party_a` values ('16', '二滩水电开发有限责任公司');
+insert into `cmc_party_a` values ('17', '广东联合金地不动产评估勘测设计有限公司');
+insert into `cmc_party_a` values ('18', '广元市自然资源局昭化区分局');
+insert into `cmc_party_a` values ('19', '贵阳市测绘院');
+insert into `cmc_party_a` values ('20', '贵州初子午线工程测绘有限公司');
+insert into `cmc_party_a` values ('21', '国电大渡河双江口工程建设管理分公司');
+insert into `cmc_party_a` values ('22', '国能大渡河猴子岩发电有限公司（原国电大渡河猴子岩水电建设有限公司）');
+insert into `cmc_party_a` values ('23', '国能大渡河金川水电建设有限公司（原国电大渡河金川水电建设有限公司）');
+insert into `cmc_party_a` values ('24', '国能四川阿水电力开发有限公司（原国电四川阿水电力开发有限公司）');
+insert into `cmc_party_a` values ('25', '国网西藏电力有限公司拉萨发电公司');
+insert into `cmc_party_a` values ('26', '国网西藏电力有限公司那曲供电公司');
+insert into `cmc_party_a` values ('27', '国网羊湖发电公司');
+insert into `cmc_party_a` values ('28', '黄河勘测规划设计研究院有限公司');
+insert into `cmc_party_a` values ('29', '简阳市规划和自然资源局');
+insert into `cmc_party_a` values ('30', '理塘县河源水电开发有限公司');
+insert into `cmc_party_a` values ('31', '两河口建设管理局');
+insert into `cmc_party_a` values ('32', '邻水县国土资源局');
+insert into `cmc_party_a` values ('33', '邻水县农业农村局（原邻水县农业局）');
+insert into `cmc_party_a` values ('34', '邻水县水务局');
+insert into `cmc_party_a` values ('35', '邻水县自然资源和规划局');
+insert into `cmc_party_a` values ('36', '泸定县昌源电力开发有限公司');
+insert into `cmc_party_a` values ('37', '泸定县祥智电能有限公司');
+insert into `cmc_party_a` values ('38', '泸县自然资源和规划局');
+insert into `cmc_party_a` values ('39', '绵竹市金申文化旅游开发有限公司');
+insert into `cmc_party_a` values ('40', '沐川县自然资源局');
+insert into `cmc_party_a` values ('41', '南充市高坪区自然资源和规划局');
+insert into `cmc_party_a` values ('42', '蓬安县自然资源和规划局');
+insert into `cmc_party_a` values ('43', '青神金弘能源投资开发有限公司');
+insert into `cmc_party_a` values ('44', '青神县砂石管理办公室');
+insert into `cmc_party_a` values ('45', '乳源瑶族自治县安之源建设有限公司');
+insert into `cmc_party_a` values ('46', '三峡金沙江川云水电开发有限公司永善溪洛渡电厂');
+insert into `cmc_party_a` values ('47', '石棉县坤鑫文化旅游发展有限公司');
+insert into `cmc_party_a` values ('48', '石棉县水利局');
+insert into `cmc_party_a` values ('49', '石棉县星空旅游开发有限责任公司');
+insert into `cmc_party_a` values ('50', '四川大渡河双江口水电开发有限公司');
+insert into `cmc_party_a` values ('51', '四川华能太平驿水电有限责任公司');
+insert into `cmc_party_a` values ('52', '四川嘉陵江桐子壕航电开发有限公司');
+insert into `cmc_party_a` values ('53', '四川省水利水电勘测设计研究院测绘分院');
+insert into `cmc_party_a` values ('54', '四川省雅安市名山区前进乡人民政府');
+insert into `cmc_party_a` values ('55', '四川省冶金地质勘查局成都地质调查所');
+insert into `cmc_party_a` values ('56', '四川天府新区眉山管理委员会自然资源局');
+insert into `cmc_party_a` values ('57', '四川添禾农业投资有限公司');
+insert into `cmc_party_a` values ('58', '四川铁能电力开发有限公司');
+insert into `cmc_party_a` values ('59', '四川中水成勘院物探工程有限责任公司');
+insert into `cmc_party_a` values ('60', '四川中水德方（成都）工程勘察设计有限公司');
+insert into `cmc_party_a` values ('61', '四川足木足河流域水电开发有限公司');
+insert into `cmc_party_a` values ('62', '西安路街道办事处');
+insert into `cmc_party_a` values ('63', '西藏自治区地质矿产勘查开发局第五地质大队');
+insert into `cmc_party_a` values ('64', '雅安市名山区水利局');
+insert into `cmc_party_a` values ('65', '雅砻江流域水电开发有限公司');
+insert into `cmc_party_a` values ('66', '雅砻江水电甘孜有限公司');
+insert into `cmc_party_a` values ('67', '雅砻江水电攀枝花桐子林有限公司');
+insert into `cmc_party_a` values ('68', '盐源县自然资源局');
+insert into `cmc_party_a` values ('69', '冶勘设计集团');
+insert into `cmc_party_a` values ('70', '仪陇县自然资源和规划局');
+insert into `cmc_party_a` values ('71', '云南省交通投资建设集团有限公司');
+insert into `cmc_party_a` values ('72', '浙江华东测绘地理信息有限公司');
+insert into `cmc_party_a` values ('73', '浙江华东测绘与工程安全技术有限公司');
+insert into `cmc_party_a` values ('74', '浙江宁海抽水蓄能有限公司');
+insert into `cmc_party_a` values ('75', '中国电建集团北京勘测设计研究院有限公司');
+insert into `cmc_party_a` values ('76', '中国电建集团北京勘测设计研究院有限公司（两河口移民工程总承包项目部）');
+insert into `cmc_party_a` values ('77', '中国电建集团成都勘测设计研究院有限公司');
+insert into `cmc_party_a` values ('78', '中国电建集团成都勘测设计研究院有限公司（城乡发展工程分公司）');
+insert into `cmc_party_a` values ('79', '中国电建集团成都勘测设计研究院有限公司（基础设施分公司）');
+insert into `cmc_party_a` values ('80', '中国电建集团成都勘测设计研究院有限公司（建设管理部）');
+insert into `cmc_party_a` values ('81', '中国电建集团成都勘测设计研究院有限公司（勘测设计分公司）');
+insert into `cmc_party_a` values ('82', '中国电建集团成都勘测设计研究院有限公司（两河口移民工程总承包项目部）');
+insert into `cmc_party_a` values ('83', '中国电建集团成都勘测设计研究院有限公司（生态环保工程分公司）');
+insert into `cmc_party_a` values ('84', '中国电建集团成都勘测设计研究院有限公司（数字工程分公司）');
+insert into `cmc_party_a` values ('85', '中国电建集团成都勘测设计研究院有限公司（水环境与城建工程分公司）');
+insert into `cmc_party_a` values ('86', '中国电建集团成都勘测设计研究院有限公司（西藏电建成勘院工程有限公司）');
+insert into `cmc_party_a` values ('87', '中国电建集团成都勘测设计研究院有限公司（新能源工程分公司）');
+insert into `cmc_party_a` values ('88', '中国电建集团华东勘测设计研究院有限公司');
+insert into `cmc_party_a` values ('89', '中国电建集团昆明勘测设计研究院有限公司');
+insert into `cmc_party_a` values ('90', '中国电建集团中南勘测设计研究院有限公司');
+insert into `cmc_party_a` values ('91', '中国电力工程顾问集团新能源有限公司');
+insert into `cmc_party_a` values ('92', '中国华电科工集团广安项目部');
+insert into `cmc_party_a` values ('93', '中国华西工程设计建设有限公司');
+insert into `cmc_party_a` values ('94', '中国建筑西南勘察设计研究院有限公司');
+insert into `cmc_party_a` values ('95', '中水成勘院（云南）建设发展有限公司');
+insert into `cmc_party_a` values ('96', '中铁八局');
+insert into `cmc_party_a` values ('97', '自贡市沿滩新城区管理委员会');
+insert into `cmc_party_a` values ('98', '自然资源部第七地形测量队');
+
+-- ----------------------------
+-- 55、cmc合作单位表
 -- ----------------------------
 drop table if exists `cmc_partner`;
 create table `cmc_partner`  (
@@ -7344,160 +7467,149 @@ create table `cmc_partner`  (
 -- ----------------------------
 -- 初始化-合作单位表数据
 -- ----------------------------
-
-insert into `cmc_partner` values ('1', '成都北斗天地科技有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('2', '四川省南方测绘公司', '王建', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('3', '四川星辰测绘仪器有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('4', '成都引泰丰元科技有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('5', '四川蜀地勘测规划服务有限公司', '孙亚东', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('6', '四川皓土测绘有限公司', '钟一兵', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('7', '成都华兴拓图空间信息科技有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('8', '成都六合四游遥感技术有限公司', '赵静', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('9', '四川缘启科技有限公司', '杜凤', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('10', '长江空间信息技术工程有限公司（武汉）', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('11', '四川宇登工程勘测设计有限公司', '沈燕', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('12', '北京东方志远科技股份有限公司', '王大伟', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('13', '四川精灵轨测绘技术有限公司', '张念', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('14', '德阳蜀科地质勘查有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('15', '四川世纪运德管道工程服务有限公司', '贾春华', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('16', '四川雅州检测有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('17', '重庆光大网络技术有限公司', '陈洪', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('18', '重庆市万达网际信息有限责任公司', '王羽', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('19', '成都永鑫科技有限责任公司', '王薇', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('20', '四川瑞图地信科技有限公司', '朱静', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('21', '广州航遥信息科技有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('22', '四川诚挚远劳务有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('23', '四川御风行航空科技有限公司', '舒利 18583968336', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('24', '成都北斗华测导航技术有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('25', '二十一世纪空间技术应用股份有限公司', '杨卫', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('26', '四川鹏誉地信科技有限公司', '吴伟', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('27', '自然资源部第三地理信息制图院', '陈绍国 13980859212', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('28', '山东欣亚通用航空有限公司', '胡家玲', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('29', '四川浩航慧图勘测规划设计有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('30', '成都中地时空科技有限公司', '胥执刚 15828697142', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('31', '广州南方测绘科技股份有限公司成都分公司', '王茂羽 13980067269', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('32', '四川中规华投建设工程有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('33', '广州建通测绘地理信息技术股份有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('34', '四川中水成勘院工程物探检测有限公司', '王羿磊', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('35', '九江地质工程勘察院', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('36', '四川新欣力测绘地理信息有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('37', '四川涪圣工程设计咨询有限公司', '蒲春国', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('38', '云南省遥感中心', '刘朝海 15812116818', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('39', '成都经纬空间科技有限公司', '尚进', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('40', '四川辰吉信息科技有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('41', ' 成都林辉测绘服务有限公司  ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('42', '宜宾湛益工程勘察设计有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('43', '四川智绘地理信息科技有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('44', '宜宾文嘉林业科技服务有限公司    ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('1', '北京东方志远科技股份有限公司', '王大伟', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('2', '北京航天世景信息技术有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('3', '北京华遥星宇科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('4', '北京天目创新科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('5', '成都北斗华测导航技术有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('6', '成都北斗天地科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('7', '成都点云时空科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('8', '成都发启岩土工程勘察设计有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('9', '成都光大测绘咨询有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('10', '成都华兴拓图空间信息科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('11', '成都绘成测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('12', '成都经纬空间科技有限公司', '尚进', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('13', '成都林辉测绘服务有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('14', '成都六合四游遥感技术有限公司', '赵静', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('15', '成都木乘科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('16', '成都木尔科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('17', '成都三维云景科技发展有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('18', '成都市宏锦图文科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('19', '成都田冶测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('20', '成都鑫禾新建筑工程有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('21', '成都引泰丰元科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('22', '成都英创思科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('23', '成都永杰测绘技术服务有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('24', '成都永鑫科技有限责任公司', '王薇', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('25', '成都志诚致远科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('26', '成都中程测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('27', '成都中地时空科技有限公司', '胥执刚', '15828697142', null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('28', '重庆曾爽文化传播有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('29', '重庆光大网络技术有限公司', '陈洪', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('30', '重庆厚耀信息技术服务中心', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('31', '重庆市万达网际信息有限责任公司', '王羽', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('32', '德阳蜀科地质勘查有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('33', '二十一世纪空间技术应用股份有限公司', '杨卫', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('34', '佛山市中诚建筑工程测绘检测有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('35', '广州航遥信息科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('36', '广州建通测绘地理信息技术股份有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('37', '广州南方测绘科技股份有限公司成都分公司', '王茂羽', '13980067269', null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('38', '河北晨枫地理信息技术有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('39', '核工业北京地质研究院', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('40', '湖北朝俊测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('41', '湖北朝骏测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('42', '黄河水利委员会上游水文水资源局', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('43', '江西环绕科技服务有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('44', '九江地质工程勘察院', null, null, null, null, null, null, null, null, null);
 insert into `cmc_partner` values ('45', '凉山州恒信测绘有限责任公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('46', '成都林辉测绘服务有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('47', ' 成都中程测绘有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('48', '成都绘成测绘有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('49', '四川天跃智创科技有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('50', '四川永鸿测绘有限公司', '夏时顺', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('51', '中煤科工集团重庆研究院有限公司', '杨金虎13657678783', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('52', '成都中程测绘有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('53', '成都英创思科技有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('54', ' 四川皓土测绘有限公司 ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('55', '四川蓝盾科技有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('56', '四川众茂测绘有限公司 ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('57', '四川慧源鹏程工程设计有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('58', '深圳市邦茨空间设计有限公司 ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('59', '四川汉盛源科技有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('60', '中水德方（成都）工程勘察设计有限公司', '黄梅琳', null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('61', '四川天辰空间信息技术有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('62', '四川大圣智云科技有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('63', '中水成勘院（云南）建设发展有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('64', '四川蜀都善匠科技有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('65', ' 四川世纪运德管道工程服务有限公司 ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('66', '浙江华东测绘地理信息有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('67', '佛山市中诚建筑工程测绘检测有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('68', '中国电建集团西北勘测设计研究院有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('69', '成都三维云景科技发展有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('70', '四川铁拓科技有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('71', '四川辰吉信息科技有限公司 ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('72', '四川泰恒中勘察设计有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('73', '四川长品科技有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('74', '四川瓴昕工程管理有限公司 ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('75', '佛山市中诚建筑工程测绘检测有限公司 ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('76', '四川云地信息技术有限公司  ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('77', '北京天目创新科技有限公司 ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('78', '四川中正宏图信息技术有限公司 ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('79', '四川仪坤测绘有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('80', '湖北朝骏测绘有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('81', '江西环绕科技服务有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('82', '四川皓土测绘有限公司 ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('83', '成都市宏锦图文科技有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('84', '四川世纪鸿图测绘有限公司 ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('85', '四川九凌工程勘察设计有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('86', '湖北朝俊测绘有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('87', '核工业北京地质研究院', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('88', '四川泰恒中勘察测绘有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('89', '中城航遥（北京）信息工程有限公司  ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('90', '成都田冶测绘有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('91', '深圳市邦茨空间设计有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('92', '成都发启岩土工程勘察设计有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('93', '南充市宏扬钻探工程有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('94', '四川国高工程项目管理有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('95', '四川轩航九域信息技术有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('96', '四川兴蜀工程勘察设计集团有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('97', '四川磊茂工程技术服务有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('98', '上海亚壕科技有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('99', '四川省地科环建检测技术有限公司  ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('100', '四川浩航慧图勘测规划设计有限公司 ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('101', '成都永杰测绘技术服务有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('102', '成都木尔科技有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('103', '重庆厚耀信息技术服务中心', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('104', '四川鼎硕测绘有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('105', '黄河水利委员会上游水文水资源局', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('106', '四川瓴昕工程管理有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('107', '重庆厚耀信息技术服务中心    ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('108', '成都光大测绘咨询有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('109', '四川省科源工程技术测试中心有限责任公司 ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('110', '松辽众鼎工程设计集团有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('111', '自然资源部四川测绘产品质量监督检验站', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('112', '韶关市荣兴工程测绘有限责任公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('113', '四川启盛信息科技有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('114', '四川中科晟图信息技术有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('115', '四川成都西米宏成测绘有限公司 ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('116', '成都志诚致远科技有限公司 ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('117', '北京华遥星宇科技有限公司 ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('118', '成都木乘科技有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('119', '四川省测绘产品质量监督检验站 、 四川地信测绘计量检测有限公司  ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('120', '乌鲁木齐嘉时代测绘服务有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('121', '南方（北京）遥感科技有限公司 ', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('122', '重庆曾爽文化传播有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('123', '四川森旺规划设计有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('124', '北京航天世景信息技术有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('125', '河北晨枫地理信息技术有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('126', '四川蜀鸿祥建筑工程有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('127', '上海数喆数据科技有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('128', '四川众茂测绘有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('129', '武汉众诚数维信息技术有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('130', ' 四川谦剑测绘有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('131', '秀山县云鹏建筑劳务有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('132', '成都点云时空科技有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('133', '四川浙山建设工程有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('134', '四川力兴达工程勘测设计有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('135', '中国电建集团中南勘测设计研究院有限公司', null, null, null, null, null, null, null, null, null);
-insert into `cmc_partner` values ('136', '成都鑫禾新建筑工程有限公司', null, null, null, null, null, null, null, null, null);
-
+insert into `cmc_partner` values ('46', '南充市宏扬钻探工程有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('47', '南方（北京）遥感科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('48', '山东欣亚通用航空有限公司', '胡家玲', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('49', '上海数喆数据科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('50', '上海亚壕科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('51', '韶关市荣兴工程测绘有限责任公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('52', '深圳市邦茨空间设计有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('53', '四川辰吉信息科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('54', '四川成都西米宏成测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('55', '四川诚挚远劳务有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('56', '四川大圣智云科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('57', '四川地信测绘计量检测有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('58', '四川鼎硕测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('59', '四川涪圣工程设计咨询有限公司', '蒲春国', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('60', '四川国高工程项目管理有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('61', '四川汉盛源科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('62', '四川浩航慧图勘测规划设计有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('63', '四川皓土测绘有限公司', '钟一兵', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('64', '四川慧源鹏程工程设计有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('65', '四川精灵轨测绘技术有限公司', '张念', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('66', '四川九凌工程勘察设计有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('67', '四川蓝盾科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('68', '四川磊茂工程技术服务有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('69', '四川力兴达工程勘测设计有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('70', '四川瓴昕工程管理有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('71', '四川鹏誉地信科技有限公司', '吴伟', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('72', '四川启盛信息科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('73', '四川谦剑测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('74', '四川瑞图地信科技有限公司', '朱静', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('75', '四川森旺规划设计有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('76', '四川省测绘产品质量监督检验站', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('77', '四川省地科环建检测技术有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('78', '四川省科源工程技术测试中心有限责任公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('79', '四川省南方测绘公司', '王建', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('80', '四川世纪鸿图测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('81', '四川世纪运德管道工程服务有限公司', '贾春华', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('82', '四川蜀地勘测规划服务有限公司', '孙亚东', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('83', '四川蜀都善匠科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('84', '四川蜀鸿祥建筑工程有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('85', '四川泰恒中勘察测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('86', '四川泰恒中勘察设计有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('87', '四川天辰空间信息技术有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('88', '四川天跃智创科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('89', '四川铁拓科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('90', '四川新欣力测绘地理信息有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('91', '四川星辰测绘仪器有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('92', '四川兴蜀工程勘察设计集团有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('93', '四川轩航九域信息技术有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('94', '四川雅州检测有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('95', '四川仪坤测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('96', '四川永鸿测绘有限公司', '夏时顺', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('97', '四川宇登工程勘测设计有限公司', '沈燕', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('98', '四川御风行航空科技有限公司', '舒利', '18583968336', null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('99', '四川缘启科技有限公司', '杜凤', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('100', '四川云地信息技术有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('101', '四川长品科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('102', '四川浙山建设工程有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('103', '四川智绘地理信息科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('104', '四川中规华投建设工程有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('105', '四川中科晟图信息技术有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('106', '四川中水成勘院工程物探检测有限公司', '王羿磊', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('107', '四川中正宏图信息技术有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('108', '四川众茂测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('109', '松辽众鼎工程设计集团有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('110', '乌鲁木齐嘉时代测绘服务有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('111', '武汉众诚数维信息技术有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('112', '秀山县云鹏建筑劳务有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('113', '宜宾文嘉林业科技服务有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('114', '宜宾湛益工程勘察设计有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('115', '云南省遥感中心', '刘朝海', '15812116818', null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('116', '长江空间信息技术工程有限公司（武汉）', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('117', '浙江华东测绘地理信息有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('118', '中城航遥（北京）信息工程有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('119', '中国电建集团西北勘测设计研究院有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('120', '中国电建集团中南勘测设计研究院有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('121', '中煤科工集团重庆研究院有限公司', '杨金虎', '13657678783', null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('122', '中水成勘院（云南）建设发展有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('123', '中水德方（成都）工程勘察设计有限公司', '黄梅琳', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('124', '自然资源部第三地理信息制图院', '陈绍国', '13980859212', null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('125', '自然资源部四川测绘产品质量监督检验站', null, null, null, null, null, null, null, null, null);
+
+-- ----------------------------
+-- 56、cmc品牌项目表
 -- ----------------------------
 drop table if exists `cmc_brand_project`;
 create table `cmc_brand_project`  (
   `project_id` 			char(19)  		not null 	 comment '项目id',
   `project_number` 		varchar(50)  	default null comment '项目编号',
   `project_name` 		varchar(50)  	default null comment '项目名称',
-  `party_a`				varchar(50)		default null comment '甲方单位',
+  `party_a_id`			char(19)		default null comment '甲方单位',
   `a_person`			varchar(20)		default null comment '甲方单位联系人',
-  `a_phone`				char(50)		default null comment '甲方单位联系电话',
-  `partner_id`			varchar(50)		default null comment '合作单位',
+  `a_phone`				varchar(50)		default null comment '甲方单位联系电话',
+  `partner_id`			char(19)		default null comment '合作单位',
   `contact_person`		varchar(20)		default null comment '合作单位联系人',
-  `telephone`			char(50)		default null comment '合作单位联系电话',
+  `telephone`			varchar(50)		default null comment '合作单位联系电话',
   `duration`			char(20)		default null comment '项目工期',
   `amount`				decimal(10,2)	default null comment '合同金额',
+  `content`				varchar(255)	default null comment '项目概况',
   `remark`				varchar(255)	default null comment '备注',
   primary key (`project_id`)
 ) engine = innodb comment = 'cmc品牌项目表';
@@ -7507,7 +7619,24 @@ create table `cmc_brand_project`  (
 -- ----------------------------
 
 -- ----------------------------
+-- 57、cmc品牌项目进度表
+-- ----------------------------
+drop table if exists `cmc_brand_project_progress`;
+create table `cmc_brand_project_progress`  (
+  `progress_id` 	bigint not null  auto_increment comment '项目进度id',
+  `project_id` 		char(19)		default null comment '项目id',
+  `percentage` 		varchar(5)		default null comment '累计进度',
+  `date` 			datetime		default null comment '截至日期',
+  `situation` 		varchar(255)	default null comment '完成进度说明',
+  primary key (`progress_id`)
+) engine = innodb comment = 'cmc品牌项目进度表';
+
+-- ----------------------------
+-- 初始化-品牌项目进度表数据
+-- ----------------------------
+
+-- ----------------------------
+-- 58、cmc品牌项目支付审批表
 -- ----------------------------
 drop table if exists `cmc_brand`;
 create table `cmc_brand`  (
@@ -7527,7 +7656,7 @@ create table `cmc_brand`  (
 -- ----------------------------
 
 -- ----------------------------
+-- 59、cmc品牌项目支付记录表
 -- ----------------------------
 drop table if exists `cmc_brand_payment`;
 create table `cmc_brand_payment`  (
@@ -7543,7 +7672,7 @@ create table `cmc_brand_payment`  (
 -- ----------------------------
 
 -- ----------------------------
+-- 60、cmc成果归档表
 -- ----------------------------
 drop table if exists `cmc_archive`;
 create table `cmc_archive`  (
@@ -7572,7 +7701,7 @@ create table `cmc_archive`  (
 -- ----------------------------
 
 -- ----------------------------
+-- 61、cmc保证金审批表
 -- ----------------------------
 drop table if exists `cmc_deposit`;
 create table `cmc_deposit`  (
@@ -7606,7 +7735,7 @@ create table `cmc_deposit`  (
 -- ----------------------------
 
 -- ----------------------------
+-- 62、cmc结算审批表
 -- ----------------------------
 drop table if exists `cmc_settle`;
 create table `cmc_settle`  (
@@ -7648,7 +7777,7 @@ create table `cmc_settle`  (
 -- ----------------------------
 
 -- ----------------------------
+-- 63、cmc经费计算表
 -- ----------------------------
 drop table if exists `cmc_settle_work`;
 create table `cmc_settle_work`  (
@@ -7669,7 +7798,7 @@ create table `cmc_settle_work`  (
 -- ----------------------------
 
 -- ----------------------------
+-- 64、cmc结算汇总表
 -- ----------------------------
 drop table if exists `cmc_settle_summary`;
 create table `cmc_settle_summary`  (
@@ -7687,7 +7816,7 @@ create table `cmc_settle_summary`  (
 -- ----------------------------
 
 -- ----------------------------
+-- 65、files成果管理表
 -- ----------------------------
 DROP TABLE IF EXISTS `files_achievement`;
 CREATE TABLE `files_achievement`  (
@@ -9349,7 +9478,7 @@ INSERT INTO `files_achievement` VALUES ('1661266588661972994', '1648881415333085
 INSERT INTO `files_achievement` VALUES ('1661266588737470466', '1648881415333085186', '波罗坝址区三维地形面制作管理记录资料', '2021年', '', '8', 'doc/pdf', NULL, NULL, NULL, NULL, '', '', '', '', '1661266588536143874', NULL, '20220321谭君归档全部资料', NULL, NULL);
 
 -- ----------------------------
+-- 66、files存储地址表
 -- ----------------------------
 DROP TABLE IF EXISTS `files_storage`;
 CREATE TABLE `files_storage`  (
@@ -9736,7 +9865,7 @@ INSERT INTO `files_storage` VALUES ('1661266588091547650', '存储器\\光盘资
 INSERT INTO `files_storage` VALUES ('1661266588536143874', '存储器\\光盘资料\\七\\7-92', 58, '');
 
 -- ----------------------------
+-- 67、cmc单价备注表
 -- ----------------------------
 drop table if exists `cmc_price_remark`;
 create table `cmc_price_remark`  (
@@ -9773,7 +9902,7 @@ INSERT INTO `cmc_price_remark` VALUES (21, '内业-三维模型', '⑴根据内
 INSERT INTO `cmc_price_remark` VALUES (22, '内业-坐标转换', '⑴坐标转换、电子沙盘制作，按工作前核准的内业工天结算。');
 
 -- ----------------------------
+-- 68、cmc设备费用表
 -- ----------------------------
 drop table if exists `cmc_device_expense`;
 create table `cmc_device_expense`  (
@@ -9794,7 +9923,7 @@ create table `cmc_device_expense`  (
 -- ----------------------------
 
 -- ----------------------------
+-- 69、cmc设备报废表
 -- ----------------------------
 drop table if exists `cmc_device_scrap`;
 create table `cmc_device_scrap`  (
@@ -9815,7 +9944,7 @@ create table `cmc_device_scrap`  (
 -- ----------------------------
 
 -- ----------------------------
+-- 70、cmc项目变更表
 -- ----------------------------
 drop table if exists `cmc_project_change`;
 create table `cmc_project_change`  (

oa-ui/src/api/oa/brand/brandProgress.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc品牌项目进度列表
+export function listBrandProgress(query) {
+  return request({
+    url: '/oa/brandProgress/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc品牌项目进度详细
+export function getBrandProgress(progressId) {
+  return request({
+    url: '/oa/brandProgress/' + progressId,
+    method: 'get'
+  })
+}
+
+// 新增cmc品牌项目进度
+export function addBrandProgress(data) {
+  return request({
+    url: '/oa/brandProgress',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc品牌项目进度
+export function updateBrandProgress(data) {
+  return request({
+    url: '/oa/brandProgress',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc品牌项目进度
+export function delBrandProgress(progressId) {
+  return request({
+    url: '/oa/brandProgress/' + progressId,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc业主单位列表
+export function listPartyA(query) {
+  return request({
+    url: '/oa/partyA/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc业主单位详细
+export function getPartyA(partyAId) {
+  return request({
+    url: '/oa/partyA/' + partyAId,
+    method: 'get'
+  })
+}
+
+// 新增cmc业主单位
+export function addPartyA(data) {
+  return request({
+    url: '/oa/partyA',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc业主单位
+export function updatePartyA(data) {
+  return request({
+    url: '/oa/partyA',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc业主单位
+export function delPartyA(partyAId) {
+  return request({
+    url: '/oa/partyA/' + partyAId,
+    method: 'delete'
+  })
+}

oa-ui/src/views/file/filesProject/achievement.vue

@@ -4,7 +4,7 @@
  * @Author: ysh
  * @Date: 2022-09-08 17:16:12
  * @LastEditors: wrh
- * @LastEditTime: 2024-05-30 17:18:22
+ * @LastEditTime: 2024-06-12 09:53:12
 -->
 <template>
   <div>
@@ -470,7 +470,7 @@ export default {
         remark: undefined,
       },
       rules: {
-        projectNumber: [{ required: true, message: "项目名称不能为空", trigger: "blur" }],
+        projectNumber: [{ required: true, message: "项目编号不能为空", trigger: "blur" }],
         achiName: [{ required: true, message: "成果名称不能为空", trigger: "blur" }],
         dataYear: [{ required: true, message: "数据年份不能为空", trigger: "blur" }],
         resultType: [{ required: true, message: "数据类型不能为空", trigger: "blur" }],

oa-ui/src/views/flowable/form/business/subContract.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-07 10:40:11
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-06-12 17:22:33
 -->
 <template>
   <div class="app-container">
@@ -24,7 +24,7 @@
                 {{ chooseProject.projectNumber }}</el-descriptions-item>
               <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
                 }}</el-descriptions-item>
-              <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseProject.partyA
+              <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseProject.partyA.partyAName
                 }}</el-descriptions-item>
               <el-descriptions-item label="承担部门" label-class-name="my-label">
                 <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
@@ -81,6 +81,8 @@
             </el-col>
           </el-row>
 
+          <el-row :gutter="20">
+            <el-col :span="16" :xs="24">
           <el-form-item label="合同文件" prop="contractDocument">
             <FileUpload v-if="formTotal == 0"
               :disabled="taskName != '合同拟稿'" ref="contractFile" :limit="1" :filePathName="'分包合同/合同文件'"
@@ -96,6 +98,13 @@
               </el-link>
             </div>
           </el-form-item>
+            </el-col>
+            <el-col :span="8" :xs="24">
+              <el-form-item label="联系电话" prop="telephone">
+                <el-input v-model="form.telephone" placeholder="请输入联系电话" :disabled="taskName != '合同拟稿'" />
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-form-item label="合同计划工作量：">
             <table border="1">
               <tr>
@@ -754,6 +763,7 @@ export default {
     handleSelectPartner(val) {
       getPartner(val).then(response => {
         this.$set(this.form, 'contactPerson', response.data.contactPerson);
+        this.$set(this.form, 'telephone', response.data.telephone);
       })
     },
     // 选择项目
@@ -1034,14 +1044,6 @@ export default {
         this.chooseProject = val[0]
         this.isSelect = true
         this.form.projectId = val[0].projectId
-        let undertakingDeptName = []
-        if (val[0].undertakingDept) {
-          let deptArr = val[0].undertakingDept.split(',');
-          for (let dept of deptArr) {
-            undertakingDeptName.push(this.getDeptName(dept))
-          }
-        }
-        this.chooseProject.undertakingDeptName = undertakingDeptName.join(',');
         listProjectContract({ projectId: this.form.projectId }).then(response => {
           if (response.rows) {
             for (let row of response.rows) {

oa-ui/src/views/flowable/form/changeForm.vue

@@ -10,7 +10,7 @@
               }}</el-descriptions-item>
               <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
               }}</el-descriptions-item>
-              <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseProject.partyA
+              <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseProject.partyA.partyName
               }}</el-descriptions-item>
               <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
               }}</el-descriptions-item>
@@ -168,10 +168,6 @@ export default {
             getProject(res.data.projectId).then(response => {
               this.chooseProject = response.data;
               this.isSelect = true;
-              if (this.form.undertakingDept) {
-                let arr = this.chooseProject.undertakingDept.split(',')
-                this.getDeptName(arr);
-              }
             })
           }
           this.loading = false
@@ -202,9 +198,7 @@ export default {
           this.chooseProject = response.data;
           this.isSelect = true;
           if (this.chooseProject.undertakingDept) {
-            let arr = this.chooseProject.undertakingDept.split(',')
             this.getLeader(arr);
-            this.getDeptName(arr);
           }
         })
       } else {
@@ -222,7 +216,6 @@ export default {
         if (this.chooseProject.undertakingDept) {
           let arr = this.chooseProject.undertakingDept.split(',')
           this.getLeader(arr);
-          this.getDeptName(arr);
         }
       }
       this.openProject = false;
@@ -237,14 +230,6 @@ export default {
         })
       }
     },
-    getDeptName(val) {
-      for (let v of val) {
-        getDept(Number(v)).then(res => {
-          this.undertakingDeptNameList.push(res.data.deptName);
-          this.chooseProject.undertakingDeptName = this.undertakingDeptNameList.join(',')
-        })
-      }
-    },
     // 取消按钮
     cancel() {
       this.open = false;

oa-ui/src/views/flowable/form/components/chooseProject.vue

@@ -29,7 +29,7 @@
       <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" :show-overflow-tooltip="true" />
       <el-table-column label="项目负责人" align="center" key="projectLeader" prop="projectLeaderUser.nickName"
         :show-overflow-tooltip="true" />
-      <el-table-column label="甲方公司" align="center" key="partyA" prop="partyA" :show-overflow-tooltip="true" />
+      <el-table-column label="甲方公司" align="center" key="partyA" prop="partyA.partyName" :show-overflow-tooltip="true" />
       <el-table-column label="项目类型" align="center" key="projectType" prop="projectType" />
     </el-table>
     <div style="text-align: right;" class="mt20 mr20">

oa-ui/src/views/flowable/form/finance/borrowForm.vue

@@ -683,14 +683,6 @@ export default {
         this.chooseProject = val[0]
         this.isSelect = true
         this.form.projectId = val[0].projectId
-        let undertakingDeptName = []
-        if (val[0].undertakingDept) {
-          let deptArr = val[0].undertakingDept.split(',');
-          for (let dept of deptArr) {
-            undertakingDeptName.push(this.getDeptName(dept))
-          }
-        }
-        this.chooseProject.undertakingDeptName = undertakingDeptName.join(',');
       }
       this.openProject = false
     },

oa-ui/src/views/flowable/form/oa/carForm.vue

@@ -628,14 +628,6 @@ export default {
         return
       } else if (val.length == 1) {
         this.chooseProject = val[0]
-        let undertakingDeptName = []
-        if (val[0].undertakingDept) {
-          let deptArr = val[0].undertakingDept.split(',');
-          for (let dept of deptArr) {
-            undertakingDeptName.push(this.getDeptName(dept))
-          }
-        }
-        this.chooseProject.undertakingDeptName = undertakingDeptName.join(',');
         this.isSelect = true
         this.form.projectId = val[0].projectId
       }

oa-ui/src/views/flowable/form/oa/deviceForm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-11 14:15:49
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-06-12 17:16:48
 -->
 
 <template>
@@ -510,14 +510,6 @@ export default {
         this.chooseProject = val[0]
         this.isSelect = true
         this.form.projectId = val[0].projectId
-        let undertakingDeptName = []
-        if (val[0].undertakingDept) {
-          let deptArr = val[0].undertakingDept.split(',');
-          for (let dept of deptArr) {
-            undertakingDeptName.push(this.getDeptName(dept))
-          }
-        }
-        this.chooseProject.undertakingDeptName = undertakingDeptName.join(',');
       }
       this.openProject = false
     },

oa-ui/src/views/flowable/form/projectProcess/addproject.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-07 10:53:47
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-06-12 15:55:43
 -->
 <template>
   <div class="project-wrapper">
@@ -54,9 +54,10 @@
         <el-input v-model="chooseContractInfo.contractNumber" disabled></el-input>
       </el-form-item>
       <el-form-item label="甲方单位：" prop="partyA">
-        <el-autocomplete class="inline-input" v-model="addForm.partyA" :fetch-suggestions="querySearch"
-          placeholder="请输入内容" style="width: 100%"></el-autocomplete>
-        <!-- <el-input v-model="addForm.partyA"></el-input> -->
+        <el-select allow-create v-model="addForm.partyAId" filterable placeholder="请选择" style="width: 100%;" clearable>
+          <el-option v-for="item in partyAList" :key="item.value" :label="item.partyAName" :value="item.partyAId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="联系人：" prop="contactPerson">
         <el-input v-model="addForm.contactPerson"></el-input>
@@ -87,8 +88,7 @@
             </td>
             <td>
               <el-select v-model="work.unit" placeholder="请选择" clearable>
-                <el-option v-for="dict in dict.type.cmc_unit" :key="dict.value" :label="dict.label"
-                  :value="dict.label" />
+                <el-option v-for="dict in dict.type.cmc_unit" :key="dict.value" :label="dict.label" :value="dict.label" />
               </el-select>
             </td>
             <td>
@@ -104,8 +104,7 @@
                 :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
             </td>
             <td>
-              <el-button type="danger" icon="el-icon-minus" size="mini" circle
-                @click="deletWorkItem(index)"></el-button>
+              <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="deletWorkItem(index)"></el-button>
             </td>
           </tr>
         </table>
@@ -133,7 +132,7 @@
         <el-col :span="6" :xs="24" :offset="12">
           <el-form-item label="项目登记人：" prop="registrantUser">
             <span class="auditor"> {{ addForm.projectRegistrantUser ? addForm.projectRegistrantUser.nickName :
-      registrantUser }} </span>
+              registrantUser }} </span>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -163,6 +162,7 @@ import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate
 import { listProjectWork, addProjectWork } from "@/api/oa/project/projectWork";
 import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
+import { listPartyA } from "@/api/oa/partyA/partyA";
 import chooseContract from '../components/chooseContract.vue';
 export default {
   components: { chooseContract },
@@ -195,6 +195,7 @@ export default {
         projectName: "",
       },
       projectList: [],
+      partyAList: [],
       total: 0,
       loading: true,
       modifyOpen: false,
@@ -234,6 +235,7 @@ export default {
       this.registrantUser = this.name;
     }
 
+    this.getPartyAList();
     this.getContractDataList();
     // this.getList();
   },
@@ -324,6 +326,16 @@ export default {
         });
       });
     },
+    // 查询业主单位列表
+    getPartyAList() {
+      this.loading = true
+      listPartyA({
+        pageNum: 1,
+        pageSize: 99999999
+      }).then(response => {
+        this.partyAList = response.rows;
+      })
+    },
     cancel() {
       this.addForm = {};
     },

oa-ui/src/views/flowable/form/settleForm.vue

@@ -38,7 +38,7 @@
                 {{ chooseProject.projectLeaderUser ? chooseProject.projectLeaderUser.nickName : "" }}
               </el-descriptions-item>
               <el-descriptions-item label="甲方单位" label-class-name="my-label">
-                {{ chooseProject.partyA }}
+                {{ chooseProject.partyA.partyAName }}
               </el-descriptions-item>
               <el-descriptions-item label="联系人" label-class-name="my-label">
                 {{ chooseProject.contactPerson }}
@@ -1069,14 +1069,6 @@ export default {
       if (val.length == 1) {
         this.prOpen = false;
         this.chooseProject = val[0];
-        let undertakingDeptName = []
-        if (val[0].undertakingDept) {
-          let deptArr = val[0].undertakingDept.split(',');
-          for (let dept of deptArr) {
-            undertakingDeptName.push(this.getDeptName(dept))
-          }
-        }
-        this.chooseProject.undertakingDeptName = undertakingDeptName.join(',');
         this.$set(this.form, 'projectId', val[0].projectId)
         this.isSelect = true;
       } else {

oa-ui/src/views/oa/brand/brandProject.vue

@@ -2,84 +2,10 @@
   <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="projectNumber">
-        <el-input
-          v-model="queryParams.projectNumber"
-          placeholder="请输入项目编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.projectNumber" placeholder="请输入项目编号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="项目名称" prop="projectName">
-        <el-input
-          v-model="queryParams.projectName"
-          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="aPerson">
-        <el-input
-          v-model="queryParams.aPerson"
-          placeholder="请输入甲方单位联系人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="甲方单位联系电话" prop="aPhone">
-        <el-input
-          v-model="queryParams.aPhone"
-          placeholder="请输入甲方单位联系电话"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="合作单位" prop="partnerId">
-        <el-input
-          v-model="queryParams.partnerId"
-          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="duration">
-        <el-input
-          v-model="queryParams.duration"
-          placeholder="请输入项目工期"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="合同金额" prop="amount">
-        <el-input
-          v-model="queryParams.amount"
-          placeholder="请输入合同金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.projectName" 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>
@@ -89,127 +15,191 @@
 
     <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:brand:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:brandProject: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:brand:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:brandProject: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:brand:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:brandProject: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:brand:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:brandProject:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="brandProjectList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="项目id" align="center" prop="projectId" />
       <el-table-column label="项目编号" align="center" prop="projectNumber" />
       <el-table-column label="项目名称" align="center" prop="projectName" />
       <el-table-column label="甲方单位" align="center" prop="partyA" />
       <el-table-column label="甲方单位联系人" align="center" prop="aPerson" />
       <el-table-column label="甲方单位联系电话" align="center" prop="aPhone" />
-      <el-table-column label="合作单位" align="center" prop="partnerId" />
+      <el-table-column label="合作单位" align="center" prop="partner.partnerName" />
       <el-table-column label="合作单位联系人" align="center" prop="contactPerson" />
       <el-table-column label="合作单位联系电话" align="center" prop="telephone" />
       <el-table-column label="项目工期" align="center" prop="duration" />
       <el-table-column label="合同金额" align="center" prop="amount" />
+      <el-table-column label="项目概况" align="center" prop="content" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:brand:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:brand:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:brandProject:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:brandProject: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"
-    />
+
+    <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="projectNumber">
-          <el-input v-model="form.projectNumber" placeholder="请输入项目编号" />
-        </el-form-item>
-        <el-form-item label="项目名称" prop="projectName">
-          <el-input v-model="form.projectName" 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="aPerson">
-          <el-input v-model="form.aPerson" placeholder="请输入甲方单位联系人" />
-        </el-form-item>
-        <el-form-item label="甲方单位联系电话" prop="aPhone">
-          <el-input v-model="form.aPhone" placeholder="请输入甲方单位联系电话" />
-        </el-form-item>
-        <el-form-item label="合作单位" prop="partnerId">
-          <el-input v-model="form.partnerId" 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="duration">
-          <el-input v-model="form.duration" placeholder="请输入项目工期" />
-        </el-form-item>
-        <el-form-item label="合同金额" prop="amount">
-          <el-input v-model="form.amount" placeholder="请输入合同金额" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+    <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules">
+        <el-descriptions class="margin-top" :column="2" border>
+          <el-descriptions-item>
+            <template slot="label">
+              <span class="require_input">* </span>项目编号
+            </template>
+            <el-form-item prop="projectNumber">
+              <el-input v-model="form.projectNumber" placeholder="请输入项目编号" />
+            </el-form-item>
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label">
+              <span class="require_input">* </span>项目名称
+            </template>
+            <el-form-item prop="projectName">
+              <el-input v-model="form.projectName" placeholder="请输入项目名称" />
+            </el-form-item>
+          </el-descriptions-item>
+          <el-descriptions-item :span="2">
+            <template slot="label">
+              甲方单位
+            </template>
+            <el-form-item prop="partyAId">
+              <el-select allow-create v-model="form.partyAId" filterable placeholder="请选择" style="width: 100%;" clearable>
+                <el-option v-for="item in partyAList" :key="item.value" :label="item.partyAName" :value="item.partyAId">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label">
+              甲方单位联系人
+            </template>
+            <el-form-item prop="aPerson">
+              <el-input v-model="form.aPerson" placeholder="请输入甲方单位联系人" />
+            </el-form-item>
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label">
+              甲方单位联系电话
+            </template>
+            <el-form-item prop="aPhone">
+              <el-input v-model="form.aPhone" placeholder="请输入甲方单位联系电话" />
+            </el-form-item>
+          </el-descriptions-item>
+          <el-descriptions-item :span="2">
+            <template slot="label">
+              合作单位
+            </template>
+            <el-form-item prop="partnerId">
+              <el-select allow-create v-model="form.partnerId" filterable placeholder="请选择" style="width: 100%;" clearable
+                @change="handleSelectPartner">
+                <el-option v-for="item in partnerList" :key="item.value" :label="item.partnerName"
+                  :value="item.partnerId">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label">
+              合作单位联系人
+            </template>
+            <el-form-item prop="contactPerson">
+              <el-input v-model="form.contactPerson" placeholder="请输入合作单位联系人" />
+            </el-form-item>
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label">
+              合作单位联系电话
+            </template>
+            <el-form-item prop="telephone">
+              <el-input v-model="form.telephone" placeholder="请输入合作单位联系电话" />
+            </el-form-item>
+          </el-descriptions-item>
+          <el-descriptions-item :span="2">
+            <template slot="label">
+              项目概况
+            </template>
+            <el-form-item prop="content">
+              <el-input type="textarea" v-model="form.content" placeholder="请输入项目概况" />
+            </el-form-item>
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label">
+              项目工期
+            </template>
+            <el-form-item prop="duration">
+              <el-input v-model="form.duration" placeholder="请输入项目工期" />
+            </el-form-item>
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label">
+              合同金额
+            </template>
+            <el-form-item prop="amount">
+              <el-input v-model="form.amount" placeholder="请输入合同金额" />
+            </el-form-item>
+          </el-descriptions-item>
+          <el-descriptions-item :span="2">
+            <template slot="label">
+              备注
+            </template>
+            <el-form-item prop="remark">
+              <el-input type="textarea" v-model="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+          </el-descriptions-item>
+        </el-descriptions>
+        <el-divider></el-divider>
+        <el-form-item label="项目进度：">
+          <table border="1">
+            <tr>
+              <td style="width: 80px">序号</td>
+              <td>截至日期</td>
+              <td>累计总进度（%）</td>
+              <td style="width: 300px">情况说明</td>
+              <td style="width: 80px">操作</td>
+            </tr>
+            <tr v-for="(progress, index) in progressList" :key="index">
+              <td>
+                {{ index + 1 }}
+              </td>
+              <td>
+                <el-date-picker type="date" placeholder="选择日期" v-model="progress.date"
+                  value-format="yyyy-MM-dd"></el-date-picker>
+              </td>
+              <td>
+                <el-input-number v-model="progress.percentage" :controls="false" style="width: 120px"></el-input-number>%
+              </td>
+              <td>
+                <el-input v-model="progress.situation" type="textarea"></el-input>
+              </td>
+              <td>
+                <el-button type="text" icon="el-icon-delete" style="color:#F56C6C" size="mini"
+                  @click="deleProgressItem(index)">删除行</el-button>
+              </td>
+            </tr>
+          </table>
+          <el-button icon="el-icon-plus" size="mini" @click="addProgressList()" type="primary" plain></el-button>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -222,6 +212,8 @@
 
 <script>
 import { listBrandProject, getBrandProject, delBrandProject, addBrandProject, updateBrandProject } from "@/api/oa/brand/brandProject";
+import { listPartner, getPartner } from "@/api/oa/partner/partner";
+import { listPartyA } from "@/api/oa/partyA/partyA";
 
 export default {
   name: "BrandProject",
@@ -241,6 +233,15 @@ export default {
       total: 0,
       // cmc品牌项目表格数据
       brandProjectList: [],
+      partnerList: [],
+      partyAList: [],
+      progressList: [
+        {
+          date: "",
+          percentage: "",
+          situation: "",
+        },
+      ],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -259,16 +260,22 @@ export default {
         telephone: null,
         duration: null,
         amount: null,
+        content: null,
       },
       // 表单参数
       form: {},
+      progress: {},
       // 表单校验
       rules: {
+        projectNumber: [{ required: true, message: "项目编号不能为空", trigger: "blur" }],
+        projectName: [{ required: true, message: "项目名称不能为空", trigger: "blur" }],
       }
     };
   },
   created() {
     this.getList();
+    this.getPartnerList();
+    this.getPartyAList();
   },
   methods: {
     /** 查询cmc品牌项目列表 */
@@ -285,6 +292,49 @@ export default {
       this.open = false;
       this.reset();
     },
+    // 查询承接单位列表
+    getPartnerList() {
+      this.loading = true
+      listPartner({
+        pageNum: 1,
+        pageSize: 99999999
+      }).then(response => {
+        this.partnerList = response.rows;
+      })
+    },
+    // 查询业主单位列表
+    getPartyAList() {
+      this.loading = true
+      listPartyA({
+        pageNum: 1,
+        pageSize: 99999999
+      }).then(response => {
+        this.partyAList = response.rows;
+      })
+    },
+    // 选择单位
+    handleSelectPartner(val) {
+      getPartner(val).then(response => {
+        this.$set(this.form, 'contactPerson', response.data.contactPerson);
+        this.$set(this.form, 'telephone', response.data.telephone);
+      })
+    },
+    deleProgressItem(index) {
+      let arr = this.progressList;
+      if (arr.length == 1) {
+        return;
+      }
+      if (index >= 0 && index < arr.length) {
+        arr.splice(index, 1);
+      }
+    },
+    addProgressList() {
+      this.progressList.push({
+        date: "",
+        percentage: "",
+        situation: "",
+      });
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -299,6 +349,7 @@ export default {
         telephone: null,
         duration: null,
         amount: null,
+        content: null,
         remark: null
       };
       this.resetForm("form");
@@ -316,14 +367,14 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.projectId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加cmc品牌项目";
+      this.title = "品牌项目登记";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -332,7 +383,7 @@ export default {
       getBrandProject(projectId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改cmc品牌项目";
+        this.title = "品牌项目修改";
       });
     },
     /** 提交按钮 */
@@ -358,12 +409,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const projectIds = row.projectId || this.ids;
-      this.$modal.confirm('是否确认删除cmc品牌项目编号为"' + projectIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除品牌项目编号为"' + projectIds + '"的数据项？').then(function () {
         return delBrandProject(projectIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -374,3 +425,22 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+
+table {
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+}
+
+.require_input {
+  color: #f00;
+  font-size: 20px;
+  font-weight: bold;
+  display: inline-block;
+}
+</style>

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

@@ -9,6 +9,70 @@
           @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="qualification">
+        <el-input
+          v-model="queryParams.qualification"
+          placeholder="请输入资质等级"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="内业规模" prop="inWorker">
+        <el-input
+          v-model="queryParams.inWorker"
+          placeholder="请输入内业规模"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="外业规模" prop="outWorker">
+        <el-input
+          v-model="queryParams.outWorker"
+          placeholder="请输入外业规模"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="主要技术装备" prop="equipment">
+        <el-input
+          v-model="queryParams.equipment"
+          placeholder="请输入主要技术装备"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="擅长业务方向" prop="strength">
+        <el-input
+          v-model="queryParams.strength"
+          placeholder="请输入擅长业务方向"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="履约能力评价" prop="fulfill">
+        <el-input
+          v-model="queryParams.fulfill"
+          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>
@@ -63,8 +127,16 @@
 
     <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" prop="contactPerson" />
+      <el-table-column label="联系电话" align="center" prop="telephone" />
+      <el-table-column label="资质等级" align="center" prop="qualification" />
+      <el-table-column label="内业规模" align="center" prop="inWorker" />
+      <el-table-column label="外业规模" align="center" prop="outWorker" />
+      <el-table-column label="主要技术装备" align="center" prop="equipment" />
+      <el-table-column label="擅长业务方向" align="center" prop="strength" />
+      <el-table-column label="履约能力评价" align="center" prop="fulfill" />
+      <el-table-column label="备注说明" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -99,6 +171,33 @@
         <el-form-item label="单位名称" prop="partnerName">
           <el-input v-model="form.partnerName" 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="qualification">
+          <el-input v-model="form.qualification" placeholder="请输入资质等级" />
+        </el-form-item>
+        <el-form-item label="内业规模" prop="inWorker">
+          <el-input v-model="form.inWorker" placeholder="请输入内业规模" />
+        </el-form-item>
+        <el-form-item label="外业规模" prop="outWorker">
+          <el-input v-model="form.outWorker" placeholder="请输入外业规模" />
+        </el-form-item>
+        <el-form-item label="主要技术装备" prop="equipment">
+          <el-input v-model="form.equipment" placeholder="请输入主要技术装备" />
+        </el-form-item>
+        <el-form-item label="擅长业务方向" prop="strength">
+          <el-input v-model="form.strength" placeholder="请输入擅长业务方向" />
+        </el-form-item>
+        <el-form-item label="履约能力评价" prop="fulfill">
+          <el-input v-model="form.fulfill" placeholder="请输入履约能力评价" />
+        </el-form-item>
+        <el-form-item label="备注说明" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注说明" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -137,7 +236,15 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        partnerName: null
+        partnerName: null,
+        contactPerson: null,
+        telephone: null,
+        qualification: null,
+        inWorker: null,
+        outWorker: null,
+        equipment: null,
+        strength: null,
+        fulfill: null,
       },
       // 表单参数
       form: {},
@@ -168,7 +275,16 @@ export default {
     reset() {
       this.form = {
         partnerId: null,
-        partnerName: null
+        partnerName: null,
+        contactPerson: null,
+        telephone: null,
+        qualification: null,
+        inWorker: null,
+        outWorker: null,
+        equipment: null,
+        strength: null,
+        fulfill: null,
+        remark: null
       };
       this.resetForm("form");
     },

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

@@ -0,0 +1,278 @@
+<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="partyAName">
+        <el-input
+          v-model="queryParams.partyAName"
+          placeholder="请输入单位名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系人" prop="aPerson">
+        <el-input
+          v-model="queryParams.aPerson"
+          placeholder="请输入联系人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系电话" prop="aPhone">
+        <el-input
+          v-model="queryParams.aPhone"
+          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:partyA: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:partyA: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:partyA: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:partyA:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="partyAList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="合作单位id" align="center" prop="partyAId" />
+      <el-table-column label="单位名称" align="center" prop="partyAName" />
+      <el-table-column label="联系人" align="center" prop="aPerson" />
+      <el-table-column label="联系电话" align="center" prop="aPhone" />
+      <el-table-column label="备注说明" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:partyA:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:partyA: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="partyAName">
+          <el-input v-model="form.partyAName" placeholder="请输入单位名称" />
+        </el-form-item>
+        <el-form-item label="联系人" prop="aPerson">
+          <el-input v-model="form.aPerson" placeholder="请输入联系人" />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="aPhone">
+          <el-input v-model="form.aPhone" placeholder="请输入联系电话" />
+        </el-form-item>
+        <el-form-item label="备注说明" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注说明" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listPartyA, getPartyA, delPartyA, addPartyA, updatePartyA } from "@/api/oa/partyA/partyA";
+
+export default {
+  name: "PartyA",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc业主单位表格数据
+      partyAList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        partyAName: null,
+        aPerson: null,
+        aPhone: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc业主单位列表 */
+    getList() {
+      this.loading = true;
+      listPartyA(this.queryParams).then(response => {
+        this.partyAList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        partyAId: null,
+        partyAName: null,
+        aPerson: null,
+        aPhone: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.partyAId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc业主单位";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const partyAId = row.partyAId || this.ids
+      getPartyA(partyAId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc业主单位";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.partyAId != null) {
+            updatePartyA(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPartyA(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const partyAIds = row.partyAId || this.ids;
+      this.$modal.confirm('是否确认删除cmc业主单位编号为"' + partyAIds + '"的数据项？').then(function() {
+        return delPartyA(partyAIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/partyA/export', {
+        ...this.queryParams
+      }, `partyA_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

oa-ui/src/views/oa/project/info.vue

@@ -56,7 +56,7 @@
                 <svg-icon slot="prefix" icon-class="school" />
                 甲方单位
               </template>
-              {{ project.partyA }}
+              {{ project.partyA.partyAName }}
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
@@ -469,12 +469,6 @@ export default {
           let deptArr = this.project.undertakingDept.split(',');
           let undertakingDept = []
           for (let dept of deptArr) {
-            getDept(dept).then(res => {
-              if (res.data) {
-                undertakingDept.push(res.data.deptName);
-                this.$set(this.project, 'undertakingDeptName', undertakingDept.join(','))
-              }
-            })
             getUsersDeptLeaderByDept({ deptId: Number(dept) }).then(res => {
               this.deptLeaderList.push(res.data.nickName);
             })

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

@@ -2,11 +2,7 @@
   <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="projectName" label-width="100px">
-        <el-input v-model="queryParams.projectName" 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-input v-model="queryParams.projectName" placeholder="请输入投标项目名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="投标时间" prop="tenderTime">
         <el-date-picker clearable v-model="queryParams.tenderTime" type="date" value-format="yyyy-MM-dd"
@@ -40,7 +36,7 @@
       <el-table-column type="index" label="序号" width="55" align="center" min-width="100px" />
       <!-- <el-table-column label="投标id" align="center" prop="tenderId" min-width="100px" /> -->
       <el-table-column label="投标项目名称" align="center" prop="projectName" min-width="100px" />
-      <el-table-column label="招标业主" align="center" prop="partyA" min-width="100px" />
+      <el-table-column label="招标业主" align="center" prop="partyA.partyAName" min-width="100px" />
       <!-- <el-table-column label="业主联系人" align="center" prop="aPerson" min-width="100px" /> -->
       <!-- <el-table-column label="业主联系电话" align="center" prop="aPhone" min-width="100px" /> -->
       <el-table-column label="招标代理" align="center" prop="agent" min-width="100px" />
@@ -120,8 +116,11 @@
             <template slot="label">
               <span class="require_input">* </span>招标业主
             </template>
-            <el-form-item prop="partyA">
-              <el-input v-model="form.partyA"></el-input>
+            <el-form-item prop="partyAId">
+              <el-select allow-create v-model="form.partyAId" filterable placeholder="请选择" style="width: 100%;" clearable>
+                <el-option v-for="item in partyAList" :key="item.value" :label="item.partyAName" :value="item.partyAId">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item>
@@ -386,6 +385,7 @@ import { listTender, getTender, delTender, addTender, updateTender } from "@/api
 import { listDept } from '@/api/system/dept'
 import { listUser, deptTreeSelect } from "@/api/system/user";
 import { Snowflake } from '@/utils/snowFlake.js'
+import { listPartyA } from "@/api/oa/partyA/partyA";
 export default {
   name: "Tender",
   data() {
@@ -405,6 +405,7 @@ export default {
       total: 0,
       // 投标管理表格数据
       tenderList: [],
+      partyAList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -421,7 +422,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         projectName: null,
-        partyA: null,
+        partyAId: null,
         aPerson: null,
         aPhone: null,
         agent: null,
@@ -456,7 +457,7 @@ export default {
         projectName: [
           { required: true, message: '投标项目名称不能为空', trigger: 'blur' }
         ],
-        partyA: [
+        partyAId: [
           { required: true, message: '招标业主不能为空', trigger: 'blur' }
         ],
         budget: [
@@ -511,6 +512,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getPartyAList();
     this.getDeptTree();
     if (this.$store.state.app.device == 'mobile') {
       this.dialogProperty.column = 1
@@ -555,6 +557,16 @@ export default {
         return curDept[0].label
       }
     },
+    // 查询业主单位列表
+    getPartyAList() {
+      this.loading = true
+      listPartyA({
+        pageNum: 1,
+        pageSize: 99999999
+      }).then(response => {
+        this.partyAList = response.rows;
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -565,7 +577,7 @@ export default {
       this.form = {
         tenderId: null,
         projectName: null,
-        partyA: null,
+        partyAId: null,
         aPerson: null,
         aPhone: null,
         agent: null,