From 07617ffdf60b902b9b5d318d8613633aa481784c Mon Sep 17 00:00:00 2001
From: wangxy <1481820854@qq.com>
Date: Fri, 16 May 2025 10:38:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/manager/ApplyInfoListManager.java   | 10 +++++-----
 .../com/ruoyi/system/domain/apply/TdApplyInfoList.java |  2 +-
 .../system/domain/apply/dto/TdApplyInfoListDTO.java    |  2 +-
 .../mapper/system/apply/TdApplyInfoListMapper.xml      |  6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java
index f83489af..6e705cec 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java
@@ -68,7 +68,7 @@ public class ApplyInfoListManager {
             applyInfoList.setCreateBy(ShiroUtils.getSysUser().getUserName());
         }
         applyInfoList.setDeptId(ShiroUtils.getSysUser().getDeptId());
-        applyInfoList.setApplyStatus(0);
+        applyInfoList.setApplyStatus("0");
         return applyInfoListService.saveOrUpdate(applyInfoList);
     }
 
@@ -92,7 +92,7 @@ public class ApplyInfoListManager {
     public boolean submit(String applyId) {
         return applyInfoListService.lambdaUpdate()
                 .eq(TdApplyInfoList::getApplyId,applyId)
-                .set(TdApplyInfoList::getApplyStatus,1)
+                .set(TdApplyInfoList::getApplyStatus,"1")
                 .set(TdApplyInfoList::getAppTime,new Date()).update();
     }
 
@@ -103,7 +103,7 @@ public class ApplyInfoListManager {
     public boolean submitAudit(String applyId) {
         return applyInfoListService.lambdaUpdate()
                 .eq(TdApplyInfoList::getApplyId,applyId)
-                .set(TdApplyInfoList::getApplyStatus,2)
+                .set(TdApplyInfoList::getApplyStatus,"2")
                 .set(TdApplyInfoList::getAuthTime,new Date()).update();
     }
 
@@ -115,7 +115,7 @@ public class ApplyInfoListManager {
     public boolean goBack(String applyId,String applyMsg) {
         return applyInfoListService.lambdaUpdate()
                 .eq(TdApplyInfoList::getApplyId,applyId)
-                .set(TdApplyInfoList::getApplyStatus,3)
+                .set(TdApplyInfoList::getApplyStatus,"3")
                 .set(Objects.nonNull(applyMsg), TdApplyInfoList::getApplyMsg, applyMsg)
                 .update();
     }
@@ -127,7 +127,7 @@ public class ApplyInfoListManager {
     public boolean submitPromise(String applyId) {
         return applyInfoListService.lambdaUpdate()
                 .eq(TdApplyInfoList::getApplyId,applyId)
-                .set(TdApplyInfoList::getApplyStatus,5).update();
+                .set(TdApplyInfoList::getApplyStatus,"5").update();
     }
 
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/TdApplyInfoList.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/TdApplyInfoList.java
index 9a659b17..18592e47 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/TdApplyInfoList.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/TdApplyInfoList.java
@@ -38,7 +38,7 @@ public class TdApplyInfoList extends BaseEntity {
     /**
      * 申请状态（0：保存1：已提交，2，审核通过，3退回，4培训教育提交，5承诺书上传）
      */
-    private Integer applyStatus;
+    private String applyStatus;
 
     /**
      * 提交时间
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/dto/TdApplyInfoListDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/dto/TdApplyInfoListDTO.java
index dd0c337c..83e7c0e9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/dto/TdApplyInfoListDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/dto/TdApplyInfoListDTO.java
@@ -42,7 +42,7 @@ public class TdApplyInfoListDTO extends BaseEntity {
     /**
      * 申请状态（0：保存1：已提交，2，审核通过，3退回，4结束）
      */
-    private Integer applyStatus;
+    private String applyStatus;
 
     /**
      * 提交时间
diff --git a/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml b/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml
index 28a903dc..4d66ae88 100644
--- a/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml
@@ -9,7 +9,7 @@
             <result property="name" column="name" jdbcType="VARCHAR"/>
             <result property="sex" column="sex" jdbcType="VARCHAR"/>
             <result property="nationa" column="nationa" jdbcType="VARCHAR"/>
-            <result property="applyStatus" column="apply_status" jdbcType="INTEGER"/>
+            <result property="applyStatus" column="apply_status" jdbcType="VARCHAR"/>
             <result property="appTime" column="app_time" jdbcType="TIMESTAMP"/>
             <result property="applyMsg" column="apply_msg" jdbcType="VARCHAR"/>
             <result property="authTime" column="auth_time" jdbcType="TIMESTAMP"/>
@@ -69,7 +69,7 @@
                 <if test="smPost!=null and smPost!=''">
                     AND sm_post = #{smPost}
                 </if>
-                AND  apply_status in (0,3)
+                AND  apply_status in ('0','3')
                 <!-- 数据范围过滤 -->
                 ${params.dataScope}
             </trim>
@@ -97,7 +97,7 @@
             <if test="smPost!=null and smPost!=''">
                 AND sm_post = #{smPost}
             </if>
-            AND  apply_status = 2
+            AND  apply_status = '2'
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </trim>