From e70592c8731df88028db03c98f1d210e8e686ce8 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 06 五月 2026 17:13:16 +0800
Subject: [PATCH] 查询捐献完成列表基本信息数据出错
---
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatecompletioninfoService.java | 2 +-
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonationwitnessService.java | 2 +-
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java | 6 +++---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java | 2 +-
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java | 4 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
index c46455d..dc209d3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
@@ -122,7 +122,7 @@
@RepeatSubmit(interval = 5000)
public AjaxResult add(@RequestBody ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
log.info("鏂板鎹愮尞瀹屾垚锛歿}", serviceDonatecompletioninfoVO);
- boolean save = serviceDonatecompletioninfoService.add(serviceDonatecompletioninfoVO);
+ long save = serviceDonatecompletioninfoService.add(serviceDonatecompletioninfoVO);
return AjaxResult.success(save);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
index f194905..6f2e4a9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
@@ -126,7 +126,7 @@
@PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonationwitnessVO serviceDonationwitnessVO) {
- boolean save = serviceDonationwitnessService.add(serviceDonationwitnessVO);
+ long save = serviceDonationwitnessService.add(serviceDonationwitnessVO);
log.info("鏂板鎹愮尞瑙佽瘉鏄惁鎴愬姛锛歿},id涓猴細{},infoId涓猴細{}", save, serviceDonationwitnessVO.getId(), serviceDonationwitnessVO.getInfoid());
return AjaxResult.success(save);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatecompletioninfoService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatecompletioninfoService.java
index ecb467a..89335c3 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatecompletioninfoService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatecompletioninfoService.java
@@ -27,7 +27,7 @@
*/
public List<ServiceDonatecompletioninfo> queryList(ServiceDonatecompletioninfo serviceDonatecompletioninfo);
- public boolean add(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO);
+ public long add(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO);
public boolean edit(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonationwitnessService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonationwitnessService.java
index 7cc5d7b..1eccd63 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonationwitnessService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonationwitnessService.java
@@ -30,7 +30,7 @@
public List<ServiceDonationwitness> selectServiceDonationwitnessList(ServiceDonationwitness serviceDonationwitness);
- public Boolean add(@RequestBody ServiceDonationwitnessVO serviceDonationwitnessVO);
+ public long add(@RequestBody ServiceDonationwitnessVO serviceDonationwitnessVO);
public Boolean edit(@RequestBody ServiceDonationwitnessVO serviceDonationwitnessVO);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java
index 3c3eb52..aea7af9 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java
@@ -81,7 +81,7 @@
}
@Override
- public boolean add(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
+ public long add(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
ServiceDonatecompletioninfo serviceDonatecompletioninfo = DtoConversionUtils.sourceToTarget(serviceDonatecompletioninfoVO, ServiceDonatecompletioninfo.class);
boolean b = false;
if (ObjectUtils.isNotEmpty(serviceDonatecompletioninfo)) {
@@ -94,7 +94,7 @@
}
}
}
- return b;
+ return serviceDonatecompletioninfo.getId();
}
@Override
@@ -117,7 +117,7 @@
public List<DonationCompletionBaseInfoDTO> getDonationCompletionBaseInfo(DonationCompletionBaseInfoVO donationCompletionBaseInfoVO) {
List<DonationCompletionBaseInfoDTO> donationCompletionBaseInfoDTOList = serviceDonatecompletioninfoMapper.getDonationCompletionBaseInfo(donationCompletionBaseInfoVO);
- if (CollectionUtils.isNotEmpty(donationCompletionBaseInfoDTOList) && donationCompletionBaseInfoVO.getPageNum() == null) {
+ if (CollectionUtils.isNotEmpty(donationCompletionBaseInfoDTOList) && donationCompletionBaseInfoVO.getPageNum() != null) {
for (DonationCompletionBaseInfoDTO donationCompletionBaseInfoDTO : donationCompletionBaseInfoDTOList) {
ServiceDonatecomporgan serviceDonatecomporgan = new ServiceDonatecomporgan();
serviceDonatecomporgan.setInfoid(donationCompletionBaseInfoDTO.getInfoid());
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java
index cf78d3d..e632005 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java
@@ -86,7 +86,7 @@
}
@Override
- public Boolean add(ServiceDonationwitnessVO serviceDonationwitnessVO) {
+ public long add(ServiceDonationwitnessVO serviceDonationwitnessVO) {
ServiceDonationwitness serviceDonationwitness = DtoConversionUtils.sourceToTarget(serviceDonationwitnessVO, ServiceDonationwitness.class);
boolean save = false;
if (ObjectUtils.isNotEmpty(serviceDonationwitness)) {
@@ -99,7 +99,7 @@
}
}
}
- return save;
+ return serviceDonationwitness.getId();
}
@Override
--
Gitblit v1.9.3