合同线上评审

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcContractCommentController.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.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -60,10 +62,10 @@ public class CmcContractCommentController extends BaseController
     /**
      * 获取cmc合同意见详细信息
      */
-    @GetMapping(value = "/{commentId}")
-    public AjaxResult getInfo(@PathVariable("commentId") String commentId)
+    @GetMapping(value = "/{contractId}")
+    public AjaxResult getInfo(@PathVariable("contractId") String contractId)
     {
-        return success(cmcContractCommentService.selectCmcContractCommentByCommentId(commentId));
+        return success(cmcContractCommentService.selectCmcContractCommentByContractId(contractId));
     }
 
     /**
@@ -73,6 +75,7 @@ public class CmcContractCommentController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcContractComment cmcContractComment)
     {
+        cmcContractComment.setCommentId(new SnowFlake().generateId());
         return toAjax(cmcContractCommentService.insertCmcContractComment(cmcContractComment));
     }
 
@@ -90,9 +93,9 @@ public class CmcContractCommentController extends BaseController
      * 删除cmc合同意见
      */
     @Log(title = "cmc合同意见", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{commentIds}")
-    public AjaxResult remove(@PathVariable String[] commentIds)
+	@DeleteMapping("/{contractIds}")
+    public AjaxResult remove(@PathVariable String[] contractIds)
     {
-        return toAjax(cmcContractCommentService.deleteCmcContractCommentByCommentIds(commentIds));
+        return toAjax(cmcContractCommentService.deleteCmcContractCommentByContractIds(contractIds));
     }
 }

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcContractMeetingController.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.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -60,10 +62,10 @@ public class CmcContractMeetingController extends BaseController
     /**
      * 获取cmc合同会审详细信息
      */
-    @GetMapping(value = "/{meetingId}")
-    public AjaxResult getInfo(@PathVariable("meetingId") String meetingId)
+    @GetMapping(value = "/{contractId}")
+    public AjaxResult getInfo(@PathVariable("contractId") String contractId)
     {
-        return success(cmcContractMeetingService.selectCmcContractMeetingByMeetingId(meetingId));
+        return success(cmcContractMeetingService.selectCmcContractMeetingByContractId(contractId));
     }
 
     /**
@@ -73,6 +75,7 @@ public class CmcContractMeetingController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcContractMeeting cmcContractMeeting)
     {
+        cmcContractMeeting.setMeetingId(new SnowFlake().generateId());
         return toAjax(cmcContractMeetingService.insertCmcContractMeeting(cmcContractMeeting));
     }
 
@@ -90,9 +93,9 @@ public class CmcContractMeetingController extends BaseController
      * 删除cmc合同会审
      */
     @Log(title = "cmc合同会审", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{meetingIds}")
-    public AjaxResult remove(@PathVariable String[] meetingIds)
+	@DeleteMapping("/{contractIds}")
+    public AjaxResult remove(@PathVariable String[] contractIds)
     {
-        return toAjax(cmcContractMeetingService.deleteCmcContractMeetingByMeetingIds(meetingIds));
+        return toAjax(cmcContractMeetingService.deleteCmcContractMeetingByContractIds(contractIds));
     }
 }

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcContractPaymentController.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.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -60,10 +62,10 @@ public class CmcContractPaymentController extends BaseController
     /**
      * 获取cmc合同回款详细信息
      */
-    @GetMapping(value = "/{paymentId}")
-    public AjaxResult getInfo(@PathVariable("paymentId") String paymentId)
+    @GetMapping(value = "/{contractId}")
+    public AjaxResult getInfo(@PathVariable("contractId") String contractId)
     {
-        return success(cmcContractPaymentService.selectCmcContractPaymentByPaymentId(paymentId));
+        return success(cmcContractPaymentService.selectCmcContractPaymentByContractId(contractId));
     }
 
     /**
@@ -73,6 +75,7 @@ public class CmcContractPaymentController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcContractPayment cmcContractPayment)
     {
+        cmcContractPayment.setPaymentId(new SnowFlake().generateId());
         return toAjax(cmcContractPaymentService.insertCmcContractPayment(cmcContractPayment));
     }
 
@@ -90,9 +93,9 @@ public class CmcContractPaymentController extends BaseController
      * 删除cmc合同回款
      */
     @Log(title = "cmc合同回款", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{paymentIds}")
-    public AjaxResult remove(@PathVariable String[] paymentIds)
+	@DeleteMapping("/{contractIds}")
+    public AjaxResult remove(@PathVariable String[] contractIds)
     {
-        return toAjax(cmcContractPaymentService.deleteCmcContractPaymentByPaymentIds(paymentIds));
+        return toAjax(cmcContractPaymentService.deleteCmcContractPaymentByContractIds(contractIds));
     }
 }

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcContractWorkController.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.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -60,10 +62,10 @@ public class CmcContractWorkController extends BaseController
     /**
      * 获取cmc合同内容详细信息
      */
-    @GetMapping(value = "/{workId}")
-    public AjaxResult getInfo(@PathVariable("workId") String workId)
+    @GetMapping(value = "/{contractId}")
+    public AjaxResult getInfo(@PathVariable("contractId") String contractId)
     {
-        return success(cmcContractWorkService.selectCmcContractWorkByWorkId(workId));
+        return success(cmcContractWorkService.selectCmcContractWorkByContractId(contractId));
     }
 
     /**
@@ -73,6 +75,7 @@ public class CmcContractWorkController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcContractWork cmcContractWork)
     {
+        cmcContractWork.setWorkId(new SnowFlake().generateId());
         return toAjax(cmcContractWorkService.insertCmcContractWork(cmcContractWork));
     }
 
@@ -90,9 +93,9 @@ public class CmcContractWorkController extends BaseController
      * 删除cmc合同内容
      */
     @Log(title = "cmc合同内容", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{workIds}")
-    public AjaxResult remove(@PathVariable String[] workIds)
+	@DeleteMapping("/{contractIds}")
+    public AjaxResult remove(@PathVariable String[] contractIds)
     {
-        return toAjax(cmcContractWorkService.deleteCmcContractWorkByWorkIds(workIds));
+        return toAjax(cmcContractWorkService.deleteCmcContractWorkByContractIds(contractIds));
     }
 }

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

@@ -22,6 +22,10 @@ public class CmcContract extends BaseEntity
     /** 合同id（ht2024w002） */
     private String contractId;
 
+    /** 合同编码 */
+    @Excel(name = "合同编码")
+    private String contractCode;
+
     /** 合同编号 */
     @Excel(name = "合同编号")
     private String contractNumber;
@@ -93,6 +97,15 @@ public class CmcContract extends BaseEntity
     {
         return contractId;
     }
