From d709e8a7117704ac4717db5201e40964b90d4791 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 16:17:03 +0800
Subject: [PATCH] Merge dev_pro_河南鹤壁 into dev_山西_晋和园_pro

---
 src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java b/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java
index 2ecf29f..e561984 100644
--- a/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java
+++ b/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java
@@ -7,6 +7,8 @@
 import com.ruoyi.approve.mapper.WorkingHoursSettingMapper;
 import com.ruoyi.approve.pojo.*;
 import com.ruoyi.approve.service.HolidaySettingsService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,13 +20,9 @@
 @RequestMapping("/holidaySettings")
 @AllArgsConstructor
 public class HolidaySettingsController {
-    @Autowired
     private HolidaySettingsService holidaySettingsService;
-    @Autowired
     private AnnualLeaveSettingMapper annualLeaveSettingMapper;
-    @Autowired
     private OvertimeSettingMapper overtimeSettingMapper;
-    @Autowired
     private WorkingHoursSettingMapper workingHoursSettingMapper;
 
     /**銆�
@@ -41,6 +39,7 @@
      * 澧炴坊
      * @return
      */
+    @Log(title = "澧炴坊鍋囨湡璁剧疆", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public AjaxResult add(@RequestBody HolidaySettings holidaySettings){
         return AjaxResult.success(holidaySettingsService.save(holidaySettings));
@@ -49,6 +48,7 @@
      * 鏇存柊
      * @return
      */
+    @Log(title = "鏇存柊鍋囨湡璁剧疆", businessType = BusinessType.UPDATE)
     @PostMapping("/update")
     public AjaxResult update(@RequestBody HolidaySettings holidaySettings){
         return AjaxResult.success(holidaySettingsService.updateById(holidaySettings));
@@ -57,6 +57,7 @@
      * 鍒犻櫎
      * @return
      */
+    @Log(title = "鍒犻櫎鍋囨湡璁剧疆", businessType = BusinessType.DELETE)
     @DeleteMapping("/delete")
     public AjaxResult delete(@RequestBody List<Long> ids){
         if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
@@ -76,6 +77,7 @@
      * 澧炴坊骞村亣瑙勫垯
      * @return
      */
+    @Log(title = "澧炴坊骞村亣瑙勫垯", businessType = BusinessType.INSERT)
     @PostMapping("/addAnnualLeaveSetting")
     public AjaxResult addAnnualLeaveSetting(@RequestBody AnnualLeaveSetting annualLeaveSetting){
         return AjaxResult.success(annualLeaveSettingMapper.insert(annualLeaveSetting));
@@ -84,6 +86,7 @@
      * 鏇存柊骞村亣瑙勫垯
      * @return
      */
+    @Log(title = "鏇存柊骞村亣瑙勫垯", businessType = BusinessType.UPDATE)
     @PostMapping("/updateAnnualLeaveSetting")
     public AjaxResult updateAnnualLeaveSetting(@RequestBody AnnualLeaveSetting annualLeaveSetting){
         return AjaxResult.success(annualLeaveSettingMapper.updateById(annualLeaveSetting));
@@ -92,6 +95,7 @@
      * 鍒犻櫎骞村亣瑙勫垯
      * @return
      */
+    @Log(title = "鍒犻櫎骞村亣瑙勫垯", businessType = BusinessType.DELETE)
     @DeleteMapping("/deleteAnnualLeaveSetting")
     public AjaxResult deleteAnnualLeaveSetting(@RequestBody List<Long> ids){
         if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
@@ -112,6 +116,7 @@
      * 澧炴坊鍔犵彮瑙勫垯
      * @return
      */
+    @Log(title = "澧炴坊鍔犵彮瑙勫垯", businessType = BusinessType.INSERT)
     @PostMapping("/addOvertimeSetting")
     public AjaxResult addOvertimeSetting(@RequestBody OvertimeSetting overtimeSetting){
         return AjaxResult.success(overtimeSettingMapper.insert(overtimeSetting));
@@ -120,6 +125,7 @@
      * 鏇存柊鍔犵彮瑙勫垯
      * @return
      */
+    @Log(title = "鏇存柊鍔犵彮瑙勫垯", businessType = BusinessType.UPDATE)
     @PostMapping("/updateOvertimeSetting")
     public AjaxResult updateOvertimeSetting(@RequestBody OvertimeSetting overtimeSetting){
         return AjaxResult.success(overtimeSettingMapper.updateById(overtimeSetting));
@@ -128,6 +134,7 @@
      * 鍒犻櫎鍔犵彮瑙勫垯
      * @return
      */
+    @Log(title = "鍒犻櫎鍔犵彮瑙勫垯", businessType = BusinessType.DELETE)
     @DeleteMapping("/deleteOvertimeSetting")
     public AjaxResult deleteOvertimeSetting(@RequestBody List<Long> ids){
         if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
@@ -147,6 +154,7 @@
      * 澧炴坊鐝埗瑙勫垯
      * @return
      */
+    @Log(title = "澧炴坊鐝埗瑙勫垯", businessType = BusinessType.INSERT)
     @PostMapping("/addWorkingHoursSetting")
     public AjaxResult addWorkingHoursSetting(@RequestBody WorkingHoursSetting workingHoursSetting){
         return AjaxResult.success(workingHoursSettingMapper.insert(workingHoursSetting));
@@ -155,6 +163,7 @@
      * 鏇存柊鐝埗瑙勫垯
      * @return
      */
+    @Log(title = "鏇存柊鐝埗瑙勫垯", businessType = BusinessType.UPDATE)
     @PostMapping("/updateWorkingHoursSetting")
     public AjaxResult updateWorkingHoursSetting(@RequestBody WorkingHoursSetting workingHoursSetting){
         return AjaxResult.success(workingHoursSettingMapper.updateById(workingHoursSetting));
@@ -163,6 +172,7 @@
      * 鍒犻櫎鐝埗瑙勫垯
      * @return
      */
+    @Log(title = "鍒犻櫎鐝埗瑙勫垯", businessType = BusinessType.DELETE)
     @DeleteMapping("/deleteWorkingHoursSetting")
     public AjaxResult deleteWorkingHoursSetting(@RequestBody List<Long> ids){
         if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");

--
Gitblit v1.9.3