fix: 优化逻辑

backend/src/main/java/com/yfd/platform/data/domain/FishDraftData.java

@@ -124,7 +124,7 @@ public class FishDraftData implements Serializable {
     private String approvalId;
 
     /**
-     * 状态（DRAFT未提交 / SUBMITTED已提交 / APPROVED已通过 / REJECTED已驳回）
+     * 状态（DRAFT未提交 / PENDING已提交 / APPROVED已通过 / REJECTED已驳回）
      */
     private String status;
 

backend/src/main/java/com/yfd/platform/data/domain/vo/FishDraftDataVO.java

@@ -113,7 +113,7 @@ public class FishDraftDataVO implements Serializable {
     private String approvalId;
 
     /**
-     * 状态（DRAFT未提交 / SUBMITTED已提交 / APPROVED已通过 / REJECTED已驳回）
+     * 状态（DRAFT未提交 / PENDING已提交 / APPROVED已通过 / REJECTED已驳回）
      */
     private String status;
 

backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalMainServiceImpl.java

@@ -106,7 +106,7 @@ public class ApprovalMainServiceImpl extends ServiceImpl<ApprovalMainMapper, App
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean submitApproval(ApprovalMain approvalMain) {
-        approvalMain.setStatus("SUBMITTED");
+        approvalMain.setStatus("PENDING");
         approvalMain.setApplyTime(new Date());
         boolean result = this.save(approvalMain);
         if (result) {

backend/src/main/java/com/yfd/platform/data/service/impl/FishDraftDataServiceImpl.java

@@ -242,7 +242,7 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
         approvalMainService.save(approvalMain);
 
         fishDraftData.setApprovalId(approvalMain.getId());
-        fishDraftData.setStatus("SUBMITTED");
+        fishDraftData.setStatus("PENDING");
         fishDraftData.setSubmitTime(new Date());
         boolean result = this.updateById(fishDraftData);
         if (result) {
@@ -272,7 +272,7 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
         updateWrapper.in(FishDraftData::getId, ids);
         updateWrapper.eq(FishDraftData::getLockFlag, 0);
         updateWrapper.set(FishDraftData::getApprovalId, approvalMain.getId());
-        updateWrapper.set(FishDraftData::getStatus, "SUBMITTED");
+        updateWrapper.set(FishDraftData::getStatus, "PENDING");
         updateWrapper.set(FishDraftData::getSubmitTime, new Date());
         this.update(updateWrapper);
 
@@ -296,7 +296,7 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
         List<String> validIds = new ArrayList<>();
 
         for (FishDraftData fishDraftData : dataList) {
-            if ("SUBMITTED".equals(fishDraftData.getStatus())) {
+            if ("PENDING".equals(fishDraftData.getStatus())) {
                 validIds.add(fishDraftData.getId());
                 if (fishDraftData.getApprovalId() != null) {
                     processedApprovalIds.add(fishDraftData.getApprovalId());
@@ -339,7 +339,7 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
         Date now = new Date();
         String operatorId = SecurityUtils.getUserId();
         FishDraftData fishDraftData = this.getById(id);
-        if (fishDraftData != null && "SUBMITTED".equals(fishDraftData.getStatus())) {
+        if (fishDraftData != null && "PENDING".equals(fishDraftData.getStatus())) {
             fishDraftData.setStatus("REJECTED");
             fishDraftData.setApproveTime(now);
             fishDraftData.setUpdatedBy(operatorId);

backend/src/main/java/com/yfd/platform/system/controller/SmsVerifyCodeController.java

@@ -162,7 +162,7 @@ public class SmsVerifyCodeController {
         } catch (Exception e) {
             return ResponseResult.error("密码解密失败");
         }
-        user.setRegStatus(0);
+        user.setRegStatus("PENDING");
         user.setPhone(smsVerifyCodeRequest.getPhone());
         user.setBelongingUnit(smsVerifyCodeRequest.getBelongingUnit());
         user.setRegTime(new Date());
@@ -373,11 +373,11 @@ public class SmsVerifyCodeController {
             return ResponseResult.error("账号已停用");
         }
 
-        if (user.getRegStatus() != null && user.getRegStatus() == 0) {
+        if (user.getRegStatus() != null && "PENDING".equals(user.getRegStatus())) {
             return ResponseResult.error("账号待审核，请联系管理员");
         }
 
-        if (user.getRegStatus() != null && user.getRegStatus() == 2) {
+        if (user.getRegStatus() != null && "REJECTED".equals(user.getRegStatus())) {
             return ResponseResult.error("账号审核未通过");
         }
 

backend/src/main/java/com/yfd/platform/system/controller/UserController.java

@@ -208,11 +208,12 @@ public class UserController {
     @ResponseBody
     public ResponseResult auditUser(@RequestBody SysUserRequest sysUserRequest) {
         String userId = sysUserRequest.getUserId();
-        Integer auditStatus = sysUserRequest.getRegStatus();
+        String auditStatus = sysUserRequest.getRegStatus();
         if (userId == null || userId.isEmpty()) {
             return ResponseResult.error("用户ID不能为空");
         }
-        if (auditStatus == null || (auditStatus != 1 && auditStatus != 2)) {
+
+        if (StrUtil.isBlank(auditStatus) || ( !"APPROVED".equals(auditStatus)&&!"REJECTED".equals(auditStatus))) {
             return ResponseResult.error("审核状态错误：1-通过 2-驳回");
         }
         SysUser user = userService.getById(userId);
@@ -231,7 +232,7 @@ public class UserController {
     @GetMapping("/queryPendingAuditUsers")
     @Operation(summary = "查询待审核用户列表")
     @ResponseBody
-    public ResponseResult queryPendingAuditUsers(Page<SysUser> page,String name,Integer regStatus) {
+    public ResponseResult queryPendingAuditUsers(Page<SysUser> page,String name,String regStatus) {
         Page<SysUser> result = userService.queryPendingAuditUsers(page,name,regStatus);
         return ResponseResult.successData(result);
     }

backend/src/main/java/com/yfd/platform/system/domain/SysUser.java

@@ -122,9 +122,9 @@ public class SysUser implements Serializable {
     private String realName;
 
     /**
-     * 注册状态：0-待审核 1-已通过 2-已驳回
+     * 审批状态（PENDING待审批 / APPROVED已通过 / REJECTED已驳回）
      */
-    private Integer regStatus;
+    private String regStatus;
 
     /**
      * 审核人ID

backend/src/main/java/com/yfd/platform/system/domain/SysUserRequest.java

@@ -25,7 +25,7 @@ public class SysUserRequest {
     /**
      * 审核状态
      */
-    private Integer regStatus;
+    private String regStatus;
 
     /**
      * 审批意见

backend/src/main/java/com/yfd/platform/system/service/ISmsVerifyCodeService.java

@@ -45,5 +45,5 @@ public interface ISmsVerifyCodeService extends IService<SmsVerifyCode> {
      * @param reason 驳回原因（可选）
      * @return 是否发送成功
      */
-    boolean sendAuditNotify(String phone, Integer auditStatus, String reason);
+    boolean sendAuditNotify(String phone, String auditStatus, String reason);
 }

backend/src/main/java/com/yfd/platform/system/service/IUserService.java

@@ -166,7 +166,7 @@ public interface IUserService extends IService<SysUser> {
      * auditStatus 审核状态：1-通过 2-驳回
      * 返回值说明: 是否审核成功
      ************************************/
-    boolean auditUser(String userId, Integer auditStatus);
+    boolean auditUser(String userId, String auditStatus);
 
     /***********************************
      * 用途说明：查询待审核用户列表
@@ -174,6 +174,6 @@ public interface IUserService extends IService<SysUser> {
      *page        分页参数
      * 返回值说明: 待审核用户分页列表
      ************************************/
-    Page<SysUser> queryPendingAuditUsers(Page<SysUser> page,String name, Integer regStatus);
+    Page<SysUser> queryPendingAuditUsers(Page<SysUser> page,String name, String regStatus);
 
 }

backend/src/main/java/com/yfd/platform/system/service/impl/SmsVerifyCodeServiceImpl.java

@@ -98,14 +98,14 @@ public class SmsVerifyCodeServiceImpl extends ServiceImpl<SmsVerifyCodeMapper, S
     }
 
     @Override
-    public boolean sendAuditNotify(String phone, Integer auditStatus, String reason) {
+    public boolean sendAuditNotify(String phone, String auditStatus, String reason) {
         if (phone == null || phone.isEmpty()) {
             return false;
         }
         String content;
-        if (auditStatus == 1) {
+        if ("APPROVED".equals(auditStatus)) {
             content = "您的数据填报系统账号已审核通过，现在可以正常登录系统了。";
-        } else if (auditStatus == 2) {
+        } else if ("REJECTED".equals(auditStatus)) {
             if (reason != null && !reason.isEmpty()) {
                 content = "您的数据填报系统账号审核未通过，原因：" + reason;
             } else {

backend/src/main/java/com/yfd/platform/system/service/impl/UserServiceImpl.java

@@ -612,7 +612,7 @@ public class UserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impleme
     }
 
     @Override
-    public boolean auditUser(String userId, Integer auditStatus) {
+    public boolean auditUser(String userId, String auditStatus) {
         LambdaUpdateWrapper<SysUser> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(SysUser::getId, userId)
                 .set(SysUser::getRegStatus, auditStatus)
@@ -620,18 +620,18 @@ public class UserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impleme
                 .set(SysUser::getAuditTime, new Timestamp(System.currentTimeMillis()))
                 .set(SysUser::getLastmodifydate, new Timestamp(System.currentTimeMillis()))
                 .set(SysUser::getLastmodifier, SecurityUtils.getCurrentUsername());
-        if (auditStatus == 1) {
+        if ("APPROVED".equals(auditStatus)) {
             updateWrapper.set(SysUser::getStatus, 1);
-        } else if (auditStatus == 2) {
+        } else if ("REJECTED".equals(auditStatus)) {
             updateWrapper.set(SysUser::getStatus, 0);
         }
         return this.update(updateWrapper);
     }
 
     @Override
-    public Page<SysUser> queryPendingAuditUsers(Page<SysUser> page,String name,Integer regStatus) {
+    public Page<SysUser> queryPendingAuditUsers(Page<SysUser> page,String name,String regStatus) {
         LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(SysUser::getRegStatus, 0,1,2);
+        queryWrapper.in(SysUser::getRegStatus, "PENDING","APPROVED","REJECTED");
         queryWrapper.eq(ObjectUtil.isNotEmpty(regStatus),SysUser::getRegStatus, regStatus);
         queryWrapper.and(StrUtil.isNotBlank(name), wrapper ->
                 wrapper.like(SysUser::getNickname, name)