+    public void setContractCode(String contractCode)
+    {
+        this.contractCode = contractCode;
+    }
+
+    public String getContractCode()
+    {
+        return contractCode;
+    }
     public void setContractNumber(String contractNumber)
     {
         this.contractNumber = contractNumber;

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

@@ -24,6 +24,10 @@ public class CmcContractComment extends BaseEntity
     @Excel(name = "合同id")
     private String contractId;
 
+    /** 分包合同id */
+    @Excel(name = "分包合同id")
+    private String subContractId;
+
     /** 会审部门 */
     @Excel(name = "会审部门")
     private Long deptId;
@@ -63,6 +67,15 @@ public class CmcContractComment extends BaseEntity
     {
         return contractId;
     }
+    public void setSubContractId(String subContractId)
+    {
+        this.subContractId = subContractId;
+    }
+
+    public String getSubContractId()
+    {
+        return subContractId;
+    }
     public void setDeptId(Long deptId)
     {
         this.deptId = deptId;

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

@@ -24,6 +24,10 @@ public class CmcContractMeeting extends BaseEntity
     @Excel(name = "合同id")
     private String contractId;
 
+    /** 分包合同id */
+    @Excel(name = "分包合同id")
+    private String subContractId;
+
     /** 评审时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "评审时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -72,6 +76,15 @@ public class CmcContractMeeting extends BaseEntity
     {
         return contractId;
     }
+    public void setSubContractId(String subContractId)
+    {
+        this.subContractId = subContractId;
+    }
+
+    public String getSubContractId()
+    {
+        return subContractId;
+    }
     public void setMeetingTime(Date meetingTime)
     {
         this.meetingTime = meetingTime;

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

@@ -19,7 +19,7 @@ public class CmcSubContract extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 分包合同id（ht2024w002） */
+    /** 分包合同id */
     private String subContractId;
 
     /** 主合同id */
@@ -48,6 +48,8 @@ public class CmcSubContract extends BaseEntity
 
     private SysUser draftUser;
 
+    private SysUser managerUser;
+
     /** 拟稿日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "拟稿日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -70,6 +72,19 @@ public class CmcSubContract extends BaseEntity
     @Excel(name = "评审方式")
     private String commentType;
 
+    /** 分管审批意见 */
+    @Excel(name = "分管审批意见")
+    private String managerComment;
+
+    /** 分管审批人 */
+    @Excel(name = "分管审批人")
+    private Long managerUserId;
+
+    /** 分管审批日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "分管审批日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date managerTime;
+
     public void setSubContractId(String subContractId) 
     {
         this.subContractId = subContractId;
@@ -142,6 +157,15 @@ public class CmcSubContract extends BaseEntity
     {
         return draftUser;
     }
+    public void setManagerUser(SysUser managerUser)
+    {
+        this.managerUser = managerUser;
+    }
+
+    public SysUser getManagerUser()
+    {
+        return managerUser;
+    }
     public void setDraftTime(Date draftTime) 
     {
         this.draftTime = draftTime;
@@ -188,6 +212,34 @@ public class CmcSubContract extends BaseEntity
         return commentType;
     }
 
+    public void setManagerComment(String managerComment)
+    {
+        this.managerComment = managerComment;
+    }
+
+    public String getManagerComment()
+    {
+        return managerComment;
+    }
+    public void setManagerUserId(Long managerUserId)
+    {
+        this.managerUserId = managerUserId;
+    }
+
+    public Long getManagerUserId()
+    {
+        return managerUserId;
+    }
+    public void setManagerTime(Date managerTime)
+    {
+        this.managerTime = managerTime;
+    }
+
+    public Date getManagerTime()
+    {
+        return managerTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -204,6 +256,9 @@ public class CmcSubContract extends BaseEntity
             .append("signRemark", getSignRemark())
             .append("signScan", getSignScan())
             .append("commentType", getCommentType())
+                .append("managerComment", getManagerComment())
+                .append("managerUserId", getManagerUserId())
+                .append("managerTime", getManagerTime())
             .toString();
     }
 }

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

@@ -14,10 +14,10 @@ public interface CmcContractCommentMapper
     /**
      * 查询cmc合同意见
      * 
-     * @param commentId cmc合同意见主键
+     * @param contractId cmc合同意见主键
      * @return cmc合同意见
      */
-    public CmcContractComment selectCmcContractCommentByCommentId(String commentId);
+    public List<CmcContractComment> selectCmcContractCommentByContractId(String contractId);
 
     /**
      * 查询cmc合同意见列表
@@ -46,16 +46,16 @@ public interface CmcContractCommentMapper
     /**
      * 删除cmc合同意见
      * 
-     * @param commentId cmc合同意见主键
+     * @param contractId cmc合同意见主键
      * @return 结果
      */
-    public int deleteCmcContractCommentByCommentId(String commentId);
+    public int deleteCmcContractCommentByContractId(String contractId);
 
     /**
      * 批量删除cmc合同意见
      * 
-     * @param commentIds 需要删除的数据主键集合
+     * @param contractIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcContractCommentByCommentIds(String[] commentIds);
+    public int deleteCmcContractCommentByContractIds(String[] contractIds);
 }

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

@@ -14,10 +14,10 @@ public interface CmcContractMeetingMapper
     /**
      * 查询cmc合同会审
      * 
-     * @param meetingId cmc合同会审主键
+     * @param contractId cmc合同会审主键
      * @return cmc合同会审
      */
-    public CmcContractMeeting selectCmcContractMeetingByMeetingId(String meetingId);
+    public CmcContractMeeting selectCmcContractMeetingByContractId(String contractId);
 
     /**
      * 查询cmc合同会审列表
@@ -46,16 +46,16 @@ public interface CmcContractMeetingMapper
     /**
      * 删除cmc合同会审
      * 
-     * @param meetingId cmc合同会审主键
+     * @param contractId cmc合同会审主键
      * @return 结果
      */
-    public int deleteCmcContractMeetingByMeetingId(String meetingId);
+    public int deleteCmcContractMeetingByContractId(String contractId);
 
     /**
      * 批量删除cmc合同会审
      * 
-     * @param meetingIds 需要删除的数据主键集合
+     * @param contractIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcContractMeetingByMeetingIds(String[] meetingIds);
+    public int deleteCmcContractMeetingByContractIds(String[] contractIds);
 }

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

@@ -14,10 +14,10 @@ public interface CmcContractPaymentMapper
     /**
      * 查询cmc合同回款
      * 
-     * @param paymentId cmc合同回款主键
+     * @param contractId cmc合同回款主键
      * @return cmc合同回款
      */
-    public CmcContractPayment selectCmcContractPaymentByPaymentId(String paymentId);
+    public List<CmcContractPayment> selectCmcContractPaymentByContractId(String contractId);
 
     /**
      * 查询cmc合同回款列表
@@ -46,16 +46,16 @@ public interface CmcContractPaymentMapper
     /**
      * 删除cmc合同回款
      * 
-     * @param paymentId cmc合同回款主键
+     * @param contractId cmc合同回款主键
      * @return 结果
      */
-    public int deleteCmcContractPaymentByPaymentId(String paymentId);
+    public int deleteCmcContractPaymentByContractId(String contractId);
 
     /**
      * 批量删除cmc合同回款
      * 
-     * @param paymentIds 需要删除的数据主键集合
+     * @param contractIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcContractPaymentByPaymentIds(String[] paymentIds);
+    public int deleteCmcContractPaymentByContractIds(String[] contractIds);
 }

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

@@ -14,10 +14,10 @@ public interface CmcContractWorkMapper
     /**
      * 查询cmc合同内容
      * 
-     * @param workId cmc合同内容主键
+     * @param contractId cmc合同内容主键
      * @return cmc合同内容
      */
-    public CmcContractWork selectCmcContractWorkByWorkId(String workId);
+    public List<CmcContractWork> selectCmcContractWorkByContractId(String contractId);
 
     /**
      * 查询cmc合同内容列表
@@ -46,16 +46,16 @@ public interface CmcContractWorkMapper
     /**
      * 删除cmc合同内容
      * 
-     * @param workId cmc合同内容主键
+     * @param contractId cmc合同内容主键
      * @return 结果
      */
-    public int deleteCmcContractWorkByWorkId(String workId);
+    public int deleteCmcContractWorkByContractId(String contractId);
 
     /**
      * 批量删除cmc合同内容
      * 
-     * @param workIds 需要删除的数据主键集合
+     * @param contractIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcContractWorkByWorkIds(String[] workIds);
+    public int deleteCmcContractWorkByContractIds(String[] contractIds);
 }

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

@@ -14,10 +14,10 @@ public interface ICmcContractCommentService
     /**
      * 查询cmc合同意见
      * 
-     * @param commentId cmc合同意见主键
+     * @param contractId cmc合同意见主键
      * @return cmc合同意见
      */
-    public CmcContractComment selectCmcContractCommentByCommentId(String commentId);
+    public List<CmcContractComment> selectCmcContractCommentByContractId(String contractId);
 
     /**
      * 查询cmc合同意见列表
@@ -46,16 +46,16 @@ public interface ICmcContractCommentService
     /**
      * 批量删除cmc合同意见
      * 
-     * @param commentIds 需要删除的cmc合同意见主键集合
+     * @param contractIds 需要删除的cmc合同意见主键集合
      * @return 结果
      */
-    public int deleteCmcContractCommentByCommentIds(String[] commentIds);
+    public int deleteCmcContractCommentByContractIds(String[] contractIds);
 
     /**
      * 删除cmc合同意见信息
      * 
-     * @param commentId cmc合同意见主键
+     * @param contractId cmc合同意见主键
      * @return 结果
      */
-    public int deleteCmcContractCommentByCommentId(String commentId);
+    public int deleteCmcContractCommentByContractId(String contractId);
 }

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

@@ -14,10 +14,10 @@ public interface ICmcContractMeetingService
     /**
      * 查询cmc合同会审
      * 
-     * @param meetingId cmc合同会审主键
+     * @param contractId cmc合同会审主键
      * @return cmc合同会审
      */
-    public CmcContractMeeting selectCmcContractMeetingByMeetingId(String meetingId);
+    public CmcContractMeeting selectCmcContractMeetingByContractId(String contractId);
 
     /**
      * 查询cmc合同会审列表
@@ -46,16 +46,16 @@ public interface ICmcContractMeetingService
     /**
      * 批量删除cmc合同会审
      * 
-     * @param meetingIds 需要删除的cmc合同会审主键集合
+     * @param contractIds 需要删除的cmc合同会审主键集合
      * @return 结果
      */
-    public int deleteCmcContractMeetingByMeetingIds(String[] meetingIds);
+    public int deleteCmcContractMeetingByContractIds(String[] contractIds);
 
     /**
      * 删除cmc合同会审信息
      * 
-     * @param meetingId cmc合同会审主键
+     * @param contractId cmc合同会审主键
      * @return 结果
      */
-    public int deleteCmcContractMeetingByMeetingId(String meetingId);
+    public int deleteCmcContractMeetingByContractId(String contractId);
 }

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

