党工团借款

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

@@ -100,6 +100,10 @@ public class CmcBorrowController extends BaseController
             cmcBorrow.setZjlUserId(getLoginUser().getUserId());
             cmcBorrow.setZjlTime(new Date());
         }
+        if (cmcBorrow.getUnionComment() != null && cmcBorrow.getCwComment() == null) {
+            cmcBorrow.setUnionUserId(getLoginUser().getUserId());
+            cmcBorrow.setUnionTime(new Date());
+        }
         if (cmcBorrow.getLendTime() != null) {
             cmcBorrow.setCwUserId(getLoginUser().getUserId());
         }

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

@@ -57,6 +57,8 @@ public class CmcBorrow extends BaseEntity
 
     private SysUser zjlUser;
 
+    private SysUser unionUser;
+
     private SysUser cwUser;
 
     /** 借款日期 */
@@ -104,6 +106,14 @@ public class CmcBorrow extends BaseEntity
     @Excel(name = "总经理审批意见")
     private String zjlComment;
 
+    /** 工会审批人 */
+    @Excel(name = "工会审批人")
+    private Long unionUserId;
+
+    /** 工会审批意见 */
+    @Excel(name = "工会审批意见")
+    private String unionComment;
+
     /** 财务部经办人 */
     @Excel(name = "财务部经办人")
     private Long cwUserId;
