diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java index 4bd511c2..40e20d61 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java @@ -79,7 +79,7 @@ public class ApplyInfoListManager { } - @Transactional(rollbackFor = Exception.class) + public boolean submit(String applyId) { return applyInfoListService.lambdaUpdate() .eq(TdApplyInfoList::getApplyId,applyId) @@ -89,17 +89,26 @@ public class ApplyInfoListManager { - @Transactional(rollbackFor = Exception.class) - public boolean submitAudit(String applyId,Integer applyStatus,String applyMsg) { + + public boolean submitAudit(String applyId) { return applyInfoListService.lambdaUpdate() .eq(TdApplyInfoList::getApplyId,applyId) - .set(TdApplyInfoList::getApplyStatus,applyStatus) - .set(Objects.nonNull(applyMsg), TdApplyInfoList::getApplyMsg, applyMsg) + .set(TdApplyInfoList::getApplyStatus,2) .set(TdApplyInfoList::getAuthTime,new Date()).update(); } + public boolean goBack(String applyId,String applyMsg) { + return applyInfoListService.lambdaUpdate() + .eq(TdApplyInfoList::getApplyId,applyId) + .set(TdApplyInfoList::getApplyStatus,3) + .set(Objects.nonNull(applyMsg), TdApplyInfoList::getApplyMsg, applyMsg) + .update(); + } + + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/apply/AuditInfoListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/apply/AuditInfoListController.java index ded89073..955cb93c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/apply/AuditInfoListController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/apply/AuditInfoListController.java @@ -63,14 +63,23 @@ public class AuditInfoListController extends BaseController { } /** - * 审核通过、不通过 + * 审核通过 */ @PostMapping("/submitAudit") @ResponseBody - public AjaxResult submitAudit(@RequestParam String applyId, - @RequestParam Integer auditStatus, - @RequestParam(required = false) String applyMsg) { - return toAjax(applyInfoListManager.submitAudit(applyId,auditStatus,applyMsg)); + public AjaxResult submitAudit(@RequestParam String applyId) { + return toAjax(applyInfoListManager.submitAudit(applyId)); + } + + + /** + * 审核不通过 + */ + @PostMapping("/goBack") + @ResponseBody + public AjaxResult goBack(@RequestParam String applyId, + @RequestParam(required = false) String applyMsg) { + return toAjax(applyInfoListManager.goBack(applyId,applyMsg)); }