From 70aeee3dc1593cefdac0e35d10c7b011d185d00a Mon Sep 17 00:00:00 2001 From: tangwei Date: Wed, 29 Apr 2026 10:15:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yfd/platform/data/domain/FishDraftData.java | 2 +- .../yfd/platform/data/domain/vo/FishDraftDataVO.java | 2 +- .../data/service/impl/ApprovalMainServiceImpl.java | 2 +- .../data/service/impl/FishDraftDataServiceImpl.java | 8 ++++---- .../system/controller/SmsVerifyCodeController.java | 6 +++--- .../yfd/platform/system/controller/UserController.java | 7 ++++--- .../java/com/yfd/platform/system/domain/SysUser.java | 4 ++-- .../com/yfd/platform/system/domain/SysUserRequest.java | 2 +- .../platform/system/service/ISmsVerifyCodeService.java | 2 +- .../com/yfd/platform/system/service/IUserService.java | 4 ++-- .../system/service/impl/SmsVerifyCodeServiceImpl.java | 6 +++--- .../platform/system/service/impl/UserServiceImpl.java | 10 +++++----- 12 files changed, 28 insertions(+), 27 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/data/domain/FishDraftData.java b/backend/src/main/java/com/yfd/platform/data/domain/FishDraftData.java index 530d0b7..f29767b 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/FishDraftData.java +++ b/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; diff --git a/backend/src/main/java/com/yfd/platform/data/domain/vo/FishDraftDataVO.java b/backend/src/main/java/com/yfd/platform/data/domain/vo/FishDraftDataVO.java index 65c0f48..24a8199 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/vo/FishDraftDataVO.java +++ b/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; diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalMainServiceImpl.java b/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalMainServiceImpl.java index 72f3d57..cab10cd 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalMainServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/data/service/impl/ApprovalMainServiceImpl.java @@ -106,7 +106,7 @@ public class ApprovalMainServiceImpl extends ServiceImpl 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 page,String name,Integer regStatus) { + public ResponseResult queryPendingAuditUsers(Page page,String name,String regStatus) { Page result = userService.queryPendingAuditUsers(page,name,regStatus); return ResponseResult.successData(result); } diff --git a/backend/src/main/java/com/yfd/platform/system/domain/SysUser.java b/backend/src/main/java/com/yfd/platform/system/domain/SysUser.java index 6d771f8..1fae968 100644 --- a/backend/src/main/java/com/yfd/platform/system/domain/SysUser.java +++ b/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 diff --git a/backend/src/main/java/com/yfd/platform/system/domain/SysUserRequest.java b/backend/src/main/java/com/yfd/platform/system/domain/SysUserRequest.java index d1847ac..346d8cc 100644 --- a/backend/src/main/java/com/yfd/platform/system/domain/SysUserRequest.java +++ b/backend/src/main/java/com/yfd/platform/system/domain/SysUserRequest.java @@ -25,7 +25,7 @@ public class SysUserRequest { /** * 审核状态 */ - private Integer regStatus; + private String regStatus; /** * 审批意见 diff --git a/backend/src/main/java/com/yfd/platform/system/service/ISmsVerifyCodeService.java b/backend/src/main/java/com/yfd/platform/system/service/ISmsVerifyCodeService.java index 7c10d95..95b3765 100644 --- a/backend/src/main/java/com/yfd/platform/system/service/ISmsVerifyCodeService.java +++ b/backend/src/main/java/com/yfd/platform/system/service/ISmsVerifyCodeService.java @@ -45,5 +45,5 @@ public interface ISmsVerifyCodeService extends IService { * @param reason 驳回原因（可选） * @return 是否发送成功 */ - boolean sendAuditNotify(String phone, Integer auditStatus, String reason); + boolean sendAuditNotify(String phone, String auditStatus, String reason); } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/system/service/IUserService.java b/backend/src/main/java/com/yfd/platform/system/service/IUserService.java index ad95d1d..00a2868 100644 --- a/backend/src/main/java/com/yfd/platform/system/service/IUserService.java +++ b/backend/src/main/java/com/yfd/platform/system/service/IUserService.java @@ -166,7 +166,7 @@ public interface IUserService extends IService { * auditStatus 审核状态：1-通过 2-驳回 * 返回值说明: 是否审核成功 ************************************/ - boolean auditUser(String userId, Integer auditStatus); + boolean auditUser(String userId, String auditStatus); /*********************************** * 用途说明：查询待审核用户列表 @@ -174,6 +174,6 @@ public interface IUserService extends IService { *page 分页参数 * 返回值说明: 待审核用户分页列表 ************************************/ - Page queryPendingAuditUsers(Page page,String name, Integer regStatus); + Page queryPendingAuditUsers(Page page,String name, String regStatus); } diff --git a/backend/src/main/java/com/yfd/platform/system/service/impl/SmsVerifyCodeServiceImpl.java b/backend/src/main/java/com/yfd/platform/system/service/impl/SmsVerifyCodeServiceImpl.java index 2c9b072..6f25515 100644 --- a/backend/src/main/java/com/yfd/platform/system/service/impl/SmsVerifyCodeServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/system/service/impl/SmsVerifyCodeServiceImpl.java @@ -98,14 +98,14 @@ public class SmsVerifyCodeServiceImpl extends ServiceImpl impleme } @Override - public boolean auditUser(String userId, Integer auditStatus) { + public boolean auditUser(String userId, String auditStatus) { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(SysUser::getId, userId) .set(SysUser::getRegStatus, auditStatus) @@ -620,18 +620,18 @@ public class UserServiceImpl extends ServiceImpl 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 queryPendingAuditUsers(Page page,String name,Integer regStatus) { + public Page queryPendingAuditUsers(Page page,String name,String regStatus) { LambdaQueryWrapper 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)