@@ -14,10 +14,10 @@ public interface ICmcContractPaymentService
     /**
      * 查询cmc合同回款
      * 
-     * @param paymentId cmc合同回款主键
+     * @param contractId cmc合同回款主键
      * @return cmc合同回款
      */
-    public CmcContractPayment selectCmcContractPaymentByPaymentId(String paymentId);
+    public List<CmcContractPayment> selectCmcContractPaymentByContractId(String contractId);
 
     /**
      * 查询cmc合同回款列表
@@ -46,16 +46,16 @@ public interface ICmcContractPaymentService
     /**
      * 批量删除cmc合同回款
      * 
-     * @param paymentIds 需要删除的cmc合同回款主键集合
+     * @param contractIds 需要删除的cmc合同回款主键集合
      * @return 结果
      */
-    public int deleteCmcContractPaymentByPaymentIds(String[] paymentIds);
+    public int deleteCmcContractPaymentByContractIds(String[] contractIds);
 
     /**
      * 删除cmc合同回款信息
      * 
-     * @param paymentId cmc合同回款主键
+     * @param contractId cmc合同回款主键
      * @return 结果
      */
-    public int deleteCmcContractPaymentByPaymentId(String paymentId);
+    public int deleteCmcContractPaymentByContractId(String contractId);
 }

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

@@ -14,10 +14,10 @@ public interface ICmcContractWorkService
     /**
      * 查询cmc合同内容
      * 
-     * @param workId cmc合同内容主键
+     * @param contractId cmc合同内容主键
      * @return cmc合同内容
      */
-    public CmcContractWork selectCmcContractWorkByWorkId(String workId);
+    public List<CmcContractWork> selectCmcContractWorkByContractId(String contractId);
 
     /**
      * 查询cmc合同内容列表
@@ -46,16 +46,16 @@ public interface ICmcContractWorkService
     /**
      * 批量删除cmc合同内容
      * 
-     * @param workIds 需要删除的cmc合同内容主键集合
+     * @param contractIds 需要删除的cmc合同内容主键集合
      * @return 结果
      */
-    public int deleteCmcContractWorkByWorkIds(String[] workIds);
+    public int deleteCmcContractWorkByContractIds(String[] contractIds);
 
     /**
      * 删除cmc合同内容信息
      * 
-     * @param workId cmc合同内容主键
+     * @param contractId cmc合同内容主键
      * @return 结果
      */
-    public int deleteCmcContractWorkByWorkId(String workId);
+    public int deleteCmcContractWorkByContractId(String contractId);
 }

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

@@ -22,13 +22,13 @@ public class CmcContractCommentServiceImpl implements ICmcContractCommentService
     /**
      * 查询cmc合同意见
      * 
-     * @param commentId cmc合同意见主键
+     * @param contractId cmc合同意见主键
      * @return cmc合同意见
      */
     @Override
-    public CmcContractComment selectCmcContractCommentByCommentId(String commentId)
+    public List<CmcContractComment> selectCmcContractCommentByContractId(String contractId)
     {
-        return cmcContractCommentMapper.selectCmcContractCommentByCommentId(commentId);
+        return cmcContractCommentMapper.selectCmcContractCommentByContractId(contractId);
     }
 
     /**
@@ -70,24 +70,24 @@ public class CmcContractCommentServiceImpl implements ICmcContractCommentService
     /**
      * 批量删除cmc合同意见
      * 
-     * @param commentIds 需要删除的cmc合同意见主键
+     * @param contractIds 需要删除的cmc合同意见主键
      * @return 结果
      */
     @Override
-    public int deleteCmcContractCommentByCommentIds(String[] commentIds)
+    public int deleteCmcContractCommentByContractIds(String[] contractIds)
     {
-        return cmcContractCommentMapper.deleteCmcContractCommentByCommentIds(commentIds);
+        return cmcContractCommentMapper.deleteCmcContractCommentByContractIds(contractIds);
     }
 
     /**
      * 删除cmc合同意见信息
      * 
-     * @param commentId cmc合同意见主键
+     * @param contractId cmc合同意见主键
      * @return 结果
      */
     @Override
-    public int deleteCmcContractCommentByCommentId(String commentId)
+    public int deleteCmcContractCommentByContractId(String contractId)
     {
-        return cmcContractCommentMapper.deleteCmcContractCommentByCommentId(commentId);
+        return cmcContractCommentMapper.deleteCmcContractCommentByContractId(contractId);
     }
 }

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

@@ -22,13 +22,13 @@ public class CmcContractMeetingServiceImpl implements ICmcContractMeetingService
     /**
      * 查询cmc合同会审
      * 
-     * @param meetingId cmc合同会审主键
+     * @param contractId cmc合同会审主键
      * @return cmc合同会审
      */
     @Override
