From 546cf13f3435b5988a64aeaeec6962fcbb50a58f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BA=AC=E9=80=9A?= <2405957150@qq.com> Date: Mon, 9 Jun 2025 15:29:04 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NonWorkingDayDrinkingReportController.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java b/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java index c0679cd..73ccaff 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java @@ -19,6 +19,7 @@ import com.ruoyi.system.service.ISysDeptService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.text.SimpleDateFormat; @@ -180,13 +181,19 @@ public class NonWorkingDayDrinkingReportController extends BaseController { @ApiOperation("审批非工作日饮酒报备单") @PostMapping("/approval") - public AjaxResult approval(ApprovaltDto dto) { + @Transactional + public AjaxResult approval(@RequestBody ApprovaltDto dto) { SysUser user = getLoginUser().getUser(); Long id = dto.getId(); Integer state = dto.getState(); NonWorkingDayDrinkingReport nonWorkingDayDrinkingReport = nonWorkingDayDrinkingReportService.getById(id); nonWorkingDayDrinkingReport.setState(state); boolean result = nonWorkingDayDrinkingReportService.updateById(nonWorkingDayDrinkingReport); + ApprovalProcess one = approvalsProcessService.lambdaQuery() + .eq(ApprovalProcess::getApprovalNo, nonWorkingDayDrinkingReport.getApplyNo()) + .one(); + one.setApprovalStatus(state); + boolean result2 = approvalsProcessService.updateById(one); gwglLog gwglLog = new gwglLog(); gwglLog.setApplyNo(nonWorkingDayDrinkingReport.getApplyNo()); gwglLog.setDeptId(nonWorkingDayDrinkingReport.getDeptId());