From 34649fc363b989fac04b3e89648b6cbdaea4efc5 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 23 五月 2026 12:32:46 +0800
Subject: [PATCH] 出差时间增加开始时间和结束时间
---
src/main/java/com/ruoyi/basic/controller/SupplierManageController.java | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
index f1a45d1..1a58500 100644
--- a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
+++ b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
@@ -7,7 +7,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
@@ -29,9 +29,9 @@
* @return
*/
@PostMapping("/add")
- public R add(@RequestBody SupplierManage supplierManage) {
+ public AjaxResult add(@RequestBody SupplierManage supplierManage) {
supplierService.saveSupplier(supplierManage);
- return R.ok();
+ return AjaxResult.success();
}
/**
@@ -40,12 +40,12 @@
* @return
*/
@DeleteMapping("/del")
- public R delSupplier(@RequestBody List<Integer> ids) {
+ public AjaxResult delSupplier(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
supplierService.delSupplier(ids);
- return R.ok();
+ return AjaxResult.success();
}
/**
@@ -54,8 +54,8 @@
* @return
*/
@GetMapping("/{id}")
- public R supplierDetail(@PathVariable("id") Integer id) {
- return R.ok(supplierService.supplierDetail(id));
+ public AjaxResult supplierDetail(@PathVariable("id") Integer id) {
+ return AjaxResult.success(supplierService.supplierDetail(id));
}
/**
@@ -64,9 +64,9 @@
* @return
*/
@PostMapping("/update")
- public R update(@RequestBody SupplierManage supplierManage) {
+ public AjaxResult update(@RequestBody SupplierManage supplierManage) {
supplierService.supplierUpdate(supplierManage);
- return R.ok();
+ return AjaxResult.success();
}
/**
@@ -76,8 +76,8 @@
* @return
*/
@GetMapping("/listPage")
- public R supplierListPage(Page page, SupplierManageDto supplierManageDto) {
- return R.ok(supplierService.supplierListPage(page, supplierManageDto));
+ public AjaxResult supplierListPage(Page page, SupplierManageDto supplierManageDto) {
+ return AjaxResult.success(supplierService.supplierListPage(page, supplierManageDto));
}
/**
@@ -102,8 +102,12 @@
*/
@PostMapping("/import")
@Log(title = "渚涘簲鍟嗗鍏�", businessType = BusinessType.IMPORT)
- public R importData(MultipartFile file) throws Exception {
- return supplierService.importData(file);
+ public AjaxResult importData(MultipartFile file) {
+ Boolean b = supplierService.importData(file);
+ if (b) {
+ return AjaxResult.success("瀵煎叆鎴愬姛");
+ }
+ return AjaxResult.error("瀵煎叆澶辫触");
}
@@ -112,7 +116,7 @@
* @return
*/
@GetMapping("/getOptions")
- public R getOptions() {
- return R.ok(supplierService.list());
+ public AjaxResult getOptions() {
+ return AjaxResult.success(supplierService.list());
}
}
--
Gitblit v1.9.3