From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java | 77 +++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java b/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java
index 97abe9f..dfe6a7d 100644
--- a/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java
+++ b/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java
@@ -7,7 +7,8 @@
import com.ruoyi.approve.mapper.WorkingHoursSettingMapper;
import com.ruoyi.approve.pojo.*;
import com.ruoyi.approve.service.HolidaySettingsService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -17,7 +18,7 @@
@RestController
@RequestMapping("/holidaySettings")
@AllArgsConstructor
-public class HolidaySettingsController {
+public class HolidaySettingsController extends BaseController {
private HolidaySettingsService holidaySettingsService;
private AnnualLeaveSettingMapper annualLeaveSettingMapper;
private OvertimeSettingMapper overtimeSettingMapper;
@@ -28,70 +29,70 @@
* @return
*/
@GetMapping("/getList")
- public AjaxResult getList(@RequestParam(defaultValue = "1") long current,
+ public R<?> getList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "50") long size, HolidaySettings holidaySettings) {
Page page = new Page(current, size);
- return AjaxResult.success(holidaySettingsService.listpage(page,holidaySettings));
+ return R.ok(holidaySettingsService.listpage(page,holidaySettings));
}
/**銆�
* 澧炴坊
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody HolidaySettings holidaySettings){
- return AjaxResult.success(holidaySettingsService.save(holidaySettings));
+ public R<?> add(@RequestBody HolidaySettings holidaySettings){
+ return R.ok(holidaySettingsService.save(holidaySettings));
}
/**
* 鏇存柊
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody HolidaySettings holidaySettings){
- return AjaxResult.success(holidaySettingsService.updateById(holidaySettings));
+ public R<?> update(@RequestBody HolidaySettings holidaySettings){
+ return R.ok(holidaySettingsService.updateById(holidaySettings));
}
/**
* 鍒犻櫎
* @return
*/
@DeleteMapping("/delete")
- public AjaxResult delete(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(holidaySettingsService.removeByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(holidaySettingsService.removeByIds(ids));
}
/**銆�
* 鑾峰彇骞村亣瑙勫垯鍒楄〃
* @return
*/
@GetMapping("/getAnnualLeaveSettingList")
- public AjaxResult getAnnualLeaveSettingList(@RequestParam(defaultValue = "1") long current,
+ public R<?> getAnnualLeaveSettingList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "50") long size, AnnualLeaveSetting annualLeaveSetting) {
Page page = new Page(current, size);
- return AjaxResult.success(annualLeaveSettingMapper.listPage(page,annualLeaveSetting));
+ return R.ok(annualLeaveSettingMapper.listPage(page,annualLeaveSetting));
}
/**銆�
* 澧炴坊骞村亣瑙勫垯
* @return
*/
@PostMapping("/addAnnualLeaveSetting")
- public AjaxResult addAnnualLeaveSetting(@RequestBody AnnualLeaveSetting annualLeaveSetting){
- return AjaxResult.success(annualLeaveSettingMapper.insert(annualLeaveSetting));
+ public R<?> addAnnualLeaveSetting(@RequestBody AnnualLeaveSetting annualLeaveSetting){
+ return R.ok(annualLeaveSettingMapper.insert(annualLeaveSetting));
}
/**銆�
* 鏇存柊骞村亣瑙勫垯
* @return
*/
@PostMapping("/updateAnnualLeaveSetting")
- public AjaxResult updateAnnualLeaveSetting(@RequestBody AnnualLeaveSetting annualLeaveSetting){
- return AjaxResult.success(annualLeaveSettingMapper.updateById(annualLeaveSetting));
+ public R<?> updateAnnualLeaveSetting(@RequestBody AnnualLeaveSetting annualLeaveSetting){
+ return R.ok(annualLeaveSettingMapper.updateById(annualLeaveSetting));
}
/**銆�
* 鍒犻櫎骞村亣瑙勫垯
* @return
*/
@DeleteMapping("/deleteAnnualLeaveSetting")
- public AjaxResult deleteAnnualLeaveSetting(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(annualLeaveSettingMapper.deleteBatchIds(ids));
+ public R<?> deleteAnnualLeaveSetting(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(annualLeaveSettingMapper.deleteBatchIds(ids));
}
/**銆�
@@ -99,70 +100,70 @@
* @return
*/
@GetMapping("/getOvertimeSettingList")
- public AjaxResult getOvertimeSettingList(@RequestParam(defaultValue = "1") long current,
+ public R<?> getOvertimeSettingList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "50") long size, OvertimeSetting overtimeSetting) {
Page page = new Page(current, size);
- return AjaxResult.success(overtimeSettingMapper.listPage(page,overtimeSetting));
+ return R.ok(overtimeSettingMapper.listPage(page,overtimeSetting));
}
/**銆�
* 澧炴坊鍔犵彮瑙勫垯
* @return
*/
@PostMapping("/addOvertimeSetting")
- public AjaxResult addOvertimeSetting(@RequestBody OvertimeSetting overtimeSetting){
- return AjaxResult.success(overtimeSettingMapper.insert(overtimeSetting));
+ public R<?> addOvertimeSetting(@RequestBody OvertimeSetting overtimeSetting){
+ return R.ok(overtimeSettingMapper.insert(overtimeSetting));
}
/**銆�
* 鏇存柊鍔犵彮瑙勫垯
* @return
*/
@PostMapping("/updateOvertimeSetting")
- public AjaxResult updateOvertimeSetting(@RequestBody OvertimeSetting overtimeSetting){
- return AjaxResult.success(overtimeSettingMapper.updateById(overtimeSetting));
+ public R<?> updateOvertimeSetting(@RequestBody OvertimeSetting overtimeSetting){
+ return R.ok(overtimeSettingMapper.updateById(overtimeSetting));
}
/**銆�
* 鍒犻櫎鍔犵彮瑙勫垯
* @return
*/
@DeleteMapping("/deleteOvertimeSetting")
- public AjaxResult deleteOvertimeSetting(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(overtimeSettingMapper.deleteBatchIds(ids));
+ public R<?> deleteOvertimeSetting(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(overtimeSettingMapper.deleteBatchIds(ids));
}
/**銆�
* 鑾峰彇涓婄彮鏃堕棿璁剧疆-鐝埗瑙勫垯鍒楄〃
* @return
*/
@GetMapping("/getWorkingHoursSettingList")
- public AjaxResult getWorkingHoursSettingList(@RequestParam(defaultValue = "1") long current,
+ public R<?> getWorkingHoursSettingList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "50") long size, WorkingHoursSetting workingHoursSetting) {
Page page = new Page(current, size);
- return AjaxResult.success(workingHoursSettingMapper.listPage(page,workingHoursSetting));
+ return R.ok(workingHoursSettingMapper.listPage(page,workingHoursSetting));
}
/**銆�
* 澧炴坊鐝埗瑙勫垯
* @return
*/
@PostMapping("/addWorkingHoursSetting")
- public AjaxResult addWorkingHoursSetting(@RequestBody WorkingHoursSetting workingHoursSetting){
- return AjaxResult.success(workingHoursSettingMapper.insert(workingHoursSetting));
+ public R<?> addWorkingHoursSetting(@RequestBody WorkingHoursSetting workingHoursSetting){
+ return R.ok(workingHoursSettingMapper.insert(workingHoursSetting));
}
/**銆�
* 鏇存柊鐝埗瑙勫垯
* @return
*/
@PostMapping("/updateWorkingHoursSetting")
- public AjaxResult updateWorkingHoursSetting(@RequestBody WorkingHoursSetting workingHoursSetting){
- return AjaxResult.success(workingHoursSettingMapper.updateById(workingHoursSetting));
+ public R<?> updateWorkingHoursSetting(@RequestBody WorkingHoursSetting workingHoursSetting){
+ return R.ok(workingHoursSettingMapper.updateById(workingHoursSetting));
}
/**銆�
* 鍒犻櫎鐝埗瑙勫垯
* @return
*/
@DeleteMapping("/deleteWorkingHoursSetting")
- public AjaxResult deleteWorkingHoursSetting(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(workingHoursSettingMapper.deleteBatchIds(ids));
+ public R<?> deleteWorkingHoursSetting(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(workingHoursSettingMapper.deleteBatchIds(ids));
}
--
Gitblit v1.9.3