From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
index 1e31842..3fc8d0f 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -11,8 +11,8 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.procurementrecord.dto.*;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.procurementrecord.bean.dto.*;
import com.ruoyi.procurementrecord.mapper.CustomStorageMapper;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper;
@@ -31,7 +31,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -525,10 +525,10 @@
private final CustomStorageMapper customStorageMapper;
@Override
- public AjaxResult addCustom(List<CustomStorage> customStorage) {
+ public R<?> addCustom(List<CustomStorage> customStorage) {
LoginUser loginUser = SecurityUtils.getLoginUser();
if(CollectionUtils.isEmpty(customStorage)){
- return AjaxResult.error("鏁版嵁涓嶈兘涓虹┖");
+ return R.fail("鏁版嵁涓嶈兘涓虹┖");
}
customStorage.forEach(item -> {
// 鏌ヨ閲囪喘鍏ュ簱鏁伴噺
@@ -538,7 +538,7 @@
item.setCode(OrderUtils.countTodayByCreateTime(customStorageMapper, "", "code"));
customStorageMapper.insert(item);
});
- return AjaxResult.success("鑷畾涔夊叆搴撴垚鍔�");
+ return R.ok(null, "鑷畾涔夊叆搴撴垚鍔�");
}
@Override
@@ -716,13 +716,13 @@
}
@Override
- public AjaxResult updateCustom(CustomStorage customStorage) {
- return AjaxResult.success(customStorageMapper.updateById(customStorage));
+ public R<?> updateCustom(CustomStorage customStorage) {
+ return R.ok(customStorageMapper.updateById(customStorage));
}
@Override
- public AjaxResult deleteCustom(List<Long> ids) {
- return AjaxResult.success(customStorageMapper.deleteBatchIds(ids));
+ public R<?> deleteCustom(List<Long> ids) {
+ return R.ok(customStorageMapper.deleteBatchIds(ids));
}
@Override
--
Gitblit v1.9.3