From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对（未明确） 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检，抽检的话是抽多少百分比 6.供应商管理东西太少了，没有资质文件啊这些东西（是不是可以参考pro） 7.采购审批把人从李莹莹改成龙红星
---
src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java | 77 +++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java b/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java
index dfe6a7d..97abe9f 100644
--- a/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java
+++ b/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java
@@ -7,8 +7,7 @@
import com.ruoyi.approve.mapper.WorkingHoursSettingMapper;
import com.ruoyi.approve.pojo.*;
import com.ruoyi.approve.service.HolidaySettingsService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -18,7 +17,7 @@
@RestController
@RequestMapping("/holidaySettings")
@AllArgsConstructor
-public class HolidaySettingsController extends BaseController {
+public class HolidaySettingsController {
private HolidaySettingsService holidaySettingsService;
private AnnualLeaveSettingMapper annualLeaveSettingMapper;
private OvertimeSettingMapper overtimeSettingMapper;
@@ -29,70 +28,70 @@
* @return
*/
@GetMapping("/getList")
- public R<?> getList(@RequestParam(defaultValue = "1") long current,
+ public AjaxResult getList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "50") long size, HolidaySettings holidaySettings) {
Page page = new Page(current, size);
- return R.ok(holidaySettingsService.listpage(page,holidaySettings));
+ return AjaxResult.success(holidaySettingsService.listpage(page,holidaySettings));
}
/**銆�
* 澧炴坊
* @return
*/
@PostMapping("/add")
- public R<?> add(@RequestBody HolidaySettings holidaySettings){
- return R.ok(holidaySettingsService.save(holidaySettings));
+ public AjaxResult add(@RequestBody HolidaySettings holidaySettings){
+ return AjaxResult.success(holidaySettingsService.save(holidaySettings));
}
/**
* 鏇存柊
* @return
*/
@PostMapping("/update")
- public R<?> update(@RequestBody HolidaySettings holidaySettings){
- return R.ok(holidaySettingsService.updateById(holidaySettings));
+ public AjaxResult update(@RequestBody HolidaySettings holidaySettings){
+ return AjaxResult.success(holidaySettingsService.updateById(holidaySettings));
}
/**
* 鍒犻櫎
* @return
*/
@DeleteMapping("/delete")
- public R<?> delete(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(holidaySettingsService.removeByIds(ids));
+ public AjaxResult delete(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(holidaySettingsService.removeByIds(ids));
}
/**銆�
* 鑾峰彇骞村亣瑙勫垯鍒楄〃
* @return
*/
@GetMapping("/getAnnualLeaveSettingList")
- public R<?> getAnnualLeaveSettingList(@RequestParam(defaultValue = "1") long current,
+ public AjaxResult getAnnualLeaveSettingList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "50") long size, AnnualLeaveSetting annualLeaveSetting) {
Page page = new Page(current, size);
- return R.ok(annualLeaveSettingMapper.listPage(page,annualLeaveSetting));
+ return AjaxResult.success(annualLeaveSettingMapper.listPage(page,annualLeaveSetting));
}
/**銆�
* 澧炴坊骞村亣瑙勫垯
* @return
*/
@PostMapping("/addAnnualLeaveSetting")
- public R<?> addAnnualLeaveSetting(@RequestBody AnnualLeaveSetting annualLeaveSetting){
- return R.ok(annualLeaveSettingMapper.insert(annualLeaveSetting));
+ public AjaxResult addAnnualLeaveSetting(@RequestBody AnnualLeaveSetting annualLeaveSetting){
+ return AjaxResult.success(annualLeaveSettingMapper.insert(annualLeaveSetting));
}
/**銆�
* 鏇存柊骞村亣瑙勫垯
* @return
*/
@PostMapping("/updateAnnualLeaveSetting")
- public R<?> updateAnnualLeaveSetting(@RequestBody AnnualLeaveSetting annualLeaveSetting){
- return R.ok(annualLeaveSettingMapper.updateById(annualLeaveSetting));
+ public AjaxResult updateAnnualLeaveSetting(@RequestBody AnnualLeaveSetting annualLeaveSetting){
+ return AjaxResult.success(annualLeaveSettingMapper.updateById(annualLeaveSetting));
}
/**銆�
* 鍒犻櫎骞村亣瑙勫垯
* @return
*/
@DeleteMapping("/deleteAnnualLeaveSetting")
- public R<?> deleteAnnualLeaveSetting(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(annualLeaveSettingMapper.deleteBatchIds(ids));
+ public AjaxResult deleteAnnualLeaveSetting(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(annualLeaveSettingMapper.deleteBatchIds(ids));
}
/**銆�
@@ -100,70 +99,70 @@
* @return
*/
@GetMapping("/getOvertimeSettingList")
- public R<?> getOvertimeSettingList(@RequestParam(defaultValue = "1") long current,
+ public AjaxResult getOvertimeSettingList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "50") long size, OvertimeSetting overtimeSetting) {
Page page = new Page(current, size);
- return R.ok(overtimeSettingMapper.listPage(page,overtimeSetting));
+ return AjaxResult.success(overtimeSettingMapper.listPage(page,overtimeSetting));
}
/**銆�
* 澧炴坊鍔犵彮瑙勫垯
* @return
*/
@PostMapping("/addOvertimeSetting")
- public R<?> addOvertimeSetting(@RequestBody OvertimeSetting overtimeSetting){
- return R.ok(overtimeSettingMapper.insert(overtimeSetting));
+ public AjaxResult addOvertimeSetting(@RequestBody OvertimeSetting overtimeSetting){
+ return AjaxResult.success(overtimeSettingMapper.insert(overtimeSetting));
}
/**銆�
* 鏇存柊鍔犵彮瑙勫垯
* @return
*/
@PostMapping("/updateOvertimeSetting")
- public R<?> updateOvertimeSetting(@RequestBody OvertimeSetting overtimeSetting){
- return R.ok(overtimeSettingMapper.updateById(overtimeSetting));
+ public AjaxResult updateOvertimeSetting(@RequestBody OvertimeSetting overtimeSetting){
+ return AjaxResult.success(overtimeSettingMapper.updateById(overtimeSetting));
}
/**銆�
* 鍒犻櫎鍔犵彮瑙勫垯
* @return
*/
@DeleteMapping("/deleteOvertimeSetting")
- public R<?> deleteOvertimeSetting(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(overtimeSettingMapper.deleteBatchIds(ids));
+ public AjaxResult deleteOvertimeSetting(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(overtimeSettingMapper.deleteBatchIds(ids));
}
/**銆�
* 鑾峰彇涓婄彮鏃堕棿璁剧疆-鐝埗瑙勫垯鍒楄〃
* @return
*/
@GetMapping("/getWorkingHoursSettingList")
- public R<?> getWorkingHoursSettingList(@RequestParam(defaultValue = "1") long current,
+ public AjaxResult getWorkingHoursSettingList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "50") long size, WorkingHoursSetting workingHoursSetting) {
Page page = new Page(current, size);
- return R.ok(workingHoursSettingMapper.listPage(page,workingHoursSetting));
+ return AjaxResult.success(workingHoursSettingMapper.listPage(page,workingHoursSetting));
}
/**銆�
* 澧炴坊鐝埗瑙勫垯
* @return
*/
@PostMapping("/addWorkingHoursSetting")
- public R<?> addWorkingHoursSetting(@RequestBody WorkingHoursSetting workingHoursSetting){
- return R.ok(workingHoursSettingMapper.insert(workingHoursSetting));
+ public AjaxResult addWorkingHoursSetting(@RequestBody WorkingHoursSetting workingHoursSetting){
+ return AjaxResult.success(workingHoursSettingMapper.insert(workingHoursSetting));
}
/**銆�
* 鏇存柊鐝埗瑙勫垯
* @return
*/
@PostMapping("/updateWorkingHoursSetting")
- public R<?> updateWorkingHoursSetting(@RequestBody WorkingHoursSetting workingHoursSetting){
- return R.ok(workingHoursSettingMapper.updateById(workingHoursSetting));
+ public AjaxResult updateWorkingHoursSetting(@RequestBody WorkingHoursSetting workingHoursSetting){
+ return AjaxResult.success(workingHoursSettingMapper.updateById(workingHoursSetting));
}
/**銆�
* 鍒犻櫎鐝埗瑙勫垯
* @return
*/
@DeleteMapping("/deleteWorkingHoursSetting")
- public R<?> deleteWorkingHoursSetting(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(workingHoursSettingMapper.deleteBatchIds(ids));
+ public AjaxResult deleteWorkingHoursSetting(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(workingHoursSettingMapper.deleteBatchIds(ids));
}
--
Gitblit v1.9.3