@@ -132,6 +142,11 @@ public class CmcBorrow extends BaseEntity
     @Excel(name = "总经理审批时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date zjlTime;
 
+    /** 工会审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "工会审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date unionTime;
+
     /** 借款支付时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "借款支付时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -254,6 +269,15 @@ public class CmcBorrow extends BaseEntity
     {
         return zjlUser;
     }
+    public void setUnionUser(SysUser unionUser)
+    {
+        this.unionUser = unionUser;
+    }
+
+    public SysUser getUnionUser()
+    {
+        return unionUser;
+    }
     public void setCwUser(SysUser cwUser)
     {
         this.cwUser = cwUser;
@@ -362,6 +386,24 @@ public class CmcBorrow extends BaseEntity
     {
         return zjlComment;
     }
+    public void setUnionUserId(Long unionUserId)
+    {
+        this.unionUserId = unionUserId;
+    }
+
+    public Long getUnionUserId()
+    {
+        return unionUserId;
+    }
+    public void setUnionComment(String unionComment)
+    {
+        this.unionComment = unionComment;
+    }
+
+    public String getUnionComment()
+    {
+        return unionComment;
+    }
     public void setCwUserId(Long cwUserId) 
     {
         this.cwUserId = cwUserId;
@@ -416,12 +458,21 @@ public class CmcBorrow extends BaseEntity
     {
         return zjlTime;
     }
-    public void setLendTime(Date lendTime) 
+    public void setUnionTime(Date unionTime)
+    {
+        this.unionTime = unionTime;
+    }
+
+    public Date getUnionTime()
+    {
+        return unionTime;
+    }
+    public void setLendTime(Date lendTime)
     {
         this.lendTime = lendTime;
     }
 
-    public Date getLendTime() 
+    public Date getLendTime()
     {
         return lendTime;
     }
@@ -445,12 +496,15 @@ public class CmcBorrow extends BaseEntity
             .append("managerUserId", getManagerUserId())
             .append("zjlUserId", getZjlUserId())
             .append("zjlComment", getZjlComment())
+            .append("unionUserId", getUnionUserId())
+            .append("unionComment", getUnionComment())
             .append("cwUserId", getCwUserId())
             .append("cwComment", getCwComment())
             .append("deptTime", getDeptTime())
             .append("xmTime", getXmTime())
             .append("managerTime", getManagerTime())
             .append("zjlTime", getZjlTime())
+            .append("unionTime", getUnionTime())
             .append("lendTime", getLendTime())
             .toString();
     }

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

@@ -25,10 +25,6 @@ public class CmcContractComment extends BaseEntity
     @Excel(name = "合同id")
     private String contractId;
 
-    /** 分包合同id */
-    @Excel(name = "分包合同id")
-    private String subContractId;
-
     /** 会审部门 */
     @Excel(name = "会审部门")
     private Long deptId;
@@ -70,15 +66,6 @@ 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,10 +24,6 @@ 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")
@@ -76,15 +72,6 @@ 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/CmcContractPayment.java

@@ -24,10 +24,6 @@ public class CmcContractPayment extends BaseEntity
     @Excel(name = "合同id")
     private String contractId;
 
-    /** 分包合同id */
-    @Excel(name = "分包合同id")
-    private String subContractId;
-
     /** 回款条件 */
     @Excel(name = "回款条件")
     private String paymentCondition;
@@ -63,15 +59,6 @@ public class CmcContractPayment extends BaseEntity
     {
         return contractId;
     }
-    public void setSubContractId(String subContractId) 
-    {
-        this.subContractId = subContractId;
-    }
-
-    public String getSubContractId() 
-    {
-        return subContractId;
-    }
     public void setPaymentCondition(String paymentCondition) 
     {
         this.paymentCondition = paymentCondition;
@@ -114,7 +101,6 @@ public class CmcContractPayment extends BaseEntity
         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())

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

@@ -24,10 +24,6 @@ public class CmcContractWork extends BaseEntity
     @Excel(name = "合同id")
     private String contractId;
 
-    /** 分包合同id */
-    @Excel(name = "分包合同id")
-    private String subContractId;
-
     /** 工作内容 */
     @Excel(name = "工作内容")
     private String content;
@@ -67,15 +63,6 @@ public class CmcContractWork extends BaseEntity
     {
         return contractId;
     }
-    public void setSubContractId(String subContractId) 
-    {
-        this.subContractId = subContractId;
-    }
-
-    public String getSubContractId() 
-    {
-        return subContractId;
-    }
     public void setContent(String content) 
     {
         this.content = content;
@@ -127,7 +114,6 @@ public class CmcContractWork extends BaseEntity
         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())

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

@@ -23,6 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="managerUserId"    column="manager_user_id"    />
         <result property="zjlUserId"    column="zjl_user_id"    />
         <result property="zjlComment"    column="zjl_comment"    />
+        <result property="unionUserId"    column="union_user_id"    />
+        <result property="unionComment"    column="union_comment"    />
         <result property="cwUserId"    column="cw_user_id"    />
         <result property="cwComment"    column="cw_comment"    />
         <result property="deptTime"    column="dept_time"    />
@@ -30,11 +32,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="managerTime"    column="manager_time"    />
         <result property="zjlTime"    column="zjl_time"    />
         <result property="lendTime"    column="lend_time"    />
+        <result property="unionTime"    column="union_time"    />
         <association property="applierUser"    javaType="SysUser"         resultMap="ApplierUserResult" />
         <association property="deptUser"    javaType="SysUser"         resultMap="DeptUserResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
         <association property="xmUser"    javaType="SysUser"         resultMap="XmUserResult" />
         <association property="zjlUser"    javaType="SysUser"         resultMap="ZjlUserResult" />
+        <association property="unionUser"    javaType="SysUser"         resultMap="UnionUserResult" />
         <association property="cwUser"    javaType="SysUser"         resultMap="CwUserResult" />
         <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
@@ -65,6 +69,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nickName"    column="zjl_nick_name"    />
     </resultMap>
 
+    <resultMap type="SysUser" id="UnionUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="union_nick_name"    />
+    </resultMap>
+
     <resultMap type="SysUser" id="CwUserResult">
         <result property="userId"    column="user_id"    />
         <result property="nickName"    column="cw_nick_name"    />
@@ -84,14 +93,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <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, b.remark, b.borrow_usage,
                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
+               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.union_user_id, u5.nick_name as zjl_nick_name,
+               b.union_comment, b.cw_user_id, u6.nick_name as cw_nick_name, b.cw_comment, b.dept_time, b.xm_time, b.manager_time, b.zjl_time, b.lend_time, b.union_time from cmc_borrow as b
         left join sys_user as u on u.user_id = b.applier
         left join sys_user as u1 on u1.user_id = b.dept_user_id
         left join sys_user as u2 on u2.user_id = b.xm_user_id
         left join sys_user as u3 on u3.user_id = b.manager_user_id
         left join sys_user as u4 on u4.user_id = b.zjl_user_id
-        left join sys_user as u5 on u5.user_id = b.cw_user_id
+        left join sys_user as u5 on u5.user_id = b.union_user_id
+        left join sys_user as u6 on u6.user_id = b.cw_user_id
         left join sys_dept as d on d.dept_id = b.apply_dept
         left join cmc_project as p on b.project_id = p.project_id
     </sql>
@@ -116,6 +126,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerUserId != null "> and b.manager_user_id = #{managerUserId}</if>
             <if test="zjlUserId != null "> and b.zjl_user_id = #{zjlUserId}</if>
             <if test="zjlComment != null  and zjlComment != ''"> and b.zjl_comment = #{zjlComment}</if>
+            <if test="unionUserId != null "> and b.union_user_id = #{unionUserId}</if>
+            <if test="unionComment != null  and unionComment != ''"> and b.union_comment = #{unionComment}</if>
             <if test="cwUserId != null "> and b.cw_user_id = #{cwUserId}</if>
             <if test="cwComment != null  and cwComment != ''"> and b.cw_comment = #{cwComment}</if>
             <if test="deptTime != null "> and b.dept_time = #{deptTime}</if>
@@ -123,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerTime != null "> and b.manager_time = #{managerTime}</if>
             <if test="zjlTime != null "> and b.zjl_time = #{zjlTime}</if>
             <if test="lendTime != null "> and b.lend_time = #{lendTime}</if>
+            <if test="unionTime != null "> and b.union_time = #{unionTime}</if>
         </where>
     </select>
     
@@ -152,6 +165,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerUserId != null">manager_user_id,</if>
             <if test="zjlUserId != null">zjl_user_id,</if>
             <if test="zjlComment != null">zjl_comment,</if>
+            <if test="unionUserId != null">union_user_id,</if>
+            <if test="unionComment != null">union_comment,</if>
             <if test="cwUserId != null">cw_user_id,</if>
             <if test="cwComment != null">cw_comment,</if>
             <if test="deptTime != null">dept_time,</if>
@@ -159,6 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerTime != null">manager_time,</if>
             <if test="zjlTime != null">zjl_time,</if>
             <if test="lendTime != null">lend_time,</if>
+            <if test="unionTime != null">union_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="borrowId != null">#{borrowId},</if>
@@ -179,12 +195,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerUserId != null">#{managerUserId},</if>
             <if test="zjlUserId != null">#{zjlUserId},</if>
             <if test="zjlComment != null">#{zjlComment},</if>
+            <if test="unionUserId != null">#{unionUserId},</if>
+            <if test="unionComment != null">#{unionComment},</if>
             <if test="cwUserId != null">#{cwUserId},</if>
             <if test="cwComment != null">#{cwComment},</if>
             <if test="deptTime != null">#{deptTime},</if>
             <if test="xmTime != null">#{xmTime},</if>
             <if test="managerTime != null">#{managerTime},</if>
             <if test="zjlTime != null">#{zjlTime},</if>
+            <if test="unionTime != null">#{unionTime},</if>
             <if test="lendTime != null">#{lendTime},</if>
          </trim>
     </insert>
@@ -209,12 +228,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
             <if test="zjlUserId != null">zjl_user_id = #{zjlUserId},</if>
             <if test="zjlComment != null">zjl_comment = #{zjlComment},</if>
+            <if test="unionUserId != null">union_user_id = #{unionUserId},</if>
+            <if test="unionComment != null">zjl_comment = #{unionComment},</if>
             <if test="cwUserId != null">cw_user_id = #{cwUserId},</if>
             <if test="cwComment != null">cw_comment = #{cwComment},</if>
             <if test="deptTime != null">dept_time = #{deptTime},</if>
             <if test="xmTime != null">xm_time = #{xmTime},</if>
             <if test="managerTime != null">manager_time = #{managerTime},</if>
             <if test="zjlTime != null">zjl_time = #{zjlTime},</if>
+            <if test="unionTime != null">union_time = #{unionTime},</if>
             <if test="lendTime != null">lend_time = #{lendTime},</if>
         </trim>
         where borrow_id = #{borrowId}

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

@@ -7,7 +7,6 @@ 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"    />
@@ -22,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcContractCommentVo">
-        select cc.comment_id, cc.contract_id, cc.sub_contract_id, cc.dept_id, cc.user_id, u.nick_name, cc.comment, cc.document, cc.comment_time from cmc_contract_comment as cc
+        select cc.comment_id, cc.contract_id, cc.dept_id, cc.user_id, u.nick_name, cc.comment, cc.document, cc.comment_time from cmc_contract_comment as cc
         left join sys_user as u on u.user_id = cc.user_id
     </sql>
 
@@ -48,7 +47,6 @@ 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>
@@ -58,7 +56,6 @@ 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>
@@ -71,7 +68,6 @@ 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>

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

@@ -7,7 +7,6 @@
     <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"    />
@@ -18,7 +17,7 @@
     </resultMap>
 
     <sql id="selectCmcContractMeetingVo">
-        select meeting_id, contract_id, sub_contract_id, meeting_time, host_id, place, users, conclusion, document, comment_time from cmc_contract_meeting
+        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">
@@ -45,7 +44,6 @@
         <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>
@@ -57,7 +55,6 @@
         <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>
@@ -72,7 +69,6 @@
         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>

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

@@ -7,7 +7,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcContractPayment" id="CmcContractPaymentResult">
         <result property="paymentId"    column="payment_id"    />
         <result property="contractId"    column="contract_id"    />
-        <result property="subContractId"    column="sub_contract_id"    />
         <result property="paymentCondition"    column="payment_condition"    />
         <result property="paymentPercentage"    column="payment_percentage"    />
         <result property="paymentAmount"    column="payment_amount"    />
@@ -16,14 +15,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcContractPaymentVo">
-        select payment_id, contract_id, sub_contract_id, payment_condition, payment_percentage, payment_amount, payment_time, remark from cmc_contract_payment
+        select payment_id, contract_id, payment_condition, payment_percentage, payment_amount, payment_time, remark from cmc_contract_payment
     </sql>
 
     <select id="selectCmcContractPaymentList" parameterType="CmcContractPayment" resultMap="CmcContractPaymentResult">
         <include refid="selectCmcContractPaymentVo"/>
         <where>  
             <if test="contractId != null  and contractId != ''"> and contract_id = #{contractId}</if>
-            <if test="subContractId != null  and subContractId != ''"> and sub_contract_id = #{subContractId}</if>
             <if test="paymentCondition != null  and paymentCondition != ''"> and payment_condition = #{paymentCondition}</if>
             <if test="paymentPercentage != null  and paymentPercentage != ''"> and payment_percentage = #{paymentPercentage}</if>
             <if test="paymentAmount != null  and paymentAmount != ''"> and payment_amount = #{paymentAmount}</if>
@@ -41,7 +39,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="paymentId != null">payment_id,</if>
             <if test="contractId != null">contract_id,</if>
-            <if test="subContractId != null">sub_contract_id,</if>
             <if test="paymentCondition != null">payment_condition,</if>
             <if test="paymentPercentage != null">payment_percentage,</if>
             <if test="paymentAmount != null">payment_amount,</if>
@@ -51,7 +48,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="paymentId != null">#{paymentId},</if>
             <if test="contractId != null">#{contractId},</if>
-            <if test="subContractId != null">#{subContractId},</if>
             <if test="paymentCondition != null">#{paymentCondition},</if>
             <if test="paymentPercentage != null">#{paymentPercentage},</if>
             <if test="paymentAmount != null">#{paymentAmount},</if>
@@ -64,7 +60,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update cmc_contract_payment
         <trim prefix="SET" suffixOverrides=",">
             <if test="contractId != null">contract_id = #{contractId},</if>
-            <if test="subContractId != null">sub_contract_id = #{subContractId},</if>
             <if test="paymentCondition != null">payment_condition = #{paymentCondition},</if>
             <if test="paymentPercentage != null">payment_percentage = #{paymentPercentage},</if>
             <if test="paymentAmount != null">payment_amount = #{paymentAmount},</if>

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

@@ -7,7 +7,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcContractWork" id="CmcContractWorkResult">
         <result property="workId"    column="work_id"    />
         <result property="contractId"    column="contract_id"    />
-        <result property="subContractId"    column="sub_contract_id"    />
         <result property="content"    column="content"    />
         <result property="scale"    column="scale"    />
         <result property="unit"    column="unit"    />
@@ -17,14 +16,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcContractWorkVo">
-        select work_id, contract_id, sub_contract_id, content, scale, unit, workload, deadline, remark from cmc_contract_work
+        select work_id, contract_id, content, scale, unit, workload, deadline, remark from cmc_contract_work
     </sql>
 
     <select id="selectCmcContractWorkList" parameterType="CmcContractWork" resultMap="CmcContractWorkResult">
         <include refid="selectCmcContractWorkVo"/>
         <where>  
             <if test="contractId != null  and contractId != ''"> and contract_id = #{contractId}</if>
-            <if test="subContractId != null  and subContractId != ''"> and sub_contract_id = #{subContractId}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="scale != null  and scale != ''"> and scale = #{scale}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
@@ -43,7 +41,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="workId != null">work_id,</if>
             <if test="contractId != null">contract_id,</if>
-            <if test="subContractId != null">sub_contract_id,</if>
             <if test="content != null">content,</if>
             <if test="scale != null">scale,</if>
             <if test="unit != null">unit,</if>
@@ -54,7 +51,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="workId != null">#{workId},</if>
             <if test="contractId != null">#{contractId},</if>
-            <if test="subContractId != null">#{subContractId},</if>
             <if test="content != null">#{content},</if>
             <if test="scale != null">#{scale},</if>
             <if test="unit != null">#{unit},</if>
@@ -68,7 +64,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update cmc_contract_work
         <trim prefix="SET" suffixOverrides=",">
             <if test="contractId != null">contract_id = #{contractId},</if>
-            <if test="subContractId != null">sub_contract_id = #{subContractId},</if>
             <if test="content != null">content = #{content},</if>
             <if test="scale != null">scale = #{scale},</if>
             <if test="unit != null">unit = #{unit},</if>

oa-back/sql/sql.sql

@@ -3084,7 +3084,6 @@ drop table if exists `cmc_contract_comment`;
 create table `cmc_contract_comment`  (
   `comment_id` 		char(19)  		not null 	 comment '合同会审意见id',
   `contract_id` 	char(19)  		default null comment '合同id',
-  `sub_contract_id` char(19)  		default null comment '分包合同id',
   `dept_id` 		bigint  		default null comment '会审部门',
   `user_id` 		bigint 			default null comment '会审人',
   `comment` 		varchar(255)  	default null comment '会审意见',
@@ -3104,7 +3103,6 @@ drop table if exists `cmc_contract_meeting`;
 create table `cmc_contract_meeting`  (
   `meeting_id` 		char(19)  		not null 	 comment '合同会审id',
   `contract_id` 	char(19)  		default null comment '合同id',
-  `sub_contract_id` char(19)  		default null comment '分包合同id',
   `meeting_time` 	date  			default null comment '评审时间',
   `host_id` 		bigint 			default null comment '评审主持人',
   `place` 			varchar(50)  	default null comment '评审地点',
@@ -3126,7 +3124,6 @@ drop table if exists `cmc_contract_payment`;
 create table `cmc_contract_payment`  (
   `payment_id` 			char(19)  		not null 	 comment '合同回款id',
   `contract_id` 		char(19)  		default null comment '合同id',
-  `sub_contract_id` 	char(19)  		default null comment '分包合同id',
   `payment_condition` 	varchar(255)  	default null comment '回款条件',
   `payment_percentage` 	varchar(5)  	default null comment '回款比例',
   `payment_amount` 		varchar(10)  	default null comment '回款金额',
@@ -3146,7 +3143,6 @@ drop table if exists `cmc_contract_work`;
 create table `cmc_contract_work`  (
   `work_id` 			char(19)  		not null 	 comment '工作内容id',
   `contract_id` 		char(19)  		default null comment '合同id',
-  `sub_contract_id` 	char(19)  		default null comment '分包合同id',
   `content` 			varchar(255)  	default null comment '工作内容',
   `scale` 				varchar(10)  	default null comment '等级或比例尺',
   `unit` 				varchar(10)  	default null comment '单位',
@@ -3778,7 +3774,7 @@ drop table if exists `cmc_borrow`;
 create table `cmc_borrow`  (
   `borrow_id` 		char(19)		not null 	comment '借款申请id',
   `project_id` 		char(19)  		default null comment '项目id',
-  `borrow_usage` 	char(1）  		default null comment '借款用途',
+  `borrow_usage` 	char(1)  		default null comment '借款用途',
   `apply_reason` 	varchar(255)  	default null comment '借款事由',
   `applier` 		bigint 			default null comment '借款人',
   `apply_dept`		bigint			default null comment '申请部门',
@@ -3794,12 +3790,15 @@ create table `cmc_borrow`  (
   `manager_user_id` bigint 			default null comment '分管审批人',
   `zjl_user_id` 	bigint 			default null comment '总经理审批人',
   `zjl_comment` 	varchar(255)  	default null comment '总经理审批意见',
+  `union_user_id` 	bigint 			default null comment '工会审批人',
+  `union_comment` 	varchar(255)  	default null comment '工会审批意见',
   `cw_user_id` 		bigint 			default null comment '财务部经办人',
   `cw_comment` 		varchar(255)  	default null comment '财务部支付备注',
   `dept_time` 		date 			default null comment '部门审批时间',
   `xm_time` 		date 			default null comment '项目部审批时间',
   `manager_time` 	date 			default null comment '分管审批时间',
   `zjl_time` 		date 			default null comment '总经理审批时间',
+  `union_time` 		date 			default null comment '工会审批时间',
   `lend_time` 		date 			default null comment '借款支付时间',
   primary key (`borrow_id`)
 ) engine = innodb comment = 'cmc借款申请表';

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

@@ -155,10 +155,10 @@
             <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>
+              <el-radio :label="'2'">线上会审</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="线上评审：" v-if="commentOpen">
+          <el-form-item label="线上会审：" v-if="commentOpen">
             <table border="1">
               <tr>
                 <td>序号</td>
@@ -188,14 +188,15 @@
                   </el-select>
                 </td>
                 <td>
-                  <el-input v-model="comment.comment" type="textarea" clearable
-                    :autosize="{ minRows: 4, maxRows: 10 }" :disabled="taskName == '合同拟稿' || !comment.commentUser"></el-input>
+                  <el-input v-model="comment.comment" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"
+                    :disabled="taskName == '合同拟稿' || !comment.commentUser"></el-input>
                 </td>
                 <td>
-                  <el-input v-model="comment.document" clearable :disabled="taskName == '合同拟稿' || !comment.commentUser"></el-input>
+                  <el-input v-model="comment.document" clearable
+                    :disabled="taskName == '合同拟稿' || !comment.commentUser"></el-input>
                 </td>
                 <td>
-                  <span class="auditor"> {{ comment.commentUser ? comment.commentUser.nickName : commentUser }} </span>
+                  <span class="auditor"> {{ comment.commentUser ? comment.commentUser.nickName : '' }} </span>
                 </td>
                 <td>
                   <span> {{ comment.commentTime }} </span>
@@ -314,7 +315,7 @@ import { listUser } from '@/api/system/user'
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
 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 { getContractComment, addContractComment, delContractComment } 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";
@@ -506,7 +507,6 @@ export default {
               else
                 comment.commentTime = parseTime(new Date(), '{y}-{m}-{d}');
             }
-            console.log(this.commentList);
           });
           getContractMeeting(this.taskForm.formId).then(res => {
             if (res.data)
@@ -749,6 +749,42 @@ export default {
               this.open = false;
               this.getList();
             });
+            const params = { taskId: this.taskForm.taskId };
+            getNextFlowNode(params).then(res => {
+              updateContract(this.form);
+              if (this.taskName == '分管审核') {
+                complete(this.taskForm).then(response => {
+                  this.$modal.msgSuccess(response.msg);
+                  this.$emit('goBack')
+                });
+              }
+              else if (this.taskName == '线上会审') {
+                delContractComment([this.form.contractId]).then(res => {
+                  for (let comment of this.commentList) {
+                    commment.contractId = this.form.contractId
+                    addContractComment(comment);
+                  }
+                })
+                getUsersManageLeader({ userId: this.form.drafter }).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')
+                  });
+                })
+              }
+              else if (this.taskName == '会议评审') {
+                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')
+                });
+              }
+            })
           } else {
             this.form.contractId = this.taskForm.formId;
             addContract(this.form).then(response => {