合同表单

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

@@ -0,0 +1,98 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcContractComment;
+import com.ruoyi.oa.service.ICmcContractCommentService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc合同意见Controller
+ * 
+ * @author cmc
+ * @date 2024-04-19
+ */
+@RestController
+@RequestMapping("/oa/contractComment")
+public class CmcContractCommentController extends BaseController
+{
+    @Autowired
+    private ICmcContractCommentService cmcContractCommentService;
+
+    /**
+     * 查询cmc合同意见列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcContractComment cmcContractComment)
+    {
+        startPage();
+        List<CmcContractComment> list = cmcContractCommentService.selectCmcContractCommentList(cmcContractComment);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc合同意见列表
+     */
+    @Log(title = "cmc合同意见", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcContractComment cmcContractComment)
+    {
+        List<CmcContractComment> list = cmcContractCommentService.selectCmcContractCommentList(cmcContractComment);
+        ExcelUtil<CmcContractComment> util = new ExcelUtil<CmcContractComment>(CmcContractComment.class);
+        util.exportExcel(response, list, "cmc合同意见数据");
+    }
+
+    /**
+     * 获取cmc合同意见详细信息
+     */
+    @GetMapping(value = "/{commentId}")
+    public AjaxResult getInfo(@PathVariable("commentId") String commentId)
+    {
+        return success(cmcContractCommentService.selectCmcContractCommentByCommentId(commentId));
+    }
+
+    /**
+     * 新增cmc合同意见
+     */
+    @Log(title = "cmc合同意见", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcContractComment cmcContractComment)
+    {
+        return toAjax(cmcContractCommentService.insertCmcContractComment(cmcContractComment));
+    }
+
+    /**
+     * 修改cmc合同意见
+     */
+    @Log(title = "cmc合同意见", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcContractComment cmcContractComment)
+    {
+        return toAjax(cmcContractCommentService.updateCmcContractComment(cmcContractComment));
+    }
+
+    /**
+     * 删除cmc合同意见
+     */
+    @Log(title = "cmc合同意见", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{commentIds}")
+    public AjaxResult remove(@PathVariable String[] commentIds)
+    {
+        return toAjax(cmcContractCommentService.deleteCmcContractCommentByCommentIds(commentIds));
+    }
+}

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

@@ -0,0 +1,98 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcContractMeeting;
+import com.ruoyi.oa.service.ICmcContractMeetingService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc合同会审Controller
+ * 
+ * @author cmc
+ * @date 2024-04-19
+ */
+@RestController
+@RequestMapping("/oa/contractMeeting")
+public class CmcContractMeetingController extends BaseController
+{
+    @Autowired
+    private ICmcContractMeetingService cmcContractMeetingService;
+
+    /**
+     * 查询cmc合同会审列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcContractMeeting cmcContractMeeting)
+    {
+        startPage();
+        List<CmcContractMeeting> list = cmcContractMeetingService.selectCmcContractMeetingList(cmcContractMeeting);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc合同会审列表
+     */
+    @Log(title = "cmc合同会审", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcContractMeeting cmcContractMeeting)
+    {
+        List<CmcContractMeeting> list = cmcContractMeetingService.selectCmcContractMeetingList(cmcContractMeeting);
+        ExcelUtil<CmcContractMeeting> util = new ExcelUtil<CmcContractMeeting>(CmcContractMeeting.class);
+        util.exportExcel(response, list, "cmc合同会审数据");
+    }
+
+    /**
+     * 获取cmc合同会审详细信息
+     */
+    @GetMapping(value = "/{meetingId}")
+    public AjaxResult getInfo(@PathVariable("meetingId") String meetingId)
+    {
+        return success(cmcContractMeetingService.selectCmcContractMeetingByMeetingId(meetingId));
+    }
+
+    /**
+     * 新增cmc合同会审
+     */
+    @Log(title = "cmc合同会审", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcContractMeeting cmcContractMeeting)
+    {
+        return toAjax(cmcContractMeetingService.insertCmcContractMeeting(cmcContractMeeting));
+    }
+
+    /**
+     * 修改cmc合同会审
+     */
+    @Log(title = "cmc合同会审", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcContractMeeting cmcContractMeeting)
+    {
+        return toAjax(cmcContractMeetingService.updateCmcContractMeeting(cmcContractMeeting));
+    }
+
+    /**
+     * 删除cmc合同会审
+     */
+    @Log(title = "cmc合同会审", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{meetingIds}")
+    public AjaxResult remove(@PathVariable String[] meetingIds)
+    {
+        return toAjax(cmcContractMeetingService.deleteCmcContractMeetingByMeetingIds(meetingIds));
+    }
+}

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

@@ -0,0 +1,98 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcContractPayment;
+import com.ruoyi.oa.service.ICmcContractPaymentService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc合同回款Controller
+ * 
+ * @author cmc
+ * @date 2024-04-19
+ */
+@RestController
+@RequestMapping("/oa/contractPayment")
+public class CmcContractPaymentController extends BaseController
+{
+    @Autowired
+    private ICmcContractPaymentService cmcContractPaymentService;
+
+    /**
+     * 查询cmc合同回款列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcContractPayment cmcContractPayment)
+    {
+        startPage();
+        List<CmcContractPayment> list = cmcContractPaymentService.selectCmcContractPaymentList(cmcContractPayment);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc合同回款列表
+     */
+    @Log(title = "cmc合同回款", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcContractPayment cmcContractPayment)
+    {
+        List<CmcContractPayment> list = cmcContractPaymentService.selectCmcContractPaymentList(cmcContractPayment);
+        ExcelUtil<CmcContractPayment> util = new ExcelUtil<CmcContractPayment>(CmcContractPayment.class);
+        util.exportExcel(response, list, "cmc合同回款数据");
+    }
+
+    /**
+     * 获取cmc合同回款详细信息
+     */
+    @GetMapping(value = "/{paymentId}")
+    public AjaxResult getInfo(@PathVariable("paymentId") String paymentId)
+    {
+        return success(cmcContractPaymentService.selectCmcContractPaymentByPaymentId(paymentId));
+    }
+
+    /**
+     * 新增cmc合同回款
+     */
+    @Log(title = "cmc合同回款", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcContractPayment cmcContractPayment)
+    {
+        return toAjax(cmcContractPaymentService.insertCmcContractPayment(cmcContractPayment));
+    }
+
+    /**
+     * 修改cmc合同回款
+     */
+    @Log(title = "cmc合同回款", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcContractPayment cmcContractPayment)
+    {
+        return toAjax(cmcContractPaymentService.updateCmcContractPayment(cmcContractPayment));
+    }
+
+    /**
+     * 删除cmc合同回款
+     */
+    @Log(title = "cmc合同回款", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{paymentIds}")
+    public AjaxResult remove(@PathVariable String[] paymentIds)
+    {
+        return toAjax(cmcContractPaymentService.deleteCmcContractPaymentByPaymentIds(paymentIds));
+    }
+}

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

@@ -0,0 +1,98 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcContractWork;
+import com.ruoyi.oa.service.ICmcContractWorkService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc合同内容Controller
+ * 
+ * @author cmc
+ * @date 2024-04-19
+ */
+@RestController
+@RequestMapping("/oa/contractWork")
+public class CmcContractWorkController extends BaseController
+{
+    @Autowired
+    private ICmcContractWorkService cmcContractWorkService;
+
+    /**
+     * 查询cmc合同内容列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcContractWork cmcContractWork)
+    {
+        startPage();
+        List<CmcContractWork> list = cmcContractWorkService.selectCmcContractWorkList(cmcContractWork);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc合同内容列表
+     */
+    @Log(title = "cmc合同内容", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcContractWork cmcContractWork)
+    {
+        List<CmcContractWork> list = cmcContractWorkService.selectCmcContractWorkList(cmcContractWork);
+        ExcelUtil<CmcContractWork> util = new ExcelUtil<CmcContractWork>(CmcContractWork.class);
+        util.exportExcel(response, list, "cmc合同内容数据");
+    }
+
+    /**
+     * 获取cmc合同内容详细信息
+     */
+    @GetMapping(value = "/{workId}")
+    public AjaxResult getInfo(@PathVariable("workId") String workId)
+    {
+        return success(cmcContractWorkService.selectCmcContractWorkByWorkId(workId));
+    }
+
+    /**
+     * 新增cmc合同内容
+     */
+    @Log(title = "cmc合同内容", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcContractWork cmcContractWork)
+    {
+        return toAjax(cmcContractWorkService.insertCmcContractWork(cmcContractWork));
+    }
+
+    /**
+     * 修改cmc合同内容
+     */
+    @Log(title = "cmc合同内容", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcContractWork cmcContractWork)
+    {
+        return toAjax(cmcContractWorkService.updateCmcContractWork(cmcContractWork));
+    }
+
+    /**
+     * 删除cmc合同内容
+     */
+    @Log(title = "cmc合同内容", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{workIds}")
+    public AjaxResult remove(@PathVariable String[] workIds)
+    {
+        return toAjax(cmcContractWorkService.deleteCmcContractWorkByWorkIds(workIds));
+    }
+}

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

@@ -0,0 +1,98 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcProjectContract;
+import com.ruoyi.oa.service.ICmcProjectContractService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc项目合同Controller
+ * 
+ * @author cmc
+ * @date 2024-04-19
+ */
+@RestController
+@RequestMapping("/oa/projectContract")
+public class CmcProjectContractController extends BaseController
+{
+    @Autowired
+    private ICmcProjectContractService cmcProjectContractService;
+
+    /**
+     * 查询cmc项目合同列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcProjectContract cmcProjectContract)
+    {
+        startPage();
+        List<CmcProjectContract> list = cmcProjectContractService.selectCmcProjectContractList(cmcProjectContract);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc项目合同列表
+     */
+    @Log(title = "cmc项目合同", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcProjectContract cmcProjectContract)
+    {
+        List<CmcProjectContract> list = cmcProjectContractService.selectCmcProjectContractList(cmcProjectContract);
+        ExcelUtil<CmcProjectContract> util = new ExcelUtil<CmcProjectContract>(CmcProjectContract.class);
+        util.exportExcel(response, list, "cmc项目合同数据");
+    }
+
+    /**
+     * 获取cmc项目合同详细信息
+     */
+    @GetMapping(value = "/{projectId}")
+    public AjaxResult getInfo(@PathVariable("projectId") String projectId)
+    {
+        return success(cmcProjectContractService.selectCmcProjectContractByProjectId(projectId));
+    }
+
+    /**
+     * 新增cmc项目合同
+     */
+    @Log(title = "cmc项目合同", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcProjectContract cmcProjectContract)
+    {
+        return toAjax(cmcProjectContractService.insertCmcProjectContract(cmcProjectContract));
+    }
+
+    /**
+     * 修改cmc项目合同
+     */
+    @Log(title = "cmc项目合同", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcProjectContract cmcProjectContract)
+    {
+        return toAjax(cmcProjectContractService.updateCmcProjectContract(cmcProjectContract));
+    }
+
+    /**
+     * 删除cmc项目合同
+     */
+    @Log(title = "cmc项目合同", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{projectIds}")
+    public AjaxResult remove(@PathVariable String[] projectIds)
+    {
+        return toAjax(cmcProjectContractService.deleteCmcProjectContractByProjectIds(projectIds));
+    }
+}

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

@@ -3,6 +3,7 @@ package com.ruoyi.oa.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -44,6 +45,8 @@ public class CmcContract extends BaseEntity
     @Excel(name = "拟稿人")
     private Long drafter;
 
+    private SysUser draftUser;
+
     /** 拟稿日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "拟稿日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -130,6 +133,15 @@ public class CmcContract extends BaseEntity
     {
         return drafter;
     }
+    public void setDraftUser(SysUser draftUser)
+    {
+        this.draftUser = draftUser;
+    }
+
+    public SysUser getDraftUser()
+    {
+        return draftUser;
+    }
     public void setDraftTime(Date draftTime)
     {
         this.draftTime = draftTime;

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

@@ -45,72 +45,68 @@ public class CmcContractComment extends BaseEntity
     @Excel(name = "会审日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date commentTime;
 
-    /** 是否签名 */
-    @Excel(name = "是否签名")
-    private String isSign;
-
-    public void setCommentId(String commentId) 
+    public void setCommentId(String commentId)
     {
         this.commentId = commentId;
     }
 
-    public String getCommentId() 
+    public String getCommentId()
     {
         return commentId;
     }
-    public void setContractId(String contractId) 
+    public void setContractId(String contractId)
     {
         this.contractId = contractId;
     }
 
-    public String getContractId() 
+    public String getContractId()
     {
         return contractId;
     }
-    public void setDeptId(Long deptId) 
+    public void setDeptId(Long deptId)
     {
         this.deptId = deptId;
     }
 
-    public Long getDeptId() 
+    public Long getDeptId()
     {
         return deptId;
     }
-    public void setUserId(Long userId) 
+    public void setUserId(Long userId)
     {
         this.userId = userId;
     }
 
-    public Long getUserId() 
+    public Long getUserId()
     {
         return userId;
     }
-    public void setComment(String comment) 
+    public void setComment(String comment)
     {
         this.comment = comment;
     }
 
-    public String getComment() 
+    public String getComment()
     {
         return comment;
     }
-    public void setCommentTime(Date commentTime) 
+    public void setDocument(String document)
     {
-        this.commentTime = commentTime;
+        this.document = document;
     }
 
-    public Date getCommentTime() 
+    public String getDocument()
     {
-        return commentTime;
+        return document;
     }
-    public void setIsSign(String isSign) 
+    public void setCommentTime(Date commentTime)
     {
-        this.isSign = isSign;
+        this.commentTime = commentTime;
     }
 
-    public String getIsSign() 
+    public Date getCommentTime()
     {
-        return isSign;
+        return commentTime;
     }
 
     @Override
@@ -121,8 +117,8 @@ public class CmcContractComment extends BaseEntity
             .append("deptId", getDeptId())
             .append("userId", getUserId())
             .append("comment", getComment())
+            .append("document", getDocument())
             .append("commentTime", getCommentTime())
-            .append("isSign", getIsSign())
             .toString();
     }
 }

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

@@ -0,0 +1,153 @@
+package com.ruoyi.oa.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * cmc合同会审对象 cmc_contract_meeting
+ *
+ * @author cmc
+ * @date 2024-04-19
+ */
+public class CmcContractMeeting extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 合同会审id */
+    private String meetingId;
+
+    /** 合同id */
+    @Excel(name = "合同id")
+    private String contractId;
+
+    /** 评审时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "评审时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date meetingTime;
+
+    /** 评审主持人 */
+    @Excel(name = "评审主持人")
+    private Long hostId;
+
+    /** 评审地点 */
+    @Excel(name = "评审地点")
+    private String place;
+
+    /** 参与评审人 */
+    @Excel(name = "参与评审人")
+    private String users;
+
+    /** 评审结论 */
+    @Excel(name = "评审结论")
+    private String conclusion;
+
+    /** 评审意见表 */
+    @Excel(name = "评审意见表")
+    private String document;
+
+    /** 总结时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "总结时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date commentTime;
+
+    public void setMeetingId(String meetingId)
+    {
+        this.meetingId = meetingId;
+    }
+
+    public String getMeetingId()
+    {
+        return meetingId;
+    }
+    public void setContractId(String contractId)
+    {
+        this.contractId = contractId;
+    }
+
+    public String getContractId()
+    {
+        return contractId;
+    }
+    public void setMeetingTime(Date meetingTime)
+    {
+        this.meetingTime = meetingTime;
+    }
+
+    public Date getMeetingTime()
+    {
+        return meetingTime;
+    }
+    public void setHostId(Long hostId)
+    {
+        this.hostId = hostId;
+    }
+
+    public Long getHostId()
+    {
+        return hostId;
+    }
+    public void setPlace(String place)
+    {
+        this.place = place;
+    }
+
+    public String getPlace()
+    {
+        return place;
+    }
+    public void setUsers(String users)
+    {
+        this.users = users;
+    }
+
+    public String getUsers()
+    {
+        return users;
+    }
+    public void setConclusion(String conclusion)
+    {
+        this.conclusion = conclusion;
+    }
+
+    public String getConclusion()
+    {
+        return conclusion;
+    }
+    public void setDocument(String document)
+    {
+        this.document = document;
+    }
+
+    public String getDocument()
+    {
+        return document;
+    }
+    public void setCommentTime(Date commentTime)
+    {
+        this.commentTime = commentTime;
+    }
+
+    public Date getCommentTime()
+    {
+        return commentTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("meetingId", getMeetingId())
+                .append("contractId", getContractId())
+                .append("meetingTime", getMeetingTime())
+                .append("hostId", getHostId())
+                .append("place", getPlace())
+                .append("users", getUsers())
+                .append("conclusion", getConclusion())
+                .append("document", getDocument())
+                .append("commentTime", getCommentTime())
+                .toString();
+    }
+}

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

@@ -9,9 +9,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * cmc合同回款对象 cmc_contract_payment
- *
+ * 
  * @author cmc
- * @date 2024-04-18
+ * @date 2024-04-19
  */
 public class CmcContractPayment extends BaseEntity
 {
@@ -45,66 +45,66 @@ public class CmcContractPayment extends BaseEntity
     @Excel(name = "回款预计时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date paymentTime;
 
-    public void setPaymentId(String paymentId)
+    public void setPaymentId(String paymentId) 
     {
         this.paymentId = paymentId;
     }
 
-    public String getPaymentId()
+    public String getPaymentId() 
     {
         return paymentId;
     }
-    public void setContractId(String contractId)
+    public void setContractId(String contractId) 
     {
         this.contractId = contractId;
     }
 
-    public String getContractId()
+    public String getContractId() 
     {
         return contractId;
     }
-    public void setSubContractId(String subContractId)
+    public void setSubContractId(String subContractId) 
     {
         this.subContractId = subContractId;
     }
 
-    public String getSubContractId()
+    public String getSubContractId() 
     {
         return subContractId;
     }
-    public void setPaymentCondition(String paymentCondition)
+    public void setPaymentCondition(String paymentCondition) 
     {
         this.paymentCondition = paymentCondition;
     }
 
-    public String getPaymentCondition()
+    public String getPaymentCondition() 
     {
         return paymentCondition;
     }
-    public void setPaymentPercentage(String paymentPercentage)
+    public void setPaymentPercentage(String paymentPercentage) 
     {
         this.paymentPercentage = paymentPercentage;
     }
 
-    public String getPaymentPercentage()
+    public String getPaymentPercentage() 
     {
         return paymentPercentage;
     }
-    public void setPaymentAmount(String paymentAmount)
+    public void setPaymentAmount(String paymentAmount) 
     {
         this.paymentAmount = paymentAmount;
     }
 
-    public String getPaymentAmount()
+    public String getPaymentAmount() 
     {
         return paymentAmount;
     }
-    public void setPaymentTime(Date paymentTime)
+    public void setPaymentTime(Date paymentTime) 
     {
         this.paymentTime = paymentTime;
     }
 
-    public Date getPaymentTime()
+    public Date getPaymentTime() 
     {
         return paymentTime;
     }
@@ -112,14 +112,14 @@ public class CmcContractPayment extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-                .append("paymentId", getPaymentId())
-                .append("contractId", getContractId())
-                .append("subContractId", getSubContractId())
-                .append("paymentCondition", getPaymentCondition())
-                .append("paymentPercentage", getPaymentPercentage())
-                .append("paymentAmount", getPaymentAmount())
-                .append("paymentTime", getPaymentTime())
-                .append("remark", getRemark())
-                .toString();
+            .append("paymentId", getPaymentId())
+            .append("contractId", getContractId())
+            .append("subContractId", getSubContractId())
+            .append("paymentCondition", getPaymentCondition())
+            .append("paymentPercentage", getPaymentPercentage())
+            .append("paymentAmount", getPaymentAmount())
+            .append("paymentTime", getPaymentTime())
+            .append("remark", getRemark())
+            .toString();
     }
 }

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

@@ -9,9 +9,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * cmc合同内容对象 cmc_contract_work
- *
+ * 
  * @author cmc
- * @date 2024-04-18
+ * @date 2024-04-19
  */
 public class CmcContractWork extends BaseEntity
 {
@@ -49,75 +49,75 @@ public class CmcContractWork extends BaseEntity
     @Excel(name = "要求完成时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date deadline;
 
-    public void setWorkId(String workId)
+    public void setWorkId(String workId) 
     {
         this.workId = workId;
     }
 
-    public String getWorkId()
+    public String getWorkId() 
     {
         return workId;
     }
-    public void setContractId(String contractId)
+    public void setContractId(String contractId) 
     {
         this.contractId = contractId;
     }
 
-    public String getContractId()
+    public String getContractId() 
     {
         return contractId;
     }
-    public void setSubContractId(String subContractId)
+    public void setSubContractId(String subContractId) 
     {
         this.subContractId = subContractId;
     }
 
-    public String getSubContractId()
+    public String getSubContractId() 
     {
         return subContractId;
     }
-    public void setContent(String content)
+    public void setContent(String content) 
     {
         this.content = content;
     }
 
-    public String getContent()
+    public String getContent() 
     {
         return content;
     }
-    public void setScale(String scale)
+    public void setScale(String scale) 
     {
         this.scale = scale;
     }
 
-    public String getScale()
+    public String getScale() 
     {
         return scale;
     }
-    public void setUnit(String unit)
+    public void setUnit(String unit) 
     {
         this.unit = unit;
     }
 
-    public String getUnit()
+    public String getUnit() 
     {
         return unit;
     }
-    public void setWorkload(String workload)
+    public void setWorkload(String workload) 
     {
         this.workload = workload;
     }
 
-    public String getWorkload()
+    public String getWorkload() 
     {
         return workload;
     }
-    public void setDeadline(Date deadline)
+    public void setDeadline(Date deadline) 
     {
         this.deadline = deadline;
     }
 
-    public Date getDeadline()
+    public Date getDeadline() 
     {
         return deadline;
     }
@@ -125,15 +125,15 @@ public class CmcContractWork extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-                .append("workId", getWorkId())
-                .append("contractId", getContractId())
-                .append("subContractId", getSubContractId())
-                .append("content", getContent())
-                .append("scale", getScale())
-                .append("unit", getUnit())
-                .append("workload", getWorkload())
-                .append("deadline", getDeadline())
-                .append("remark", getRemark())
-                .toString();
+            .append("workId", getWorkId())
+            .append("contractId", getContractId())
+            .append("subContractId", getSubContractId())
+            .append("content", getContent())
+            .append("scale", getScale())
+            .append("unit", getUnit())
+            .append("workload", getWorkload())
+            .append("deadline", getDeadline())
+            .append("remark", getRemark())
+            .toString();
     }
 }

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

@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * cmc项目合同对象 cmc_project_contract
  * 
  * @author cmc
- * @date 2024-04-18
+ * @date 2024-04-19
  */
 public class CmcProjectContract extends BaseEntity
 {

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

@@ -3,6 +3,7 @@ package com.ruoyi.oa.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -45,6 +46,8 @@ public class CmcSubContract extends BaseEntity
     @Excel(name = "拟稿人")
     private Long drafter;
 
+    private SysUser draftUser;
+
     /** 拟稿日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "拟稿日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -130,6 +133,15 @@ public class CmcSubContract extends BaseEntity
     {
         return drafter;
     }
+    public void setDraftUser(SysUser draftUser)
+    {
+        this.draftUser = draftUser;
+    }
+
+    public SysUser getDraftUser()
+    {
+        return draftUser;
+    }
     public void setDraftTime(Date draftTime) 
     {
         this.draftTime = draftTime;

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

@@ -7,7 +7,7 @@ import com.ruoyi.oa.domain.CmcContractComment;
  * cmc合同意见Mapper接口
  * 
  * @author cmc
- * @date 2024-03-15
+ * @date 2024-04-19
  */
 public interface CmcContractCommentMapper 
 {

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcContractMeeting;
+
+/**
+ * cmc合同会审Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-04-19
+ */
+public interface CmcContractMeetingMapper 
+{
+    /**
+     * 查询cmc合同会审
+     * 
+     * @param meetingId cmc合同会审主键
+     * @return cmc合同会审
+     */
+    public CmcContractMeeting selectCmcContractMeetingByMeetingId(String meetingId);
+
+    /**
+     * 查询cmc合同会审列表
+     * 
+     * @param cmcContractMeeting cmc合同会审
+     * @return cmc合同会审集合
+     */
+    public List<CmcContractMeeting> selectCmcContractMeetingList(CmcContractMeeting cmcContractMeeting);
+
+    /**
+     * 新增cmc合同会审
+     * 
+     * @param cmcContractMeeting cmc合同会审
+     * @return 结果
+     */
+    public int insertCmcContractMeeting(CmcContractMeeting cmcContractMeeting);
+
+    /**
+     * 修改cmc合同会审
+     * 
+     * @param cmcContractMeeting cmc合同会审
+     * @return 结果
+     */
+    public int updateCmcContractMeeting(CmcContractMeeting cmcContractMeeting);
+
+    /**
+     * 删除cmc合同会审
+     * 
+     * @param meetingId cmc合同会审主键
+     * @return 结果
+     */
+    public int deleteCmcContractMeetingByMeetingId(String meetingId);
+
+    /**
+     * 批量删除cmc合同会审
+     * 
+     * @param meetingIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcContractMeetingByMeetingIds(String[] meetingIds);
+}

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

@@ -7,7 +7,7 @@ import com.ruoyi.oa.domain.CmcContractPayment;
  * cmc合同回款Mapper接口
  * 
  * @author cmc
- * @date 2024-03-15
+ * @date 2024-04-19
  */
 public interface CmcContractPaymentMapper 
 {

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

@@ -7,7 +7,7 @@ import com.ruoyi.oa.domain.CmcContractWork;
  * cmc合同内容Mapper接口
  * 
  * @author cmc
- * @date 2024-03-15
+ * @date 2024-04-19
  */
 public interface CmcContractWorkMapper 
 {

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

@@ -7,7 +7,7 @@ import com.ruoyi.oa.domain.CmcProjectContract;
  * cmc项目合同Mapper接口
  * 
  * @author cmc
- * @date 2024-04-18
+ * @date 2024-04-19
  */
 public interface CmcProjectContractMapper 
 {

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

@@ -7,7 +7,7 @@ import com.ruoyi.oa.domain.CmcContractComment;
  * cmc合同意见Service接口
  * 
  * @author cmc
- * @date 2024-03-15
+ * @date 2024-04-19
  */
 public interface ICmcContractCommentService 
 {

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcContractMeeting;
+
+/**
+ * cmc合同会审Service接口
+ * 
+ * @author cmc
+ * @date 2024-04-19
+ */
+public interface ICmcContractMeetingService 
+{
+    /**
+     * 查询cmc合同会审
+     * 
+     * @param meetingId cmc合同会审主键
+     * @return cmc合同会审
+     */
+    public CmcContractMeeting selectCmcContractMeetingByMeetingId(String meetingId);
+
+    /**
+     * 查询cmc合同会审列表
+     * 
+     * @param cmcContractMeeting cmc合同会审
+     * @return cmc合同会审集合
+     */
+    public List<CmcContractMeeting> selectCmcContractMeetingList(CmcContractMeeting cmcContractMeeting);
+
+    /**
+     * 新增cmc合同会审
+     * 
+     * @param cmcContractMeeting cmc合同会审
+     * @return 结果
+     */
+    public int insertCmcContractMeeting(CmcContractMeeting cmcContractMeeting);
+
+    /**
+     * 修改cmc合同会审
+     * 
+     * @param cmcContractMeeting cmc合同会审
+     * @return 结果
+     */
+    public int updateCmcContractMeeting(CmcContractMeeting cmcContractMeeting);
+
+    /**
+     * 批量删除cmc合同会审
+     * 
+     * @param meetingIds 需要删除的cmc合同会审主键集合
+     * @return 结果
+     */
+    public int deleteCmcContractMeetingByMeetingIds(String[] meetingIds);
+
+    /**
+     * 删除cmc合同会审信息
+     * 
+     * @param meetingId cmc合同会审主键
+     * @return 结果
+     */
+    public int deleteCmcContractMeetingByMeetingId(String meetingId);
+}

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

@@ -7,7 +7,7 @@ import com.ruoyi.oa.domain.CmcContractPayment;
  * cmc合同回款Service接口
  * 
  * @author cmc
- * @date 2024-03-15
+ * @date 2024-04-19
  */
 public interface ICmcContractPaymentService 
 {

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

@@ -7,7 +7,7 @@ import com.ruoyi.oa.domain.CmcContractWork;
  * cmc合同内容Service接口
  * 
  * @author cmc
- * @date 2024-03-15
+ * @date 2024-04-19
  */
 public interface ICmcContractWorkService 
 {

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

@@ -7,7 +7,7 @@ import com.ruoyi.oa.domain.CmcProjectContract;
  * cmc项目合同Service接口
  * 
  * @author cmc
- * @date 2024-04-18
+ * @date 2024-04-19
  */
 public interface ICmcProjectContractService 
 {

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

@@ -11,7 +11,7 @@ import com.ruoyi.oa.service.ICmcContractCommentService;
  * cmc合同意见Service业务层处理
  * 
  * @author cmc
- * @date 2024-03-15
+ * @date 2024-04-19
  */
 @Service
 public class CmcContractCommentServiceImpl implements ICmcContractCommentService 

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcContractMeetingServiceImpl.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.CmcContractMeetingMapper;
+import com.ruoyi.oa.domain.CmcContractMeeting;
+import com.ruoyi.oa.service.ICmcContractMeetingService;
+
+/**
+ * cmc合同会审Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-04-19
+ */
+@Service
+public class CmcContractMeetingServiceImpl implements ICmcContractMeetingService 
+{
+    @Autowired
+    private CmcContractMeetingMapper cmcContractMeetingMapper;
+
+    /**
+     * 查询cmc合同会审
+     * 
+     * @param meetingId cmc合同会审主键
+     * @return cmc合同会审
+     */
+    @Override
+    public CmcContractMeeting selectCmcContractMeetingByMeetingId(String meetingId)
+    {
+        return cmcContractMeetingMapper.selectCmcContractMeetingByMeetingId(meetingId);
+    }
+
+    /**
+     * 查询cmc合同会审列表
+     * 
+     * @param cmcContractMeeting cmc合同会审
+     * @return cmc合同会审
+     */
+    @Override
+    public List<CmcContractMeeting> selectCmcContractMeetingList(CmcContractMeeting cmcContractMeeting)
+    {
+        return cmcContractMeetingMapper.selectCmcContractMeetingList(cmcContractMeeting);
+    }
+
+    /**
+     * 新增cmc合同会审
+     * 
+     * @param cmcContractMeeting cmc合同会审
+     * @return 结果
+     */
+    @Override
+    public int insertCmcContractMeeting(CmcContractMeeting cmcContractMeeting)
+    {
+        return cmcContractMeetingMapper.insertCmcContractMeeting(cmcContractMeeting);
+    }
+
+    /**
+     * 修改cmc合同会审
+     * 
+     * @param cmcContractMeeting cmc合同会审
+     * @return 结果
+     */
+    @Override
+    public int updateCmcContractMeeting(CmcContractMeeting cmcContractMeeting)
+    {
+        return cmcContractMeetingMapper.updateCmcContractMeeting(cmcContractMeeting);
+    }
+
+    /**
+     * 批量删除cmc合同会审
+     * 
+     * @param meetingIds 需要删除的cmc合同会审主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcContractMeetingByMeetingIds(String[] meetingIds)
+    {
+        return cmcContractMeetingMapper.deleteCmcContractMeetingByMeetingIds(meetingIds);
+    }
+
+    /**
+     * 删除cmc合同会审信息
+     * 
+     * @param meetingId cmc合同会审主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcContractMeetingByMeetingId(String meetingId)
+    {
+        return cmcContractMeetingMapper.deleteCmcContractMeetingByMeetingId(meetingId);
+    }
+}

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

@@ -11,7 +11,7 @@ import com.ruoyi.oa.service.ICmcContractPaymentService;
  * cmc合同回款Service业务层处理
  * 
  * @author cmc
- * @date 2024-03-15
+ * @date 2024-04-19
  */
 @Service
 public class CmcContractPaymentServiceImpl implements ICmcContractPaymentService 

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

@@ -11,7 +11,7 @@ import com.ruoyi.oa.service.ICmcContractWorkService;
  * cmc合同内容Service业务层处理
  * 
  * @author cmc
- * @date 2024-03-15
+ * @date 2024-04-19
  */
 @Service
 public class CmcContractWorkServiceImpl implements ICmcContractWorkService 

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

@@ -11,7 +11,7 @@ import com.ruoyi.oa.service.ICmcProjectContractService;
  * cmc项目合同Service业务层处理
  * 
  * @author cmc
- * @date 2024-04-18
+ * @date 2024-04-19
  */
 @Service
 public class CmcProjectContractServiceImpl implements ICmcProjectContractService 

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

@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                and rd.name_ like concat('%', #{name}, '%')
             </if>
         </where>
-        order by rd.deploy_time_ desc
+        order by rd.id_ asc
     </select>
 
 

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

@@ -10,29 +10,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptId"    column="dept_id"    />
         <result property="userId"    column="user_id"    />
         <result property="comment"    column="comment"    />
+        <result property="document"    column="document"    />
         <result property="commentTime"    column="comment_time"    />
     </resultMap>
 
     <sql id="selectCmcContractCommentVo">
-        select comment_id, contract_id, dept_id, user_id, comment, comment_time from cmc_contract_comment
+        select comment_id, contract_id, dept_id, user_id, comment, document, comment_time from cmc_contract_comment
     </sql>
 
     <select id="selectCmcContractCommentList" parameterType="CmcContractComment" resultMap="CmcContractCommentResult">
         <include refid="selectCmcContractCommentVo"/>
-        <where>  
+        <where>
             <if test="contractId != null  and contractId != ''"> and contract_id like concat('%', #{contractId}, '%')</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="comment != null  and comment != ''"> and comment = #{comment}</if>
+            <if test="document != null  and document != ''"> and document = #{document}</if>
             <if test="commentTime != null "> and comment_time = #{commentTime}</if>
         </where>
     </select>
-    
+
     <select id="selectCmcContractCommentByCommentId" parameterType="String" resultMap="CmcContractCommentResult">
         <include refid="selectCmcContractCommentVo"/>
         where comment_id = #{commentId}
     </select>
-        
+
     <insert id="insertCmcContractComment" parameterType="CmcContractComment">
         insert into cmc_contract_comment
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -41,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id,</if>
             <if test="userId != null">user_id,</if>
             <if test="comment != null">comment,</if>
+            <if test="document != null">document,</if>
             <if test="commentTime != null">comment_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -49,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">#{deptId},</if>
             <if test="userId != null">#{userId},</if>
             <if test="comment != null">#{comment},</if>
+            <if test="document != null">#{document},</if>
             <if test="commentTime != null">#{commentTime},</if>
          </trim>
     </insert>
@@ -60,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="comment != null">comment = #{comment},</if>
+            <if test="document != null">document = #{document},</if>
             <if test="commentTime != null">comment_time = #{commentTime},</if>
         </trim>
         where comment_id = #{commentId}

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

@@ -17,31 +17,39 @@
         <result property="signRemark"    column="sign_remark"    />
         <result property="signScan"    column="sign_scan"    />
         <result property="commentType"    column="comment_type"    />
+        <association property="draftUser"    javaType="SysUser"         resultMap="DraftUserResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="DraftUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="draft_nick_name"    />
     </resultMap>
 
     <sql id="selectCmcContractVo">
-        select contract_id, contract_number, amount, deposit, contract_document, drafter, draft_time, remark, sign_date, sign_remark, sign_scan, comment_type from cmc_contract
+        select c.contract_id, c.contract_number, 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 from cmc_contract
+        left join sys_user as u on u.user_id = ca.drafter
     </sql>
 
     <select id="selectCmcContractList" parameterType="CmcContract" resultMap="CmcContractResult">
         <include refid="selectCmcContractVo"/>
         <where>
-            <if test="contractNumber != null  and contractNumber != ''"> and contract_number = #{contractNumber}</if>
-            <if test="amount != null "> and amount = #{amount}</if>
-            <if test="deposit != null "> and deposit = #{deposit}</if>
-            <if test="contractDocument != null  and contractDocument != ''"> and contract_document = #{contractDocument}</if>
-            <if test="drafter != null "> and drafter = #{drafter}</if>
-            <if test="draftTime != null "> and draft_time = #{draftTime}</if>
-            <if test="signDate != null "> and sign_date = #{signDate}</if>
-            <if test="signRemark != null  and signRemark != ''"> and sign_remark = #{signRemark}</if>
-            <if test="signScan != null  and signScan != ''"> and sign_scan = #{signScan}</if>
-            <if test="commentType != null  and commentType != ''"> and comment_type = #{commentType}</if>
+            <if test="contractNumber != null  and contractNumber != ''"> and c.contract_number = #{contractNumber}</if>
+            <if test="amount != null "> and c.amount = #{amount}</if>
+            <if test="deposit != null "> and c.deposit = #{deposit}</if>
+            <if test="contractDocument != null  and contractDocument != ''"> and c.contract_document = #{contractDocument}</if>
+            <if test="drafter != null "> and c.drafter = #{drafter}</if>
+            <if test="draftTime != null "> and c.draft_time = #{draftTime}</if>
+            <if test="signDate != null "> and c.sign_date = #{signDate}</if>
+            <if test="signRemark != null  and signRemark != ''"> and c.sign_remark = #{signRemark}</if>
+            <if test="signScan != null  and signScan != ''"> and c.sign_scan = #{signScan}</if>
+            <if test="commentType != null  and commentType != ''"> and c.comment_type = #{commentType}</if>
         </where>
     </select>
 
     <select id="selectCmcContractByContractId" parameterType="String" resultMap="CmcContractResult">
         <include refid="selectCmcContractVo"/>
-        where contract_id = #{contractId}
+        where c.contract_id = #{contractId}
     </select>
 
     <insert id="insertCmcContract" parameterType="CmcContract">

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

@@ -0,0 +1,93 @@
+<?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.CmcContractMeetingMapper">
+
+    <resultMap type="CmcContractMeeting" id="CmcContractMeetingResult">
+        <result property="meetingId"    column="meeting_id"    />
+        <result property="contractId"    column="contract_id"    />
+        <result property="meetingTime"    column="meeting_time"    />
+        <result property="hostId"    column="host_id"    />
+        <result property="place"    column="place"    />
+        <result property="users"    column="users"    />
+        <result property="conclusion"    column="conclusion"    />
+        <result property="document"    column="document"    />
+        <result property="commentTime"    column="comment_time"    />
+    </resultMap>
+
+    <sql id="selectCmcContractMeetingVo">
+        select meeting_id, contract_id, meeting_time, host_id, place, users, conclusion, document, comment_time from cmc_contract_meeting
+    </sql>
+
+    <select id="selectCmcContractMeetingList" parameterType="CmcContractMeeting" resultMap="CmcContractMeetingResult">
+        <include refid="selectCmcContractMeetingVo"/>
+        <where>
+            <if test="contractId != null  and contractId != ''"> and contract_id = #{contractId}</if>
+            <if test="meetingTime != null "> and meeting_time = #{meetingTime}</if>
+            <if test="hostId != null "> and host_id = #{hostId}</if>
+            <if test="place != null  and place != ''"> and place = #{place}</if>
+            <if test="users != null  and users != ''"> and users = #{users}</if>
+            <if test="conclusion != null  and conclusion != ''"> and conclusion = #{conclusion}</if>
+            <if test="document != null  and document != ''"> and document = #{document}</if>
+            <if test="commentTime != null "> and comment_time = #{commentTime}</if>
+        </where>
+    </select>
+
+    <select id="selectCmcContractMeetingByMeetingId" parameterType="String" resultMap="CmcContractMeetingResult">
+        <include refid="selectCmcContractMeetingVo"/>
+        where meeting_id = #{meetingId}
+    </select>
+
+    <insert id="insertCmcContractMeeting" parameterType="CmcContractMeeting">
+        insert into cmc_contract_meeting
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="meetingId != null">meeting_id,</if>
+            <if test="contractId != null">contract_id,</if>
+            <if test="meetingTime != null">meeting_time,</if>
+            <if test="hostId != null">host_id,</if>
+            <if test="place != null">place,</if>
+            <if test="users != null">users,</if>
+            <if test="conclusion != null">conclusion,</if>
+            <if test="document != null">document,</if>
+            <if test="commentTime != null">comment_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="meetingId != null">#{meetingId},</if>
+            <if test="contractId != null">#{contractId},</if>
+            <if test="meetingTime != null">#{meetingTime},</if>
+            <if test="hostId != null">#{hostId},</if>
+            <if test="place != null">#{place},</if>
+            <if test="users != null">#{users},</if>
+            <if test="conclusion != null">#{conclusion},</if>
+            <if test="document != null">#{document},</if>
+            <if test="commentTime != null">#{commentTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateCmcContractMeeting" parameterType="CmcContractMeeting">
+        update cmc_contract_meeting
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="contractId != null">contract_id = #{contractId},</if>
+            <if test="meetingTime != null">meeting_time = #{meetingTime},</if>
+            <if test="hostId != null">host_id = #{hostId},</if>
+            <if test="place != null">place = #{place},</if>
+            <if test="users != null">users = #{users},</if>
+            <if test="conclusion != null">conclusion = #{conclusion},</if>
+            <if test="document != null">document = #{document},</if>
+            <if test="commentTime != null">comment_time = #{commentTime},</if>
+        </trim>
+        where meeting_id = #{meetingId}
+    </update>
+
+    <delete id="deleteCmcContractMeetingByMeetingId" parameterType="String">
+        delete from cmc_contract_meeting where meeting_id = #{meetingId}
+    </delete>
+
+    <delete id="deleteCmcContractMeetingByMeetingIds" parameterType="String">
+        delete from cmc_contract_meeting where meeting_id in
+        <foreach item="meetingId" collection="array" open="(" separator="," close=")">
+            #{meetingId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.oa.mapper.CmcContractPaymentMapper">
-
+    
     <resultMap type="CmcContractPayment" id="CmcContractPaymentResult">
         <result property="paymentId"    column="payment_id"    />
         <result property="contractId"    column="contract_id"    />
@@ -21,7 +21,7 @@
 
     <select id="selectCmcContractPaymentList" parameterType="CmcContractPayment" resultMap="CmcContractPaymentResult">
         <include refid="selectCmcContractPaymentVo"/>
-        <where>
+        <where>  
             <if test="contractId != null  and contractId != ''"> and contract_id = #{contractId}</if>
             <if test="subContractId != null  and subContractId != ''"> and sub_contract_id = #{subContractId}</if>
             <if test="paymentCondition != null  and paymentCondition != ''"> and payment_condition = #{paymentCondition}</if>
@@ -30,12 +30,12 @@
             <if test="paymentTime != null "> and payment_time = #{paymentTime}</if>
         </where>
     </select>
-
+    
     <select id="selectCmcContractPaymentByPaymentId" parameterType="String" resultMap="CmcContractPaymentResult">
         <include refid="selectCmcContractPaymentVo"/>
         where payment_id = #{paymentId}
     </select>
-
+        
     <insert id="insertCmcContractPayment" parameterType="CmcContractPayment">
         insert into cmc_contract_payment
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -47,7 +47,7 @@
             <if test="paymentAmount != null">payment_amount,</if>
             <if test="paymentTime != null">payment_time,</if>
             <if test="remark != null">remark,</if>
-        </trim>
+         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="paymentId != null">#{paymentId},</if>
             <if test="contractId != null">#{contractId},</if>
@@ -57,7 +57,7 @@
             <if test="paymentAmount != null">#{paymentAmount},</if>
             <if test="paymentTime != null">#{paymentTime},</if>
             <if test="remark != null">#{remark},</if>
-        </trim>
+         </trim>
     </insert>
 
     <update id="updateCmcContractPayment" parameterType="CmcContractPayment">
@@ -79,7 +79,7 @@
     </delete>
 
     <delete id="deleteCmcContractPaymentByPaymentIds" parameterType="String">
-        delete from cmc_contract_payment where payment_id in
+        delete from cmc_contract_payment where payment_id in 
         <foreach item="paymentId" collection="array" open="(" separator="," close=")">
             #{paymentId}
         </foreach>

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

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

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

@@ -18,32 +18,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="signRemark"    column="sign_remark"    />
         <result property="signScan"    column="sign_scan"    />
         <result property="commentType"    column="comment_type"    />
+        <association property="draftUser"    javaType="SysUser"         resultMap="DraftUserResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="DraftUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="draft_nick_name"    />
     </resultMap>
 
     <sql id="selectCmcSubContractVo">
-        select sub_contract_id, contract_id, sub_contract_name, sub_amount, partner_id, contact_person, drafter, draft_time, remark, sign_date, sign_remark, sign_scan, comment_type from cmc_sub_contract
+        select sc.sub_contract_id, sc.contract_id, sc.sub_contract_name, sc.sub_amount, sc.partner_id, sc.contact_person, 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 from cmc_sub_contract
+        left join sys_user as u on u.user_id = ca.drafter
     </sql>
 
     <select id="selectCmcSubContractList" parameterType="CmcSubContract" resultMap="CmcSubContractResult">
         <include refid="selectCmcSubContractVo"/>
         <where>  
-            <if test="contractId != null  and contractId != ''"> and contract_id = #{contractId}</if>
-            <if test="subContractName != null  and subContractName != ''"> and sub_contract_name like concat('%', #{subContractName}, '%')</if>
-            <if test="subAmount != null "> and sub_amount = #{subAmount}</if>
-            <if test="partnerId != null  and partnerId != ''"> and partner_id = #{partnerId}</if>
-            <if test="contactPerson != null  and contactPerson != ''"> and contact_person = #{contactPerson}</if>
-            <if test="drafter != null "> and drafter = #{drafter}</if>
-            <if test="draftTime != null "> and draft_time = #{draftTime}</if>
-            <if test="signDate != null "> and sign_date = #{signDate}</if>
-            <if test="signRemark != null  and signRemark != ''"> and sign_remark = #{signRemark}</if>
-            <if test="signScan != null  and signScan != ''"> and sign_scan = #{signScan}</if>
-            <if test="commentType != null  and commentType != ''"> and comment_type = #{commentType}</if>
+            <if test="contractId != null  and contractId != ''"> and sc.contract_id = #{contractId}</if>
+            <if test="subContractName != null  and subContractName != ''"> and sc.sub_contract_name like concat('%', sc.#{subContractName}, sc.'%')</if>
+            <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="drafter != null "> and sc.drafter = #{drafter}</if>
+            <if test="draftTime != null "> and sc.draft_time = #{draftTime}</if>
+            <if test="signDate != null "> and sc.sign_date = #{signDate}</if>
+            <if test="signRemark != null  and signRemark != ''"> and sc.sign_remark = #{signRemark}</if>
+            <if test="signScan != null  and signScan != ''"> and sc.sign_scan = #{signScan}</if>
+            <if test="commentType != null  and commentType != ''"> and sc.comment_type = #{commentType}</if>
         </where>
     </select>
     
     <select id="selectCmcSubContractBySubContractId" parameterType="String" resultMap="CmcSubContractResult">
         <include refid="selectCmcSubContractVo"/>
-        where sub_contract_id = #{subContractId}
+        where sc.sub_contract_id = #{subContractId}
     </select>
         
     <insert id="insertCmcSubContract" parameterType="CmcSubContract">

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc项目合同列表
+export function listProjectContract(query) {
+  return request({
+    url: '/oa/projectContract/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc项目合同详细
+export function getProjectContract(projectId) {
+  return request({
+    url: '/oa/projectContract/' + projectId,
+    method: 'get'
+  })
+}
+
+// 新增cmc项目合同
+export function addProjectContract(data) {
+  return request({
+    url: '/oa/projectContract',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc项目合同
+export function updateProjectContract(data) {
+  return request({
+    url: '/oa/projectContract',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc项目合同
+export function delProjectContract(projectId) {
+  return request({
+    url: '/oa/projectContract/' + projectId,
+    method: 'delete'
+  })
+}

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
  * @LastEditors: wrh
- * @LastEditTime: 2024-04-16 09:58:53
+ * @LastEditTime: 2024-04-19 17:39:20
 -->
 
 <template>
@@ -236,9 +236,7 @@ import { listProject, getProject } from "@/api/oa/project/project";
 import { listCar, getCar } from "@/api/oa/car/car";
 import { listCarApproval, getCarApproval, updateCarApproval, addCarApproval, modifyCarApproval } from '@/api/oa/car/carApproval'
 import { listDriver } from "@/api/system/post";
-import {
-  complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm,
-} from "@/api/flowable/todo";
+import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
 import { getUsersDeptLeader, getUsersManageLeader } from '@/api/system/post.js'
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";

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

@@ -0,0 +1,314 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="18" :xs="24">
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-form-item label="合同编号" prop="contractNumber">
+            <el-input v-model="form.contractNumber" placeholder="请输入合同编号" />
+          </el-form-item>
+          <el-form-item label="合同金额" prop="amount">
+            <el-input v-model="form.amount" placeholder="请输入合同金额" />
+          </el-form-item>
+          <el-form-item label="履约保证金" prop="deposit">
+            <el-input v-model="form.deposit" placeholder="请输入履约保证金" />
+          </el-form-item>
+          <el-form-item label="合同文件" prop="contractDocument">
+            <el-input v-model="form.contractDocument" placeholder="请输入合同文件" />
+          </el-form-item>
+          <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+              <el-form-item label="拟稿人：" label-width="120px">
+                <span class="auditor"> {{ form.draftUser ? form.draftUser.nickName : drafter }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期：" label-width="120px">
+                <span> {{ form.draftTime ? form.draftTime : draftTime }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="合同备注" prop="remark">
+            <el-input v-model="form.remark" placeholder="请输入合同备注" />
+          </el-form-item>
+          <el-form-item label="签订日期" prop="signDate">
+            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="签订备注" prop="signRemark">
+            <el-input v-model="form.signRemark" placeholder="请输入签订备注" />
+          </el-form-item>
+          <el-form-item label="签订扫描件" prop="signScan">
+            <el-input v-model="form.signScan" placeholder="请输入签订扫描件" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-col>
+      <el-col :span="6" :xs="24">
+        <el-card>
+          <h2 style="text-align: center;">流程进度</h2>
+          <div>
+            <flow :flowData="flowData" />
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { parseTime } from "@/utils/ruoyi";
+import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
+import { getContractWork } from "@/api/oa/contract/contractWork";
+import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
+import { listProject, getProject } from "@/api/oa/project/project";
+import { getUsersDeptLeader, getUsersManageLeader } from '@/api/system/post.js'
+import flow from '@/views/flowable/task/todo/detail/flow'
+import { flowXmlAndNode } from "@/api/flowable/definition";
+export default {
+  components: {
+    flow
+  },
+  props: {
+    taskName: {
+      type: String,
+      required: true
+    },
+    taskForm: {
+      type: Object,
+      required: true
+    }
+  },
+  name: "Contract",
+  data() {
+    return {
+      drafter: '',
+      draftTime: undefined,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc合同评审表格数据
+      contractList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        contractNumber: null,
+        amount: null,
+        deposit: null,
+        contractDocument: null,
+        drafter: null,
+        draftTime: null,
+        signDate: null,
+        signRemark: null,
+        signScan: null,
+        commentType: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      workList: [],
+      projectList: [],
+      chooseProject: {},
+      isSelect: false,
+      formTotal: 0,
+      flowData: {},
+    };
+  },
+  created() {
+    if (this.taskName == '合同拟稿') {
+      this.drafter = this.$store.getters.name;
+      this.draftTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    this.getList();
+    flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
+      this.flowData = res.data;
+    })
+  },
+  mounted() {
+    this.initForm();
+  },
+  methods: {
+    initForm() {
+      getContractWork(this.taskForm.formId).then(res => {
+        this.workList = res.data;
+      });
+      getContract(this.taskForm.formId).then(res => {
+        if (this.isEmptyObject(res.data)) {
+          this.formTotal = 0;
+          this.form.drafter = this.$store.getters.userId;
+        }
+        else {
+          this.formTotal = 1;
+          this.form = res.data;
+        }
+      })
+    },
+    /** 查询cmc合同评审列表 */
+    getList() {
+      this.loading = true;
+      listContract(this.queryParams).then(response => {
+        this.contractList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 查询项目列表
+    getProjectList() {
+      this.loading = true
+      listProject({
+        pageNum: 1,
+        pageSize: 99999999
+      }).then(response => {
+        this.projectList = response.rows;
+      })
+    },
+    // 选择项目
+    handleSelectProject(val) {
+      if (val != "" && val != undefined && val != null) {
+        getProject(val).then(res => {
+          this.chooseProject = res.data;
+          this.isSelect = true
+        })
+      } else {
+        this.isSelect = false
+      }
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    isEmptyObject(obj) {
+      for (var key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          return false;
+        }
+      }
+      return true;
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        contractId: null,
+        contractNumber: null,
+        amount: null,
+        deposit: null,
+        contractDocument: null,
+        drafter: null,
+        draftTime: null,
+        remark: null,
+        signDate: null,
+        signRemark: null,
+        signScan: null,
+        commentType: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.contractId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc合同评审";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const contractId = row.contractId || this.ids
+      getContract(contractId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc合同评审";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.formTotal != 0) {
+            updateContract(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            this.form.contractId = this.taskForm.formId;
+            addContract(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+            const params = { taskId: this.taskForm.taskId };
+            getNextFlowNode(params).then(res => {
+              getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+                let userId = res.data.userId;
+                this.$set(this.taskForm.variables, "approval", userId);
+                complete(this.taskForm).then(response => {
+                  this.$modal.msgSuccess(response.msg);
+                  this.$emit('goBack')
+                });
+              })
+            })
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const contractIds = row.contractId || this.ids;
+      this.$modal.confirm('是否确认删除cmc合同评审编号为"' + contractIds + '"的数据项？').then(function () {
+        return delContract(contractIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/contract/export', {
+        ...this.queryParams
+      }, `contract_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
+
+<style>
+.auditor {
+  font-family: '华文行楷';
+  font-size: 20px;
+}
+</style>

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

@@ -0,0 +1,254 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="18" :xs="24">
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-form-item label="主合同id" prop="contractId">
+            <el-input v-model="form.contractId" placeholder="请输入主合同id" />
+          </el-form-item>
+          <el-form-item label="合同名称" prop="subContractName">
+            <el-input v-model="form.subContractName" placeholder="请输入合同名称" />
+          </el-form-item>
+          <el-form-item label="分包合同金额" prop="subAmount">
+            <el-input v-model="form.subAmount" placeholder="请输入分包合同金额" />
+          </el-form-item>
+          <el-form-item label="承接单位id" prop="partnerId">
+            <el-input v-model="form.partnerId" placeholder="请输入承接单位id" />
+          </el-form-item>
+          <el-form-item label="承接单位联系人" prop="contactPerson">
+            <el-input v-model="form.contactPerson" placeholder="请输入承接单位联系人" />
+          </el-form-item>
+          <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+              <el-form-item label="拟稿人：" label-width="120px">
+                <span class="auditor"> {{ form.draftUser ? form.draftUser.nickName : drafter }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期：" label-width="120px">
+                <span> {{ form.draftTime ? form.draftTime : draftTime }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="合同备注" prop="remark">
+            <el-input v-model="form.remark" placeholder="请输入合同备注" />
+          </el-form-item>
+          <el-form-item label="签订日期" prop="signDate">
+            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="签订备注" prop="signRemark">
+            <el-input v-model="form.signRemark" placeholder="请输入签订备注" />
+          </el-form-item>
+          <el-form-item label="签订扫描件" prop="signScan">
+            <el-input v-model="form.signScan" placeholder="请输入签订扫描件" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-col>
+      <el-col :span="6" :xs="24">
+        <el-card>
+          <h2 style="text-align: center;">流程进度</h2>
+          <div>
+            <flow :flowData="flowData" />
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { parseTime } from "@/utils/ruoyi";
+import { listSubContract, getSubContract, delSubContract, addSubContract, updateSubContract } from "@/api/oa/contract/subContract";
+import flow from '@/views/flowable/task/todo/detail/flow'
+import { flowXmlAndNode } from "@/api/flowable/definition";
+export default {
+  components: {
+    flow
+  },
+  props: {
+    taskName: {
+      type: String,
+      required: true
+    },
+    taskForm: {
+      type: Object,
+      required: true
+    }
+  },
+  name: "SubContract",
+  data() {
+    return {
+      drafter:'',
+      draftTime: undefined,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc分包合同评审表格数据
+      subContractList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        contractId: null,
+        subContractName: null,
+        subAmount: null,
+        partnerId: null,
+        contactPerson: null,
+        drafter: null,
+        draftTime: null,
+        signDate: null,
+        signRemark: null,
+        signScan: null,
+        commentType: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      chooseProject: {},
+      isSelect: false,
+      formTotal: 0,
+      flowData: {},
+    };
+  },
+  created() {
+    if (this.taskName == '合同拟稿') {
+      this.drafter = this.$store.getters.name;
+      this.draftTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    this.getList();
+    flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
+      this.flowData = res.data;
+    })
+  },
+  methods: {
+    /** 查询cmc分包合同评审列表 */
+    getList() {
+      this.loading = true;
+      listSubContract(this.queryParams).then(response => {
+        this.subContractList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        subContractId: null,
+        contractId: null,
+        subContractName: null,
+        subAmount: null,
+        partnerId: null,
+        contactPerson: null,
+        drafter: null,
+        draftTime: null,
+        remark: null,
+        signDate: null,
+        signRemark: null,
+        signScan: null,
+        commentType: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.subContractId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc分包合同评审";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const subContractId = row.subContractId || this.ids
+      getSubContract(subContractId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc分包合同评审";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.subContractId != null) {
+            updateSubContract(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSubContract(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const subContractIds = row.subContractId || this.ids;
+      this.$modal.confirm('是否确认删除cmc分包合同评审编号为"' + subContractIds + '"的数据项？').then(function () {
+        return delSubContract(subContractIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/subContract/export', {
+        ...this.queryParams
+      }, `subContract_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
+
+<style>
+.auditor {
+  font-family: '华文行楷';
+  font-size: 20px;
+}
+</style>

oa-ui/src/views/flowable/task/todo/detail/index.vue

@@ -24,8 +24,6 @@
             @goBack="goBack"></zh-table>
           <car-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '用车审批'"
             @goBack="goBack"></car-form>
-          <car-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '用车审批（工会）'"
-            @goBack="goBack"></car-form>
           <device-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '设备审批'"
             @goBack="goBack"></device-form>
           <project-process :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目流转'"
@@ -38,6 +36,10 @@
             @goBack="goBack"></safe-form>
           <technical-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '技术交底'"
             @goBack="goBack"></technical-form>
+          <contract-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '承接合同评审'"
+            @goBack="goBack"></contract-form>
+          <sub-contract :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '分包合同评审'"
+            @goBack="goBack"></sub-contract>
           <el-row type="flex" justify="center">
             <!-- <el-button v-if="!formKeyExist" icon="el-icon-edit-outline" type="success" size="mini"
               @click="handleComplete">审批
@@ -191,6 +193,8 @@ import safeForm from '@/views/flowable/form/safeForm.vue';
 import technicalForm from '@/views/flowable/form/technicalForm.vue';
 import budgetIndex from '@/views/flowable/form/budget/budget.vue';
 import businessReview from '@/views/flowable/form/projectProcess/businessReview.vue';
+import contractForm from '@/views/flowable/form/contractForm.vue';
+import subContract from '@/views/flowable/form/subContract.vue';
 
 export default {
   name: "Record",
@@ -213,7 +217,9 @@ export default {
     safeForm,
     technicalForm,
     budgetIndex,
-    businessReview
+    businessReview,
+    contractForm,
+    subContract
   },
   props: {},
   data() {
@@ -527,7 +533,8 @@ export default {
     // 是否显示审批通过
     isShowApprove() {
       if (this.taskName == '员工填报' || this.taskForm.procDefName == '用车审批' || this.taskForm.procDefName == '设备审批' || this.taskForm.procDefName == '项目流转'
-        || this.taskForm.procDefName == '项目预算' || this.taskForm.procDefName == '借款审批' || this.taskForm.procDefName == '安全交底' || this.taskForm.procDefName == '技术交底') {
+        || this.taskForm.procDefName == '项目预算' || this.taskForm.procDefName == '借款审批' || this.taskForm.procDefName == '安全交底' || this.taskForm.procDefName == '技术交底'
+        || this.taskForm.procDefName == '承接合同评审'|| this.taskForm.procDefName == '分包合同评审') {
         return false
       } else {
         return true