From 66d041ed14b3ed3ed7183a28a5c588e235fc21d0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 26 五月 2026 11:14:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_鹤壁_强信宇_pro
---
src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java b/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
index 7ac13bd..ab70220 100644
--- a/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
+++ b/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
@@ -1,17 +1,19 @@
package com.ruoyi.staff.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.pojo.HolidayApplication;
-import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
import com.ruoyi.staff.service.HolidayApplicationService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/staff/holidayApplication")
+@AllArgsConstructor
public class HolidayApplicationController {
- @Autowired
+
private HolidayApplicationService holidayApplicationService;
/**
* 璇峰亣鐢宠鍒嗛〉鏌ヨ
@@ -23,6 +25,7 @@
/**
* 鏂板璇峰亣鐢宠
*/
+ @Log(title = "鏂板璇峰亣鐢宠", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody HolidayApplication holidayApplication){
return AjaxResult.success(holidayApplicationService.save(holidayApplication));
@@ -30,6 +33,7 @@
/**
* 淇敼璇峰亣鐢宠
*/
+ @Log(title = "淇敼璇峰亣鐢宠", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public AjaxResult update(@RequestBody HolidayApplication holidayApplication){
return AjaxResult.success(holidayApplicationService.updateById(holidayApplication));
@@ -37,6 +41,7 @@
/**
* 鍒犻櫎璇峰亣鐢宠
*/
+ @Log(title = "鍒犻櫎璇峰亣鐢宠", businessType = BusinessType.DELETE)
@DeleteMapping("/delete/{id}")
public AjaxResult delete(@PathVariable("id") Long id){
return AjaxResult.success(holidayApplicationService.removeById(id));
--
Gitblit v1.9.3