入伍保留学籍、外宿申请-审批人修改成电子签名

srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserveApproval.java

@@ -1,6 +1,7 @@
 package com.srs.routine.domain;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.srs.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.*;
@@ -10,7 +11,6 @@ import lombok.*;
 import com.srs.common.core.domain.BaseEntity;
 
 
-
 /**
  * 保留学籍审批记录对象 rt_enlistment_reserve_approval
  *
@@ -22,10 +22,10 @@ import com.srs.common.core.domain.BaseEntity;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@ApiModel(value = "RtEnlistmentReserveApproval对象" , description = "保留学籍审批记录")
+@ApiModel(value = "RtEnlistmentReserveApproval对象", description = "保留学籍审批记录")
 @TableName("rt_enlistment_reserve_approval")
-public class RtEnlistmentReserveApproval extends BaseEntity{
-    private static final long serialVersionUID=1L;
+public class RtEnlistmentReserveApproval extends BaseEntity {
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键
@@ -63,7 +63,7 @@ public class RtEnlistmentReserveApproval extends BaseEntity{
      */
     @ApiModelProperty("审批节点（辅导员/学务等）")
     @TableField("node_name")
-    @Excel(name = "审批节点" , readConverterExp = "辅=导员/学务等")
+    @Excel(name = "审批节点", readConverterExp = "辅=导员/学务等")
     private String nodeName;
 
     /**
@@ -71,7 +71,7 @@ public class RtEnlistmentReserveApproval extends BaseEntity{
      */
     @ApiModelProperty("审批人ID（关联sys_user）")
     @TableField("approver_id")
-    @Excel(name = "审批人ID" , readConverterExp = "关=联sys_user")
+    @Excel(name = "审批人ID", readConverterExp = "关=联sys_user")
     private Long approverId;
 
     /**
@@ -95,7 +95,7 @@ public class RtEnlistmentReserveApproval extends BaseEntity{
      */
     @ApiModelProperty("审批结果（1-通过")
     @TableField("approval_result")
-    @Excel(name = "审批结果" , readConverterExp = "审批结果（1-通过")
+    @Excel(name = "审批结果", readConverterExp = "审批结果（1-通过")
     private Long approvalResult;
 
     /**
@@ -104,7 +104,7 @@ public class RtEnlistmentReserveApproval extends BaseEntity{
     @ApiModelProperty("审批时间")
     @TableField("approval_time")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "审批时间" , width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "审批时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date approvalTime;
 
     /**
@@ -123,5 +123,13 @@ public class RtEnlistmentReserveApproval extends BaseEntity{
     @Excel(name = "学号")
     private String studentNo;
 
+    /**
+     * 签名
+     */
+    @ApiModelProperty("签名")
+    @TableField("signature")
+    @Excel(name = "签名")
+    private String signature;
+
 
 }

srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveApprovalMapper.xml

@@ -17,6 +17,7 @@
         <result property="approvalTime" column="approval_time"/>
         <result property="studentName" column="student_name"/>
         <result property="studentNo" column="student_no"/>
+        <result property="signature" column="signature"/>
     </resultMap>
 
     <sql id="selectRtEnlistmentReserveApprovalVo">
@@ -31,7 +32,8 @@
                approval_result,
                approval_time,
                student_name,
-               student_no
+               student_no,
+               signature
         from rt_enlistment_reserve_approval
     </sql>
 
@@ -96,6 +98,7 @@
             <if test="approvalTime != null">approval_time,</if>
             <if test="studentName != null and studentName != ''">student_name,</if>
             <if test="studentNo != null and studentNo != ''">student_no,</if>
+            <if test="signature != null">signature,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="applyId != null">#{applyId},</if>
@@ -109,6 +112,7 @@
             <if test="approvalTime != null">#{approvalTime},</if>
             <if test="studentName != null and studentName != ''">#{studentName},</if>
             <if test="studentNo != null and studentNo != ''">#{studentNo},</if>
+            <if test="signature != null">#{signature},</if>
         </trim>
     </insert>
 
@@ -128,6 +132,7 @@
             <if test="approvalTime != null">approval_time = #{approvalTime},</if>
             <if test="studentName != null and studentName != ''">student_name = #{studentName},</if>
             <if test="studentNo != null and studentNo != ''">student_no = #{studentNo},</if>
+            <if test="signature != null">signature = #{signature},</if>
         </trim>
         where id = #{id}
     </update>

srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml

@@ -28,7 +28,7 @@
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="affixId" column="affix_id"/>
-        <result property="deployId"    column="deploy_id"    />
+        <result property="deployId" column="deploy_id"/>
         <!--入伍保留学籍申请表-审核记录 （多条件查询column里传入了多条件【{studentName = student_name, studentNo = student_no}】javaType里面写了list表明你有多条件 studentName student_name字段）-->
         <collection property="enlistmentReserveApprovalList"
                     column="{studentName = student_name, studentNo = student_no}"
@@ -52,6 +52,7 @@
         <result property="approvalTime" column="approval_time"/>
         <result property="studentName" column="student_name"/>
         <result property="studentNo" column="student_no"/>
+        <result property="signature" column="signature"/>
     </resultMap>
 
     <!--  入伍保留申请表-审核记录子表，根据学生姓名、学号查询  -->
@@ -158,7 +159,7 @@
             <if test="reserveEndDate != null ">and reserve_end_date = #{reserveEndDate}</if>
             <if test="approvalNo != null  and approvalNo != ''">and approval_no = #{approvalNo}</if>
             <if test="affixId != null  and affixId != ''">and affix_id = #{affixId}</if>
-            <if test="deployId != null  and deployId != ''"> and deploy_id = #{deployId}</if>
+            <if test="deployId != null  and deployId != ''">and deploy_id = #{deployId}</if>
         </where>
     </select>