-    public CmcContractMeeting selectCmcContractMeetingByMeetingId(String meetingId)
+    public CmcContractMeeting selectCmcContractMeetingByContractId(String contractId)
     {
-        return cmcContractMeetingMapper.selectCmcContractMeetingByMeetingId(meetingId);
+        return cmcContractMeetingMapper.selectCmcContractMeetingByContractId(contractId);
     }
 
     /**
@@ -70,24 +70,24 @@ public class CmcContractMeetingServiceImpl implements ICmcContractMeetingService
     /**
      * 批量删除cmc合同会审
      * 
-     * @param meetingIds 需要删除的cmc合同会审主键
+     * @param contractIds 需要删除的cmc合同会审主键
      * @return 结果
      */
     @Override
-    public int deleteCmcContractMeetingByMeetingIds(String[] meetingIds)
+    public int deleteCmcContractMeetingByContractIds(String[] contractIds)
     {
-        return cmcContractMeetingMapper.deleteCmcContractMeetingByMeetingIds(meetingIds);
+        return cmcContractMeetingMapper.deleteCmcContractMeetingByContractIds(contractIds);
     }
 
     /**
      * 删除cmc合同会审信息
      * 
-     * @param meetingId cmc合同会审主键
+     * @param contractId cmc合同会审主键
      * @return 结果
      */
     @Override
-    public int deleteCmcContractMeetingByMeetingId(String meetingId)
+    public int deleteCmcContractMeetingByContractId(String contractId)
     {
-        return cmcContractMeetingMapper.deleteCmcContractMeetingByMeetingId(meetingId);
+        return cmcContractMeetingMapper.deleteCmcContractMeetingByContractId(contractId);
     }
 }

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

@@ -22,13 +22,13 @@ public class CmcContractPaymentServiceImpl implements ICmcContractPaymentService
     /**
      * 查询cmc合同回款
      * 
-     * @param paymentId cmc合同回款主键
+     * @param contractId cmc合同回款主键
      * @return cmc合同回款
      */
     @Override
-    public CmcContractPayment selectCmcContractPaymentByPaymentId(String paymentId)
+    public List<CmcContractPayment> selectCmcContractPaymentByContractId(String contractId)
     {
-        return cmcContractPaymentMapper.selectCmcContractPaymentByPaymentId(paymentId);
+        return cmcContractPaymentMapper.selectCmcContractPaymentByContractId(contractId);
     }
 
     /**
@@ -70,24 +70,24 @@ public class CmcContractPaymentServiceImpl implements ICmcContractPaymentService
     /**
      * 批量删除cmc合同回款
      * 
-     * @param paymentIds 需要删除的cmc合同回款主键
+     * @param contractIds 需要删除的cmc合同回款主键
      * @return 结果
      */
     @Override
-    public int deleteCmcContractPaymentByPaymentIds(String[] paymentIds)
+    public int deleteCmcContractPaymentByContractIds(String[] contractIds)
     {
-        return cmcContractPaymentMapper.deleteCmcContractPaymentByPaymentIds(paymentIds);
+        return cmcContractPaymentMapper.deleteCmcContractPaymentByContractIds(contractIds);
     }
 
     /**
      * 删除cmc合同回款信息
      * 
-     * @param paymentId cmc合同回款主键
+     * @param contractId cmc合同回款主键
      * @return 结果
      */
     @Override
-    public int deleteCmcContractPaymentByPaymentId(String paymentId)
+    public int deleteCmcContractPaymentByContractId(String contractId)
     {
-        return cmcContractPaymentMapper.deleteCmcContractPaymentByPaymentId(paymentId);
+        return cmcContractPaymentMapper.deleteCmcContractPaymentByContractId(contractId);
     }
 }

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

@@ -22,13 +22,13 @@ public class CmcContractWorkServiceImpl implements ICmcContractWorkService
     /**
      * 查询cmc合同内容
      * 
-     * @param workId cmc合同内容主键
+     * @param contractId cmc合同内容主键
      * @return cmc合同内容
      */
     @Override
-    public CmcContractWork selectCmcContractWorkByWorkId(String workId)
+    public List<CmcContractWork> selectCmcContractWorkByContractId(String contractId)
     {
-        return cmcContractWorkMapper.selectCmcContractWorkByWorkId(workId);
+        return cmcContractWorkMapper.selectCmcContractWorkByContractId(contractId);
     }
 
     /**
@@ -70,24 +70,24 @@ public class CmcContractWorkServiceImpl implements ICmcContractWorkService
     /**
      * 批量删除cmc合同内容
      * 
-     * @param workIds 需要删除的cmc合同内容主键
+     * @param contractIds 需要删除的cmc合同内容主键
      * @return 结果
      */
     @Override
-    public int deleteCmcContractWorkByWorkIds(String[] workIds)
+    public int deleteCmcContractWorkByContractIds(String[] contractIds)
     {
-        return cmcContractWorkMapper.deleteCmcContractWorkByWorkIds(workIds);
+        return cmcContractWorkMapper.deleteCmcContractWorkByContractIds(contractIds);
     }
 
     /**
      * 删除cmc合同内容信息
      * 
-     * @param workId cmc合同内容主键
+     * @param contractId cmc合同内容主键
      * @return 结果
      */
     @Override
-    public int deleteCmcContractWorkByWorkId(String workId)
+    public int deleteCmcContractWorkByContractId(String contractId)
     {
-        return cmcContractWorkMapper.deleteCmcContractWorkByWorkId(workId);
+        return cmcContractWorkMapper.deleteCmcContractWorkByContractId(contractId);
     }
 }

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

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="applier"    column="applier"    />
         <result property="applyDept"    column="apply_dept"    />
         <result property="applyDate"    column="apply_date"    />
+        <result property="remark"    column="remark"    />
         <result property="applyAmount"    column="apply_amount"    />
         <result property="managerAmount"    column="manager_amount"    />
         <result property="deptComment"    column="dept_comment"    />
@@ -80,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcBorrowVo">
-        select b.borrow_id, b.project_id, p.project_number, p.project_name, b.apply_reason, b.applier, u.nick_name as applier_nick_name, d.dept_name, b.apply_dept,
+        select b.borrow_id, b.project_id, p.project_number, p.project_name, b.apply_reason, b.applier, u.nick_name as applier_nick_name, d.dept_name, b.apply_dept, b.remark,
                b.apply_date, b.apply_amount, b.manager_amount, b.dept_comment, b.dept_user_id, u1.nick_name as dept_nick_name, b.xm_user_id, u2.nick_name as xm_nick_name, b.xm_comment,
                b.manager_comment, b.manager_user_id, u3.nick_name as manager_nick_name, b.zjl_user_id, u4.nick_name as zjl_nick_name, b.zjl_comment, b.cw_user_id, u5.nick_name as cw_nick_name,
                b.cw_comment, b.dept_time, b.xm_time, b.manager_time, b.zjl_time, b.lend_time from cmc_borrow as b
@@ -101,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyReason != null  and applyReason != ''"> and b.apply_reason = #{applyReason}</if>
             <if test="applyDept != null  and applyDept != ''"> and b.apply_dept = #{applyDept}</if>
             <if test="applier != null "> and b.applier = #{applier}</if>
+            <if test="remark != null "> and b.remark = #{remark}</if>
             <if test="applyDate != null "> and b.apply_date = #{applyDate}</if>
             <if test="applyAmount != null "> and b.apply_amount = #{applyAmount}</if>
             <if test="managerAmount != null "> and b.manager_amount = #{managerAmount}</if>
