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 462b593..fa5f963 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 @@ -3,6 +3,7 @@ package com.hyp.web.controller.manager; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import com.hyp.common.core.domain.model.LoginUser; +import com.hyp.common.enums.ApplyStatusEnum; import com.hyp.common.exception.ServiceException; import com.hyp.common.utils.SecurityUtils; import com.hyp.system.domain.RewApplyInfoList; @@ -147,6 +148,37 @@ public class ApplyInfoListManager { } + /** + * + * 审核提交 + * @param applyId + * @return boolean + */ + + public boolean audit(String applyId){ + return applyInfoListService.lambdaUpdate() + .eq(RewApplyInfoList::getApplyId, applyId) + .set(RewApplyInfoList::getApplyStatus, ApplyStatusEnum.AUDIT.getType()) + .set(RewApplyInfoList::getAuthTime, new Date()) + .update(); + } + /** + * + * 退回 + * @param applyId + * @param applyMsg + * @return boolean + */ + + public boolean applyBack(String applyId,String applyMsg){ + return applyInfoListService.lambdaUpdate() + .eq(RewApplyInfoList::getApplyId, applyId) + .set(RewApplyInfoList::getApplyStatus, ApplyStatusEnum.BACK.getType()) + .set(Objects.nonNull(applyMsg), RewApplyInfoList::getApplyMsg, applyMsg) + .set(RewApplyInfoList::getAuthTime, new Date()) + .update(); + } + diff --git a/hyp-admin/src/main/java/com/hyp/web/controller/reward/ApplyController.java b/hyp-admin/src/main/java/com/hyp/web/controller/reward/ApplyController.java index 0117c13..c78bdc3 100644 --- a/hyp-admin/src/main/java/com/hyp/web/controller/reward/ApplyController.java +++ b/hyp-admin/src/main/java/com/hyp/web/controller/reward/ApplyController.java @@ -73,6 +73,19 @@ public class ApplyController extends BaseController { return success(applyInfoListManager.detail(applyId)); } + @ApiOperation("审核提交") + @GetMapping(value = "/audit/{applyId}") + public AjaxResult audit(@PathVariable String applyId) { + return success(applyInfoListManager.audit(applyId)); + } + + @ApiOperation("退回") + @GetMapping(value = "/applyBack") + public AjaxResult applyBack(@RequestParam String applyId, + @RequestParam(required = false) String applyMsg) { + return success(applyInfoListManager.applyBack(applyId,applyMsg)); + } + diff --git a/hyp-common/src/main/java/com/hyp/common/enums/ApplyStatusEnum.java b/hyp-common/src/main/java/com/hyp/common/enums/ApplyStatusEnum.java new file mode 100644 index 0000000..7cce6f8 --- /dev/null +++ b/hyp-common/src/main/java/com/hyp/common/enums/ApplyStatusEnum.java @@ -0,0 +1,30 @@ +package com.hyp.common.enums; + +import lombok.Getter; + +/** + * 申请状态 + * + * @author wangxy + * @date 2024/4/11 9:15 + */ +@Getter +public enum ApplyStatusEnum { + + SAVE(0, "待提交"), + + SUBMIT(1, "待审核"), + + AUDIT(2, "待评分"), + + BACK(3, "退回"); + + private Integer type; + + private String desc; + + ApplyStatusEnum(Integer type, String desc) { + this.type = type; + this.desc = desc; + } +}