From 4b3cff7fa360cc6eba5ad9a2341e412b63af07d4 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Wed, 17 Apr 2024 11:13:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../hyp/web/controller/manager/ApplyInfoListManager.java | 4 ++--
.../com/hyp/system/domain/dto/ApplyInfoListSaveDTO.java | 6 ------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/hyp-admin/src/main/java/com/hyp/web/controller/manager/ApplyInfoListManager.java b/hyp-admin/src/main/java/com/hyp/web/controller/manager/ApplyInfoListManager.java
index 66395ea..6575b5c 100644
--- a/hyp-admin/src/main/java/com/hyp/web/controller/manager/ApplyInfoListManager.java
+++ b/hyp-admin/src/main/java/com/hyp/web/controller/manager/ApplyInfoListManager.java
@@ -86,7 +86,7 @@ public class ApplyInfoListManager {
if(StringUtils.isNotBlank(name)){
applyInfoList.setApplyName(name);
}
- applyInfoList.setApplyStatus(0);
+ applyInfoList.setApplyStatus(ApplyStatusEnum.SAVE.getType());
applyInfoList.setCreateId(loginUser.getUserId());
applyInfoList.setCreateBy(loginUser.getUsername());
applyInfoList.setUpdateTime(new Date());
@@ -105,10 +105,10 @@ public class ApplyInfoListManager {
LoginUser loginUser = SecurityUtils.getLoginUser();
RewApplyInfoList applyInfoList = applyInfoListService.getById(applyInfoListSaveDTO.getApplyId());
if(Objects.nonNull(applyInfoList)){
- applyInfoList.setApplyStatus(applyInfoListSaveDTO.getApplyStatus());
applyInfoList.setAppTime(new Date());
applyInfoList.setCreateBy(loginUser.getUsername());
applyInfoList.setIsReward(applyInfoListSaveDTO.getIsReward());
+ applyInfoList.setApplyStatus(ApplyStatusEnum.SUBMIT.getType());
}
return applyInfoListService.saveOrUpdate(applyInfoList);
}
diff --git a/hyp-system/src/main/java/com/hyp/system/domain/dto/ApplyInfoListSaveDTO.java b/hyp-system/src/main/java/com/hyp/system/domain/dto/ApplyInfoListSaveDTO.java
index 6bddaa6..161e08a 100644
--- a/hyp-system/src/main/java/com/hyp/system/domain/dto/ApplyInfoListSaveDTO.java
+++ b/hyp-system/src/main/java/com/hyp/system/domain/dto/ApplyInfoListSaveDTO.java
@@ -25,12 +25,6 @@ public class ApplyInfoListSaveDTO implements Serializable {
@NotBlank(message = "申请id不能为空")
private String applyId;
- /**
- * 申请状态（0：待提交 1：待审核，2，评分，3退回）
- */
- @NotNull(message = "申请状态不能为空")
- private Integer applyStatus;
-
/**
* 是否获得过奖
*/