From a183def79767276b8276a3320cc1766f8a0f615e Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Mon, 15 Apr 2024 15:09:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=AE=A1=E6=A0=B8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/ApplyInfoListManager.java | 2 +- .../controller/reward/ApplyController.java | 22 +------ .../controller/reward/AuditController.java | 57 +++++++++++++++++++ .../reward/ScoreInfoController.java | 19 +++++++ 4 files changed, 79 insertions(+), 21 deletions(-) create mode 100644 hyp-admin/src/main/java/com/hyp/web/controller/reward/AuditController.java 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 ec9ad84..66395ea 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 @@ -152,7 +152,7 @@ public class ApplyInfoListManager { * @param applyId * @return boolean */ - public boolean audit(String applyId){ + public boolean approved(String applyId){ return applyInfoListService.lambdaUpdate() .eq(RewApplyInfoList::getApplyId, applyId) .set(RewApplyInfoList::getApplyStatus, ApplyStatusEnum.AUDIT.getType()) 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 85db10d..bee8da1 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 @@ -27,7 +27,7 @@ import java.util.List; * @date 2024/4/10 * @description 优秀学校奖申请 */ -@Api("优秀学校奖申请") +@Api("申请") @RestController @RequestMapping("/reward/apply") public class ApplyController extends BaseController { @@ -36,7 +36,7 @@ public class ApplyController extends BaseController { @Resource private ApplyInfoListManager applyInfoListManager; - @ApiOperation("查询") + @ApiOperation("申请查询") @PreAuthorize("@ss.hasPermi('reward:apply:list')") @GetMapping("/list") public TableDataInfo list(ApplyInfoListDTO applyInfoListDTO) { @@ -73,22 +73,4 @@ public class ApplyController extends BaseController { return success(applyInfoListManager.detail(applyId)); } - @ApiOperation("审核提交") - @GetMapping(value = "/audit/{applyId}") - public AjaxResult audit(@PathVariable String applyId) { - return toAjax(applyInfoListManager.audit(applyId)); - } - - @ApiOperation("申请退回") - @GetMapping(value = "/applyBack") - public AjaxResult applyBack(@RequestParam String applyId, - @RequestParam(required = false) String applyMsg) { - return toAjax(applyInfoListManager.applyBack(applyId,applyMsg)); - } - - - - - - } diff --git a/hyp-admin/src/main/java/com/hyp/web/controller/reward/AuditController.java b/hyp-admin/src/main/java/com/hyp/web/controller/reward/AuditController.java new file mode 100644 index 0000000..df24ce8 --- /dev/null +++ b/hyp-admin/src/main/java/com/hyp/web/controller/reward/AuditController.java @@ -0,0 +1,57 @@ +package com.hyp.web.controller.reward; + +import com.hyp.common.core.controller.BaseController; +import com.hyp.common.core.domain.AjaxResult; +import com.hyp.common.core.page.TableDataInfo; +import com.hyp.system.domain.dto.ApplyInfoListDTO; +import com.hyp.system.domain.vo.ApplyInfoListVO; +import com.hyp.web.controller.manager.ApplyInfoListManager; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * packageName com.hyp.web.controller.reward + * + * @author wangxy + * @version JDK 8 + * @className AuditController + * @date 2024/4/15 + * @description 审核 + */ +@Api("审核") +@RestController +@RequestMapping("/reward/audit") +public class AuditController extends BaseController { + + @Resource + private ApplyInfoListManager applyInfoListManager; + + @ApiOperation("审核查询") + @PreAuthorize("@ss.hasPermi('reward:aduit:list')") + @GetMapping("/list") + public TableDataInfo list(ApplyInfoListDTO applyInfoListDTO) { + startPage(); + List list = applyInfoListManager.selectApplyInfoList(applyInfoListDTO); + return getDataTable(list); + } + + @ApiOperation("审核通过") + @GetMapping(value = "/approved/{applyId}") + public AjaxResult approved(@PathVariable String applyId) { + return toAjax(applyInfoListManager.approved(applyId)); + } + + @ApiOperation("审核不通过") + @GetMapping(value = "/applyBack") + public AjaxResult applyBack(@RequestParam String applyId, + @RequestParam(required = false) String applyMsg) { + return toAjax(applyInfoListManager.applyBack(applyId,applyMsg)); + } + + +} diff --git a/hyp-admin/src/main/java/com/hyp/web/controller/reward/ScoreInfoController.java b/hyp-admin/src/main/java/com/hyp/web/controller/reward/ScoreInfoController.java index 6cab836..c2ca383 100644 --- a/hyp-admin/src/main/java/com/hyp/web/controller/reward/ScoreInfoController.java +++ b/hyp-admin/src/main/java/com/hyp/web/controller/reward/ScoreInfoController.java @@ -3,15 +3,21 @@ package com.hyp.web.controller.reward; import com.hyp.common.annotation.Log; import com.hyp.common.core.controller.BaseController; import com.hyp.common.core.domain.AjaxResult; +import com.hyp.common.core.page.TableDataInfo; import com.hyp.common.enums.BusinessType; +import com.hyp.system.domain.dto.ApplyInfoListDTO; import com.hyp.system.domain.dto.ScoreInfoSaveDTO; +import com.hyp.system.domain.vo.ApplyInfoListVO; +import com.hyp.web.controller.manager.ApplyInfoListManager; import com.hyp.web.controller.manager.ScoreInfoManager; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; /** * packageName com.hyp.web.controller.reward @@ -30,6 +36,19 @@ public class ScoreInfoController extends BaseController { @Resource private ScoreInfoManager scoreInfoManager; + @Resource + private ApplyInfoListManager applyInfoListManager; + + + @ApiOperation("评分列表") + @PreAuthorize("@ss.hasPermi('reward:score:list')") + @GetMapping("/list") + public TableDataInfo list(ApplyInfoListDTO applyInfoListDTO) { + startPage(); + List list = applyInfoListManager.selectApplyInfoList(applyInfoListDTO); + return getDataTable(list); + } + @ApiOperation("评分保存") @Log(title = "评分保存", businessType = BusinessType.INSERT) @PostMapping("/save")