@@ -134,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null">project_id,</if>
             <if test="applyReason != null">apply_reason,</if>
             <if test="applier != null">applier,</if>
+            <if test="remark != null">remark,</if>
             <if test="applyDept != null">apply_dept,</if>
             <if test="applyDate != null">apply_date,</if>
             <if test="applyAmount != null">apply_amount,</if>
@@ -159,6 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null">#{projectId},</if>
             <if test="applyReason != null">#{applyReason},</if>
             <if test="applier != null">#{applier},</if>
+            <if test="remark != null">#{remark},</if>
             <if test="applyDept != null">#{applyDept},</if>
             <if test="applyDate != null">#{applyDate},</if>
             <if test="applyAmount != null">#{applyAmount},</if>
@@ -187,6 +191,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="applyReason != null">apply_reason = #{applyReason},</if>
             <if test="applier != null">applier = #{applier},</if>
+            <if test="remark != null">remark = #{remark},</if>
             <if test="applyDept != null">apply_dept = #{applyDept},</if>
             <if test="applyDate != null">apply_date = #{applyDate},</if>
             <if test="applyAmount != null">apply_amount = #{applyAmount},</if>

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcContractComment" id="CmcContractCommentResult">
         <result property="commentId"    column="comment_id"    />
         <result property="contractId"    column="contract_id"    />
+        <result property="subContractId"    column="sub_contract_id"    />
         <result property="deptId"    column="dept_id"    />
         <result property="userId"    column="user_id"    />
         <result property="comment"    column="comment"    />
@@ -15,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcContractCommentVo">
-        select comment_id, contract_id, dept_id, user_id, comment, document, comment_time from cmc_contract_comment
+        select comment_id, contract_id, sub_contract_id, dept_id, user_id, comment, document, comment_time from cmc_contract_comment
     </sql>
 
     <select id="selectCmcContractCommentList" parameterType="CmcContractComment" resultMap="CmcContractCommentResult">
@@ -30,9 +31,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectCmcContractCommentByCommentId" parameterType="String" resultMap="CmcContractCommentResult">
+    <select id="selectCmcContractCommentByContractId" parameterType="String" resultMap="CmcContractCommentResult">
         <include refid="selectCmcContractCommentVo"/>
-        where comment_id = #{commentId}
+        where contract_id = #{contractId}
     </select>
 
     <insert id="insertCmcContractComment" parameterType="CmcContractComment">
@@ -40,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="commentId != null">comment_id,</if>
             <if test="contractId != null">contract_id,</if>
+            <if test="subContractId != null">sub_contract_id,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="userId != null">user_id,</if>
             <if test="comment != null">comment,</if>
@@ -49,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="commentId != null">#{commentId},</if>
             <if test="contractId != null">#{contractId},</if>
+            <if test="subContractId != null">#{subContractId},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="userId != null">#{userId},</if>
             <if test="comment != null">#{comment},</if>
@@ -61,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update cmc_contract_comment
         <trim prefix="SET" suffixOverrides=",">
             <if test="contractId != null">contract_id = #{contractId},</if>
+            <if test="subContractId != null">sub_contract_id = #{subContractId},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="comment != null">comment = #{comment},</if>
@@ -70,14 +74,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where comment_id = #{commentId}
     </update>
 
-    <delete id="deleteCmcContractCommentByCommentId" parameterType="String">
-        delete from cmc_contract_comment where comment_id = #{commentId}
+    <delete id="deleteCmcContractCommentByContractId" parameterType="String">
+        delete from cmc_contract_comment where contract_id = #{contractId}
     </delete>
 
-    <delete id="deleteCmcContractCommentByCommentIds" parameterType="String">
-        delete from cmc_contract_comment where comment_id in 
-        <foreach item="commentId" collection="array" open="(" separator="," close=")">
-            #{commentId}
+    <delete id="deleteCmcContractCommentByContractIds" parameterType="String">
+        delete from cmc_contract_comment where contract_id in 
+        <foreach item="contractId" collection="array" open="(" separator="," close=")">
+            #{contractId}
         </foreach>
     </delete>
 </mapper>

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

@@ -6,6 +6,7 @@
 
     <resultMap type="CmcContract" id="CmcContractResult">
         <result property="contractId"    column="contract_id"    />
+        <result property="contractCode"    column="contract_code"    />
         <result property="contractNumber"    column="contract_number"    />
         <result property="tenderId"    column="tender_id"    />
         <result property="amount"    column="amount"    />
@@ -36,7 +37,7 @@
     </resultMap>
 
     <sql id="selectCmcContractVo">
-        select c.contract_id, c.contract_number, c.tender_id, 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,
+        select c.contract_id, c.contract_code, c.contract_number, c.tender_id, 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
         left join sys_user as u on u.user_id = c.drafter
         left join sys_user as u1 on u1.user_id = c.manager_user_id
