增加借款用途、申请人说明

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

@@ -33,6 +33,10 @@ public class CmcBorrow extends BaseEntity
     @Excel(name = "借款事由")
     private String applyReason;
 
+    /** 借款用途 */
+    @Excel(name = "借款用途")
+    private String borrowUsage;
+
     /** 借款部门 */
     @Excel(name = "借款部门")
     private Long applyDept;
@@ -169,6 +173,15 @@ public class CmcBorrow extends BaseEntity
     {
         return applyReason;
     }
+    public void setBorrowUsage(String borrowUsage)
+    {
+        this.borrowUsage = borrowUsage;
+    }
+
+    public String getBorrowUsage()
+    {
+        return borrowUsage;
+    }
     public void setApplyDept(Long applyDept)
     {
         this.applyDept = applyDept;

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

@@ -2,6 +2,7 @@ package com.ruoyi.oa.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -36,6 +37,8 @@ public class CmcContractComment extends BaseEntity
     @Excel(name = "会审人")
     private Long userId;
 
+    private SysUser commentUser;
+
     /** 会审意见 */
     @Excel(name = "会审意见")
     private String comment;
@@ -94,6 +97,15 @@ public class CmcContractComment extends BaseEntity
     {
         return userId;
     }
+    public void setCommentUser(SysUser commentUser)
+    {
+        this.commentUser = commentUser;
+    }
+
+    public SysUser getCommentUser()
+    {
+        return commentUser;
+    }
     public void setComment(String comment)
     {
         this.comment = comment;

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

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="borrowId"    column="borrow_id"    />
         <result property="projectId"    column="project_id"    />
         <result property="applyReason"    column="apply_reason"    />
+        <result property="borrowUsage"    column="borrow_usage"    />
         <result property="applier"    column="applier"    />
         <result property="applyDept"    column="apply_dept"    />
         <result property="applyDate"    column="apply_date"    />
@@ -81,7 +82,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, b.remark,
+        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
@@ -100,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="projectId != null  and projectId != ''"> and b.project_id = #{projectId}</if>
             <if test="applyReason != null  and applyReason != ''"> and b.apply_reason = #{applyReason}</if>
+            <if test="borrowUsage != null  and borrowUsage != ''"> and b.borrow_usage = #{borrowUsage}</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>
@@ -135,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="borrowId != null">borrow_id,</if>
             <if test="projectId != null">project_id,</if>
             <if test="applyReason != null">apply_reason,</if>
+            <if test="borrowUsage != null">borrow_usage,</if>
             <if test="applier != null">applier,</if>
             <if test="remark != null">remark,</if>
             <if test="applyDept != null">apply_dept,</if>
@@ -161,6 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="borrowId != null">#{borrowId},</if>
             <if test="projectId != null">#{projectId},</if>
             <if test="applyReason != null">#{applyReason},</if>
+            <if test="borrowUsage != null">#{borrowUsage},</if>
             <if test="applier != null">#{applier},</if>
             <if test="remark != null">#{remark},</if>
             <if test="applyDept != null">#{applyDept},</if>
@@ -190,6 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="applyReason != null">apply_reason = #{applyReason},</if>
+            <if test="borrowUsage != null">borrow_usage = #{borrowUsage},</if>
             <if test="applier != null">applier = #{applier},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="applyDept != null">apply_dept = #{applyDept},</if>

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

@@ -13,10 +13,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="comment"    column="comment"    />
         <result property="document"    column="document"    />
         <result property="commentTime"    column="comment_time"    />
+        <association property="commentUser"    javaType="SysUser"         resultMap="CommentUserResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="CommentUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="nick_name"    />
     </resultMap>
 
     <sql id="selectCmcContractCommentVo">
-        select comment_id, contract_id, sub_contract_id, dept_id, user_id, comment, document, comment_time from cmc_contract_comment
+        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
+        left join sys_user as u on u.user_id = cc.user_id
     </sql>
 
     <select id="selectCmcContractCommentList" parameterType="CmcContractComment" resultMap="CmcContractCommentResult">
@@ -33,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCmcContractCommentByContractId" parameterType="String" resultMap="CmcContractCommentResult">
         <include refid="selectCmcContractCommentVo"/>
-        where contract_id = #{contractId}
+        where cc.contract_id = #{contractId}
     </select>
 
     <insert id="insertCmcContractComment" parameterType="CmcContractComment">

oa-back/sql/sql.sql

@@ -3778,6 +3778,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 '借款用途',
   `apply_reason` 	varchar(255)  	default null comment '借款事由',
   `applier` 		bigint 			default null comment '借款人',
   `apply_dept`		bigint			default null comment '申请部门',

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

@@ -153,9 +153,9 @@
           <el-divider></el-divider>
           <el-form-item label="评审方式" prop="commentType">
             <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="'0'">无须评审</el-radio>
+              <el-radio :label="'1'">会议评审</el-radio>
+              <el-radio :label="'2'">线上评审</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="线上评审：" v-if="commentOpen">
@@ -189,16 +189,16 @@
                 </td>
                 <td>
                   <el-input v-model="comment.comment" type="textarea" clearable
-                    :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
+                    :autosize="{ minRows: 4, maxRows: 10 }" :disabled="taskName == '合同拟稿' || !comment.commentUser"></el-input>
                 </td>
                 <td>
-                  <el-input v-model="comment.document" clearable></el-input>
+                  <el-input v-model="comment.document" clearable :disabled="taskName == '合同拟稿' || !comment.commentUser"></el-input>
                 </td>
                 <td>
-                  <span class="auditor"> {{ comment.User ? comment.User.nickName : commentUser }} </span>
+                  <span class="auditor"> {{ comment.commentUser ? comment.commentUser.nickName : commentUser }} </span>
                 </td>
                 <td>
-                  <span> {{ form.commentTime ? form.commentTime : commentTime }} </span>
+                  <span> {{ comment.commentTime }} </span>
                 </td>
                 <td>
                   <el-button type="danger" icon="el-icon-minus" size="mini" circle
@@ -342,8 +342,6 @@ export default {
       draftTime: undefined,
       managerUser: '',
       managerTime: undefined,
-      commentUser: '',
-      commentTime: undefined,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -375,7 +373,7 @@ export default {
         signDate: null,
         signRemark: null,
         signScan: null,
-        commentType: null
+        commentType: ''
       },
       // 表单参数
       form: {},
@@ -472,6 +470,18 @@ export default {
         else {
           this.formTotal = 1;
           this.form = res.data;
+          if (this.form.commentType == '0') {
+            this.commentOpen = false;
+            this.meetingOpen = false;
+          }
+          else if (this.form.commentType == '1') {
+            this.commentOpen = false;
+            this.meetingOpen = true;
+          }
+          else if (this.form.commentType == '2') {
+            this.commentOpen = true;
+            this.meetingOpen = false;
+          }
           if (res.data.tenderId) {
             getTender(res.data.tenderId).then(response => {
               this.chooseTender = response.data;
@@ -489,6 +499,14 @@ export default {
           getContractComment(this.taskForm.formId).then(res => {
             if (res.data)
               this.commentList = res.data;
+            for (let comment of this.commentList) {
+              if (comment.userId != this.$store.getters.userId) {
+                comment.commentUser = undefined;
+              }
+              else
+                comment.commentTime = parseTime(new Date(), '{y}-{m}-{d}');
+            }
+            console.log(this.commentList);
           });
           getContractMeeting(this.taskForm.formId).then(res => {
             if (res.data)
@@ -644,15 +662,15 @@ export default {
       }
     },
     changeCommentType(val) {
-      if (val == 0) {
+      if (val == '0') {
         this.commentOpen = false;
         this.meetingOpen = false;
       }
-      else if (val == 1) {
+      else if (val == '1') {
         this.commentOpen = false;
         this.meetingOpen = true;
       }
-      else if (val == 2) {
+      else if (val == '2') {
         this.commentOpen = true;
         this.meetingOpen = false;
         for (let comment of this.commentList) {
@@ -685,7 +703,7 @@ export default {
         signDate: null,
         signRemark: null,
         signScan: null,
-        commentType: null
+        commentType: ''
       };
       this.resetForm("form");
     },
@@ -752,7 +770,7 @@ export default {
                 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);
+                  this.$set(this.taskForm.variables, "commentType", '0');
                   complete(this.taskForm).then(response => {
                     this.$modal.msgSuccess(response.msg);
                     this.$emit('goBack')
@@ -767,7 +785,7 @@ export default {
                   approvalList.push(commment.userId)
                 }
                 this.$set(this.taskForm.variables, "approvalList", approvalList);
-                this.$set(this.taskForm.variables, "commentType", 2);
+                this.$set(this.taskForm.variables, "commentType", '2');
                 complete(this.taskForm).then(response => {
                   this.$modal.msgSuccess(response.msg);
                   this.$emit('goBack')
@@ -777,7 +795,7 @@ export default {
                 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);
+                this.$set(this.taskForm.variables, "commentType", '1');
                 complete(this.taskForm).then(response => {
                   this.$modal.msgSuccess(response.msg);
                   this.$emit('goBack')