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

dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationApproval.java

@@ -1,6 +1,7 @@
 package com.srs.dormitory.domain;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.srs.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.*;
@@ -10,22 +11,21 @@ import lombok.*;
 import com.srs.common.core.domain.BaseEntity;
 
 
-
 /**
  * 外宿申请审批记录对象 dms_outside_accommodation_approval
  *
  * @author srs
- * @date 2025-12-05
+ * @date 2025-12-19
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@ApiModel(value = "DmsOutsideAccommodationApproval对象" , description = "外宿申请审批记录表")
+@ApiModel(value = "DmsOutsideAccommodationApproval对象", description = "外宿申请审批记录表")
 @TableName("dms_outside_accommodation_approval")
-public class DmsOutsideAccommodationApproval extends BaseEntity{
-private static final long serialVersionUID=1L;
+public class DmsOutsideAccommodationApproval extends BaseEntity {
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键ID
@@ -39,7 +39,7 @@ private static final long serialVersionUID=1L;
      */
     @ApiModelProperty("外宿申请ID（关联申请表）")
     @TableField("apply_id")
-    @Excel(name = "外宿申请ID" , readConverterExp = "关=联申请表")
+    @Excel(name = "外宿申请ID", readConverterExp = "关=联申请表")
     private Long applyId;
 
     /**
@@ -95,7 +95,7 @@ private static final long serialVersionUID=1L;
      */
     @ApiModelProperty("审批结果（1=同意，0=驳回）")
     @TableField("approval_result")
-    @Excel(name = "审批结果" , readConverterExp = "1==同意，0=驳回")
+    @Excel(name = "审批结果", readConverterExp = "1==同意，0=驳回")
     private Long approvalResult;
 
     /**
@@ -104,7 +104,7 @@ private static final long serialVersionUID=1L;
     @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;
 
     /**
@@ -131,5 +131,13 @@ private static final long serialVersionUID=1L;
     @Excel(name = "学生学号")
     private String studentNo;
 
+    /**
+     * 签名
+     */
+    @ApiModelProperty("签名")
+    @TableField("signature")
+    @Excel(name = "签名")
+    private String signature;
+
 
 }

dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApplyMapper.xml

@@ -49,7 +49,7 @@
         <result property="idCard" column="idCard"/>
         <result property="studentPhone" column="studentPhone"/>
         <result property="studentSignature" column="student_signature"/>
-        <result property="promiseContent"    column="promise_content"    />
+        <result property="promiseContent" column="promise_content"/>
         <!--外宿申请表-审核记录 （多条件查询column里传入了多条件【{studentName = student_name, studentNo = student_no}】javaType里面写了list表明你有多条件 studentName student_name字段）-->
         <collection property="outsideAccommodationApprovals"
                     column="{studentName = student_name, studentNo = student_no}"
@@ -74,6 +74,7 @@
         <result property="processInstanceId" column="process_instance_id"/>
         <result property="studentName" column="student_name"/>
         <result property="studentNo" column="student_no"/>
+        <result property="signature" column="signature"/>
     </resultMap>
 
     <!--  外宿申请表-审核记录子表，根据学生姓名、学号查询  -->
@@ -90,7 +91,7 @@
         </where>
     </select>
 
-    <!--外宿申请表-审核记录-->
+    <!--外宿申请表-附件记录-->
     <resultMap type="DmsOutsideAccommodationAttachment" id="DmsOutsideAccommodationAttachmentResult">
         <result property="id" column="id"/>
         <result property="applyId" column="apply_id"/>

dms-dormitory/src/main/resources/mapper/dormitory/DmsOutsideAccommodationApprovalMapper.xml

@@ -18,6 +18,7 @@
         <result property="processInstanceId" column="process_instance_id"/>
         <result property="studentName" column="student_name"/>
         <result property="studentNo" column="student_no"/>
+        <result property="signature"    column="signature"    />
     </resultMap>
 
     <sql id="selectDmsOutsideAccommodationApprovalVo">
@@ -33,7 +34,8 @@
                approval_time,
                process_instance_id,
                student_name,
-               student_no
+               student_no,
+               signature
         from dms_outside_accommodation_approval
     </sql>
 
@@ -59,6 +61,7 @@
                 '%')
             </if>
             <if test="studentNo != null  and studentNo != ''">and student_no = #{studentNo}</if>
+            <if test="signature != null  and signature != ''"> and signature = #{signature}</if>
         </where>
     </select>
 
@@ -100,6 +103,7 @@
             <if test="processInstanceId != null">process_instance_id,</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>
@@ -114,6 +118,7 @@
             <if test="processInstanceId != null">#{processInstanceId},</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>
 
@@ -132,6 +137,7 @@
             <if test="processInstanceId != null">process_instance_id = #{processInstanceId},</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>