From 2dd645b5346f510d1207346347f1fa70a204d9d3 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 05 十一月 2026 16:11:34 +0800
Subject: [PATCH] 1. 完成项目管理全流程优化，补充阶段推进、汇报统计及生命周期记录。 2. 完成业务与项目数据关联，支持查看项目进度、详情及相关附件。 3. 完成采购审批流程接入，支持配置审批人员及采购业务审批。 4. 精简用户、角色、部门、菜单和字典，完善操作日志及附件下载。
---
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 3fc8d0f..eeeda2f 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -11,7 +11,7 @@
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.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.bean.dto.*;
import com.ruoyi.procurementrecord.mapper.CustomStorageMapper;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;
@@ -525,20 +525,20 @@
private final CustomStorageMapper customStorageMapper;
@Override
- public R<?> addCustom(List<CustomStorage> customStorage) {
+ public AjaxResult addCustom(List<CustomStorage> customStorage) {
LoginUser loginUser = SecurityUtils.getLoginUser();
if(CollectionUtils.isEmpty(customStorage)){
- return R.fail("鏁版嵁涓嶈兘涓虹┖");
+ return AjaxResult.error("鏁版嵁涓嶈兘涓虹┖");
}
customStorage.forEach(item -> {
// 鏌ヨ閲囪喘鍏ュ簱鏁伴噺
Long aLong = customStorageMapper.selectCount(null);
item.setInboundBatches(aLong.equals(0L) ? "绗�1鎵规(鑷畾涔夊叆搴�)" : "绗�"+ (aLong + 1) + "鎵规(鑷畾涔夊叆搴�)" );
item.setCreateBy(loginUser.getNickName());
- item.setCode(OrderUtils.countTodayByCreateTime(customStorageMapper, "", "code"));
+ item.setCode(OrderUtils.countTodayByCreateTime(customStorageMapper, "", "code", item.getCreateTime() != null ? item.getCreateTime() : LocalDateTime.now()));
customStorageMapper.insert(item);
});
- return R.ok(null, "鑷畾涔夊叆搴撴垚鍔�");
+ return AjaxResult.success("鑷畾涔夊叆搴撴垚鍔�");
}
@Override
@@ -716,13 +716,13 @@
}
@Override
- public R<?> updateCustom(CustomStorage customStorage) {
- return R.ok(customStorageMapper.updateById(customStorage));
+ public AjaxResult updateCustom(CustomStorage customStorage) {
+ return AjaxResult.success(customStorageMapper.updateById(customStorage));
}
@Override
- public R<?> deleteCustom(List<Long> ids) {
- return R.ok(customStorageMapper.deleteBatchIds(ids));
+ public AjaxResult deleteCustom(List<Long> ids) {
+ return AjaxResult.success(customStorageMapper.deleteBatchIds(ids));
}
@Override
--
Gitblit v1.9.3