@@ -46,6 +47,7 @@
         <include refid="selectCmcContractVo"/>
         <where>
             <if test="contractId != null  and contractId != ''"> and c.contract_id like concat('%', #{contractId}, '%')</if>
+            <if test="contractCode!= null  and contractCode != ''"> and c.contract_code like concat('%', #{contractCode}, '%')</if>
             <if test="tenderId != null  and tenderId != ''"> and c.tender_id = #{tenderId}</if>
             <if test="contractNumber != null  and contractNumber != ''"> and c.contract_number = #{contractNumber}</if>
             <if test="amount != null "> and c.amount = #{amount}</if>
@@ -70,6 +72,7 @@
         insert into cmc_contract
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="contractId != null">contract_id,</if>
+            <if test="contractCode != null">contract_code,</if>
             <if test="tenderId != null">tender_id,</if>
             <if test="contractNumber != null">contract_number,</if>
             <if test="amount != null">amount,</if>
@@ -88,6 +91,7 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="contractId != null">#{contractId},</if>
+            <if test="contractCode != null">#{contractCode},</if>
             <if test="tenderId != null">#{tenderId},</if>
             <if test="contractNumber != null">#{contractNumber},</if>
             <if test="amount != null">#{amount},</if>
@@ -109,6 +113,7 @@
     <update id="updateCmcContract" parameterType="CmcContract">
         update cmc_contract
         <trim prefix="SET" suffixOverrides=",">
+            <if test="contractCode != null">contract_code = #{contractCode},</if>
             <if test="tenderId != null">tender_id = #{tenderId},</if>
             <if test="contractNumber != null">contract_number = #{contractNumber},</if>
             <if test="amount != null">amount = #{amount},</if>

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

@@ -7,6 +7,7 @@
     <resultMap type="CmcContractMeeting" id="CmcContractMeetingResult">
         <result property="meetingId"    column="meeting_id"    />
         <result property="contractId"    column="contract_id"    />
+        <result property="subContractId"    column="sub_contract_id"    />
         <result property="meetingTime"    column="meeting_time"    />
         <result property="hostId"    column="host_id"    />
         <result property="place"    column="place"    />
@@ -17,7 +18,7 @@
     </resultMap>
 
     <sql id="selectCmcContractMeetingVo">
-        select meeting_id, contract_id, meeting_time, host_id, place, users, conclusion, document, comment_time from cmc_contract_meeting
+        select meeting_id, contract_id, sub_contract_id, meeting_time, host_id, place, users, conclusion, document, comment_time from cmc_contract_meeting
     </sql>
 
     <select id="selectCmcContractMeetingList" parameterType="CmcContractMeeting" resultMap="CmcContractMeetingResult">
@@ -34,9 +35,9 @@
         </where>
     </select>
 
-    <select id="selectCmcContractMeetingByMeetingId" parameterType="String" resultMap="CmcContractMeetingResult">
+    <select id="selectCmcContractMeetingByContractId" parameterType="String" resultMap="CmcContractMeetingResult">
         <include refid="selectCmcContractMeetingVo"/>
-        where meeting_id = #{meetingId}
+        where contract_id = #{contractId}
     </select>
 
     <insert id="insertCmcContractMeeting" parameterType="CmcContractMeeting">
@@ -44,6 +45,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="meetingId != null">meeting_id,</if>
             <if test="contractId != null">contract_id,</if>
+            <if test="subContractId != null">sub_contract_id,</if>
             <if test="meetingTime != null">meeting_time,</if>
             <if test="hostId != null">host_id,</if>
             <if test="place != null">place,</if>
@@ -55,6 +57,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="meetingId != null">#{meetingId},</if>
             <if test="contractId != null">#{contractId},</if>
+            <if test="subContractId != null">#{subContractId},</if>
             <if test="meetingTime != null">#{meetingTime},</if>
             <if test="hostId != null">#{hostId},</if>
             <if test="place != null">#{place},</if>
@@ -69,6 +72,7 @@
         update cmc_contract_meeting
         <trim prefix="SET" suffixOverrides=",">
             <if test="contractId != null">contract_id = #{contractId},</if>
+            <if test="subContractId != null">sub_contract_id = #{subContractId},</if>
             <if test="meetingTime != null">meeting_time = #{meetingTime},</if>
             <if test="hostId != null">host_id = #{hostId},</if>
             <if test="place != null">place = #{place},</if>
@@ -80,14 +84,14 @@
         where meeting_id = #{meetingId}
     </update>
 
-    <delete id="deleteCmcContractMeetingByMeetingId" parameterType="String">
-        delete from cmc_contract_meeting where meeting_id = #{meetingId}
+    <delete id="deleteCmcContractMeetingByContractId" parameterType="String">
+        delete from cmc_contract_meeting where contract_id = #{contractId}
     </delete>
 
-    <delete id="deleteCmcContractMeetingByMeetingIds" parameterType="String">
-        delete from cmc_contract_meeting where meeting_id in
-        <foreach item="meetingId" collection="array" open="(" separator="," close=")">
-            #{meetingId}
+    <delete id="deleteCmcContractMeetingByContractIds" parameterType="String">
+        delete from cmc_contract_meeting where contract_id in
+        <foreach item="contractId" collection="array" open="(" separator="," close=")">
+            #{contractId}
         </foreach>
     </delete>
 </mapper>

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

@@ -31,9 +31,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectCmcContractPaymentByPaymentId" parameterType="String" resultMap="CmcContractPaymentResult">
+    <select id="selectCmcContractPaymentByContractId" parameterType="String" resultMap="CmcContractPaymentResult">
         <include refid="selectCmcContractPaymentVo"/>
-        where payment_id = #{paymentId}
+        where contract_id = #{contractId}
     </select>
         
     <insert id="insertCmcContractPayment" parameterType="CmcContractPayment">
@@ -74,14 +74,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where payment_id = #{paymentId}
     </update>
 
-    <delete id="deleteCmcContractPaymentByPaymentId" parameterType="String">
-        delete from cmc_contract_payment where payment_id = #{paymentId}
+    <delete id="deleteCmcContractPaymentByContractId" parameterType="String">
+        delete from cmc_contract_payment where contract_id = #{contractId}
     </delete>
 
-    <delete id="deleteCmcContractPaymentByPaymentIds" parameterType="String">
-        delete from cmc_contract_payment where payment_id in 
-        <foreach item="paymentId" collection="array" open="(" separator="," close=")">
-            #{paymentId}
+    <delete id="deleteCmcContractPaymentByContractIds" parameterType="String">
+        delete from cmc_contract_payment where contract_id in 
+        <foreach item="contractId" collection="array" open="(" separator="," close=")">
+            #{contractId}
         </foreach>
     </delete>
 </mapper>

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

@@ -33,9 +33,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectCmcContractWorkByWorkId" parameterType="String" resultMap="CmcContractWorkResult">
+    <select id="selectCmcContractWorkByContractId" parameterType="String" resultMap="CmcContractWorkResult">
         <include refid="selectCmcContractWorkVo"/>
-        where work_id = #{workId}
+        where contract_id = #{contractId}
     </select>
         
     <insert id="insertCmcContractWork" parameterType="CmcContractWork">
@@ -79,14 +79,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where work_id = #{workId}
     </update>
 
-    <delete id="deleteCmcContractWorkByWorkId" parameterType="String">
-        delete from cmc_contract_work where work_id = #{workId}
+    <delete id="deleteCmcContractWorkByContractId" parameterType="String">
+        delete from cmc_contract_work where contract_id = #{contractId}
     </delete>
 
-    <delete id="deleteCmcContractWorkByWorkIds" parameterType="String">
-        delete from cmc_contract_work where work_id in 
-        <foreach item="workId" collection="array" open="(" separator="," close=")">
-            #{workId}
+    <delete id="deleteCmcContractWorkByContractIds" parameterType="String">
+        delete from cmc_contract_work where contract_id in 
+        <foreach item="contractId" collection="array" open="(" separator="," close=")">
+            #{contractId}
         </foreach>
     </delete>
 </mapper>

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

@@ -18,7 +18,11 @@ 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"    />
+        <result property="managerComment"    column="manager_comment"    />
+        <result property="managerUserId"    column="manager_user_id"    />
+        <result property="managerTime"    column="manager_time"    />
         <association property="draftUser"    javaType="SysUser"         resultMap="DraftUserResult" />
+        <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="DraftUserResult">
@@ -26,10 +30,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nickName"    column="draft_nick_name"    />
     </resultMap>
 
+    <resultMap type="SysUser" id="ManagerUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="manager_nick_name"    />
+    </resultMap>
+
     <sql id="selectCmcSubContractVo">
         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
+               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
     </sql>
 
     <select id="selectCmcSubContractList" parameterType="CmcSubContract" resultMap="CmcSubContractResult">
@@ -70,6 +80,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="signRemark != null">sign_remark,</if>
             <if test="signScan != null">sign_scan,</if>
             <if test="commentType != null">comment_type,</if>
+            <if test="managerComment != null">manager_comment,</if>
+            <if test="managerUserId != null">manager_user_id,</if>
+            <if test="managerTime != null">manager_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="subContractId != null">#{subContractId},</if>
@@ -85,6 +98,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="signRemark != null">#{signRemark},</if>
             <if test="signScan != null">#{signScan},</if>
             <if test="commentType != null">#{commentType},</if>
+            <if test="managerComment != null">#{managerComment},</if>
+            <if test="managerUserId != null">#{managerUserId},</if>
+            <if test="managerTime != null">#{managerTime},</if>
          </trim>
     </insert>
 
@@ -103,6 +119,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="signRemark != null">sign_remark = #{signRemark},</if>
             <if test="signScan != null">sign_scan = #{signScan},</if>
             <if test="commentType != null">comment_type = #{commentType},</if>
+            <if test="managerComment != null">manager_comment = #{managerComment},</if>
+            <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
+            <if test="managerTime != null">manager_time = #{managerTime},</if>
         </trim>
         where sub_contract_id = #{subContractId}
     </update>

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

@@ -10,9 +10,9 @@ export function listContractComment(query) {
 }
 
 // 查询cmc合同意见详细
-export function getContractComment(commentId) {
+export function getContractComment(contractId) {
   return request({
-    url: '/oa/contractComment/' + commentId,
+    url: '/oa/contractComment/' + contractId,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateContractComment(data) {
 }
 
 // 删除cmc合同意见
-export function delContractComment(commentId) {
+export function delContractComment(contractId) {
   return request({
-    url: '/oa/contractComment/' + commentId,
+    url: '/oa/contractComment/' + contractId,
     method: 'delete'
   })
 }

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

@@ -10,9 +10,9 @@ export function listContractMeeting(query) {
 }
 
 // 查询cmc合同会审详细
-export function getContractMeeting(meetingId) {
+export function getContractMeeting(contractId) {
   return request({
-    url: '/oa/contractMeeting/' + meetingId,
+    url: '/oa/contractMeeting/' + contractId,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateContractMeeting(data) {
 }
 
 // 删除cmc合同会审
-export function delContractMeeting(meetingId) {
+export function delContractMeeting(contractId) {
   return request({
-    url: '/oa/contractMeeting/' + meetingId,
+    url: '/oa/contractMeeting/' + contractId,
     method: 'delete'
   })
 }

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

@@ -10,9 +10,9 @@ export function listContractPayment(query) {
 }
 
 // 查询cmc合同回款详细
-export function getContractPayment(paymentId) {
+export function getContractPayment(contractId) {
   return request({
-    url: '/oa/contractPayment/' + paymentId,
+    url: '/oa/contractPayment/' + contractId,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateContractPayment(data) {
 }
 
 // 删除cmc合同回款
-export function delContractPayment(paymentId) {
+export function delContractPayment(contractId) {
   return request({
-    url: '/oa/contractPayment/' + paymentId,
+    url: '/oa/contractPayment/' + contractId,
     method: 'delete'
   })
 }

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

@@ -10,9 +10,9 @@ export function listContractWork(query) {
 }
 
 // 查询cmc合同内容详细
-export function getContractWork(workId) {
+export function getContractWork(contractId) {
   return request({
-    url: '/oa/contractWork/' + workId,
+    url: '/oa/contractWork/' + contractId,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateContractWork(data) {
 }
 
 // 删除cmc合同内容
-export function delContractWork(workId) {
+export function delContractWork(contractId) {
   return request({
-    url: '/oa/contractWork/' + workId,
+    url: '/oa/contractWork/' + contractId,
     method: 'delete'
   })
 }

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

@@ -1,3 +1,9 @@
+/*
+ * @Author: wrh
+ * @Date: 2024-04-19 09:22:00
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-24 14:16:38
+ */
 import request from '@/utils/request'
 
 // 查询cmc项目合同列表

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

@@ -24,30 +24,30 @@
           </el-form-item>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="合同编码" prop="contractId">
-                <el-input v-model="form.contractId" :disabled="true"></el-input>
+              <el-form-item label="合同编码" prop="contractCode">
+                <el-input v-model="form.contractCode" :disabled="true"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="合同编号" prop="contractNumber">
-                <el-input v-model="form.contractNumber" placeholder="请输入合同编号"></el-input>
+                <el-input v-model="form.contractNumber" placeholder="请输入合同编号" :disabled="taskName != '合同拟稿'"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
               <el-form-item label="合同金额" prop="amount">
-                <el-input v-model="form.amount" placeholder="请输入合同金额" />
+                <el-input v-model="form.amount" placeholder="请输入合同金额" :disabled="taskName != '合同拟稿'" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="履约保证金" prop="deposit">
-                <el-input v-model="form.deposit" placeholder="请输入履约保证金" />
+                <el-input v-model="form.deposit" placeholder="请输入履约保证金" :disabled="taskName != '合同拟稿'" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-form-item label="合同文件" prop="contractDocument">
-            <el-input v-model="form.contractDocument" placeholder="请输入合同文件" />
+            <el-input v-model="form.contractDocument" placeholder="请输入合同文件" :disabled="taskName != '合同拟稿'" />
           </el-form-item>
           <el-form-item label="合同计划工作量：">
             <table border="1">
@@ -65,26 +65,26 @@
                   {{ index + 1 }}
                 </td>
                 <td>
-                  <el-input v-model="work.content" type="textarea" clearable
-                    :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
+                  <el-input v-model="work.content" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"
+                    :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
-                  <el-input v-model="work.scale" clearable></el-input>
+                  <el-input v-model="work.scale" clearable :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
-                  <el-input v-model="work.unit" clearable></el-input>
+                  <el-input v-model="work.unit" clearable :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
-                  <el-input v-model="work.workload" clearable></el-input>
+                  <el-input v-model="work.workload" clearable :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
                   <el-date-picker style="width: 140px" v-model="work.deadline" value-format="yyyy-MM-dd" type="date"
-                    placeholder="选择日期">
+                    placeholder="选择日期" :disabled="taskName != '合同拟稿'">
                   </el-date-picker>
                 </td>
                 <td>
-                  <el-input v-model="work.remark" type="textarea" clearable
-                    :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
+                  <el-input v-model="work.remark" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"
+                    :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
                   <el-button type="danger" icon="el-icon-minus" size="mini" circle
@@ -110,22 +110,22 @@
                 </td>
                 <td>
                   <el-input v-model="payment.paymentCondition" type="textarea" clearable
-                    :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
+                    :autosize="{ minRows: 4, maxRows: 10 }" :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
-                  <el-input v-model="payment.paymentPercentage" clearable></el-input>
+                  <el-input v-model="payment.paymentPercentage" clearable :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
-                  <el-input v-model="payment.paymentAmount" clearable></el-input>
+                  <el-input v-model="payment.paymentAmount" clearable :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
                   <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd" type="date"
-                    placeholder="选择日期">
+                    placeholder="选择日期" :disabled="taskName != '合同拟稿'">
                   </el-date-picker>
                 </td>
                 <td>
-                  <el-input v-model="payment.remark" type="textarea" clearable
-                    :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
+                  <el-input v-model="payment.remark" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"
+                    :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
                   <el-button type="danger" icon="el-icon-minus" size="mini" circle
@@ -152,7 +152,7 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="评审方式" prop="commentType">
-            <el-radio-group v-model="form.commentType" @change="changeCommentType">
+            <el-radio-group v-model="form.commentType" @change="changeCommentType" :disabled="taskName != '合同拟稿'">
               <el-radio :label="0">无须评审</el-radio>
               <el-radio :label="1">会议评审</el-radio>
               <el-radio :label="2">线上评审</el-radio>
@@ -174,13 +174,15 @@
                   {{ index + 1 }}
                 </td>
                 <td>
-                  <el-select v-model="comment.deptId" clearable style="width:120px" :disabled="index < 4" @change="getDeptLeader">
+                  <el-select v-model="comment.deptId" clearable style="width:120px"
+                    :disabled="(index < 4 && taskName == '合同拟稿') || taskName != '合同拟稿'" @change="getDeptLeader">
                     <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
                     </el-option>
                   </el-select>
                 </td>
                 <td>
-                  <el-select v-model="comment.userId" clearable style="width:120px" :disabled="index < 4">
+                  <el-select v-model="comment.userId" clearable style="width:120px"
+                    :disabled="(index < 4 && taskName == '合同拟稿') || taskName != '合同拟稿'">
                     <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
                     </el-option>
                   </el-select>
@@ -266,12 +268,12 @@
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px">
+              <el-form-item label="签名：" label-width="120px" v-if="taskName == '分管审核'">
                 <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : managerUser }} </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px">
+              <el-form-item label="日期：" label-width="120px" v-if="taskName == '分管审核'">
                 <span> {{ form.managerTime ? form.managerTime : managerTime }} </span>
               </el-form-item>
             </el-col>
@@ -288,7 +290,7 @@
             <el-input v-model="form.signScan" placeholder="请输入签订扫描件" />
           </el-form-item>
         </el-form>
-        <div slot="footer" class="dialog-footer">
+        <div style="text-align: center;">
           <el-button type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
@@ -310,10 +312,10 @@ import { parseTime } from "@/utils/ruoyi";
 import { listDept } from '@/api/system/dept'
 import { listUser } from '@/api/system/user'
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
-import { getContractWork } from "@/api/oa/contract/contractWork";
-import { getContractPayment } from "@/api/oa/contract/contractPayment";
-import { getContractComment } from "@/api/oa/contract/contractComment";
-import { getContractMeeting } from "@/api/oa/contract/contractMeeting";
+import { getContractWork, addContractWork } from "@/api/oa/contract/contractWork";
+import { getContractPayment, addContractPayment } from "@/api/oa/contract/contractPayment";
+import { getContractComment, addContractComment } from "@/api/oa/contract/contractComment";
+import { getContractMeeting, addContractMeeting } from "@/api/oa/contract/contractMeeting";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
 import { listTender, getTender } from "@/api/oa/tender/tender";
 import { getUsersDeptLeader, getUsersManageLeader, getUsersDeptLeaderByDept } from '@/api/system/post.js'
@@ -385,8 +387,21 @@ export default {
       commentOpen: false,
       deptList: [],
       userList: [],
-      workList: [],
-      paymentList: [],
+      workList: [{
+        content: "",
+        scale: "",
+        unit: "",
+        workload: "",
+        deadline: undefined,
+        remark: "",
+      }],
+      paymentList: [{
+        paymentCondition: "",
+        paymentPercentage: "",
+        paymentAmount: "",
+        paymentTime: undefined,
+        remark: "",
+      }],
       placeList: [{ id: 0, name: '301会议室' }, { id: 1, name: '216会议室' }],
       commentList: [
         {
@@ -452,12 +467,13 @@ export default {
         if (this.isEmptyObject(res.data)) {
           this.formTotal = 0;
           this.form.drafter = this.$store.getters.userId;
+          this.form.draftTime = parseTime(new Date(), '{y}-{m}-{d}');
         }
         else {
           this.formTotal = 1;
           this.form = res.data;
-          if (data.tenderId) {
-            getTender(data.tenderId).then(response => {
+          if (res.data.tenderId) {
+            getTender(res.data.tenderId).then(response => {
               this.chooseTender = response.data;
               this.isSelect = true
             })
@@ -516,7 +532,7 @@ export default {
         getTender(val).then(res => {
           this.chooseTender = res.data;
           this.isSelect = true;
-          this.getContractId(this.chooseTender)
+          this.getContractCode(this.chooseTender)
         })
       } else {
         this.isSelect = false
@@ -539,25 +555,25 @@ export default {
       let partyAList = ['中国电建集团成都勘测设计研究院勘测设计分公司', '成勘院 水环境与城建工程分公司'];
       return partyAList.indexOf(chooseTender.partyA) != -1 ? '院内' : '院外';
     },
-    getContractId(chooseTender) {
-      let contractId = '';
+    getContractCode(chooseTender) {
+      let contractCode = '';
       if (chooseTender) {
         if (this.getProjectSource(chooseTender) == '院内') {
-          listContract({ contractId: 'C' }).then(res => {
+          listContract({ contractCode: 'C' }).then(res => {
             if (res.total == 0)
-              contractId = 'HT' + new Date().getFullYear() + 'C' + '001';
+              contractCode = 'HT' + new Date().getFullYear() + 'C' + '001';
             else
-              contractId = 'HT' + new Date().getFullYear() + 'C' + this.fillZero(Number(res.rows[0].contractId.substring(7, 10)) + 1);
-            this.$set(this.form, 'contractId', contractId);
+              contractCode = 'HT' + new Date().getFullYear() + 'C' + this.fillZero(Number(res.rows[0].contractCode.substring(7, 10)) + 1);
+            this.$set(this.form, 'contractCode', contractCode);
           })
         }
         else {
-          listContract({ contractId: 'W' }).then(res => {
+          listContract({ contractCode: 'W' }).then(res => {
             if (res.total == 0)
-              contractId = 'HT' + new Date().getFullYear() + 'W' + '001';
+              contractCode = 'HT' + new Date().getFullYear() + 'W' + '001';
             else
-              contractId = 'HT' + new Date().getFullYear() + 'W' + this.fillZero(Number(res.rows[0].contractId.substring(7, 10)) + 1);
-            this.$set(this.form, 'contractId', contractId);
+              contractCode = 'HT' + new Date().getFullYear() + 'W' + this.fillZero(Number(res.rows[0].contractCode.substring(7, 10)) + 1);
+            this.$set(this.form, 'contractCode', contractCode);
           })
         }
       }
@@ -645,19 +661,20 @@ export default {
           })
         }
       }
-    },    
+    },
     getDeptLeader(val) {
-        getUsersDeptLeaderByDept({ deptId: Number(val) }).then(res => {
-          for(let comment of this.commentList) {
-            if (comment.deptId == val)
-              comment.userId = res.data.userId;
-          }
-        })
+      getUsersDeptLeaderByDept({ deptId: Number(val) }).then(res => {
+        for (let comment of this.commentList) {
+          if (comment.deptId == val)
+            comment.userId = res.data.userId;
+        }
+      })
     },
     // 表单重置
     reset() {
       this.form = {
         contractId: null,
+        contractCode: null,
         contractNumber: null,
         amount: null,
         deposit: null,
@@ -721,16 +738,51 @@ export default {
               this.open = false;
               this.getList();
             });
+            for (let work of this.workList) {
+              work.contractId = this.form.contractId
+              addContractWork(work);
+            }
+            for (let payment of this.paymentList) {
+              payment.contractId = this.form.contractId
+              addContractPayment(payment);
+            }
             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);
+              if (this.commentOpen == false && this.meetingOpen == false) {
+                getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
+                  let userId = res.data.userId;
+                  this.$set(this.taskForm.variables, "approval", userId);
+                  this.$set(this.taskForm.variables, "commentType", 0);
+                  complete(this.taskForm).then(response => {
+                    this.$modal.msgSuccess(response.msg);
+                    this.$emit('goBack')
+                  });
+                })
+              }
+              else if (this.commentOpen == true && this.meetingOpen == false) {
+                let approvalList = [];
+                for (let commment of this.commentList) {
+                  commment.contractId = this.form.contractId
+                  addContractComment(commment);
+                  approvalList.push(commment.userId)
+                }
+                this.$set(this.taskForm.variables, "approvalList", approvalList);
+                this.$set(this.taskForm.variables, "commentType", 2);
+                complete(this.taskForm).then(response => {
+                  this.$modal.msgSuccess(response.msg);
+                  this.$emit('goBack')
+                });
+              }
+              else if (this.commentOpen == false && this.meetingOpen == true) {
+                this.meetingForm.contractId = this.form.contractId;
+                addContractMeeting(this.meetingForm);
+                this.$set(this.taskForm.variables, "approval", this.meetingForm.hostId);
+                this.$set(this.taskForm.variables, "commentType", 1);
                 complete(this.taskForm).then(response => {
                   this.$modal.msgSuccess(response.msg);
                   this.$emit('goBack')
                 });
-              })
+              }
             })
           }
         }