From a9389e50d306a05565dfb869cc907638d91fa7c7 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 10 七月 2026 14:39:11 +0800
Subject: [PATCH] 器官分配，器官利用子表删除统一
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java | 78 +++++++++++++++++++++++++++++++++++---
1 files changed, 71 insertions(+), 7 deletions(-)
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 453f215..4759017 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
@@ -8,12 +8,17 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.ServiceDonatecomporgan;
import com.ruoyi.project.domain.ServiceDonationwitness;
+import com.ruoyi.project.domain.dto.DonationCompletionBaseInfoDTO;
+import com.ruoyi.project.domain.dto.ServiceDonatecompletioninfoDTO;
+import com.ruoyi.project.domain.vo.DonationCompletionBaseInfoVO;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
+import com.ruoyi.project.domain.vo.ServiceDonatecompletioninfoVO;
import com.ruoyi.project.mapper.ServiceDonatecompletioninfoMapper;
import com.ruoyi.project.mapper.ServiceDonationwitnessMapper;
import com.ruoyi.project.service.IServiceDonatecompletioninfoService;
@@ -75,6 +80,63 @@
return this.list(wrappers);
}
+ @Override
+ public long add(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
+ ServiceDonatecompletioninfo serviceDonatecompletioninfo = DtoConversionUtils.sourceToTarget(serviceDonatecompletioninfoVO, ServiceDonatecompletioninfo.class);
+ boolean b = false;
+ if (ObjectUtils.isNotEmpty(serviceDonatecompletioninfo)) {
+ b = this.save(serviceDonatecompletioninfo);
+ if (b == true && CollectionUtils.isNotEmpty(serviceDonatecompletioninfoVO.getServiceDonatecomporganList())) {
+ for (ServiceDonatecomporgan serviceDonatecomporgan : serviceDonatecompletioninfoVO.getServiceDonatecomporganList()) {
+ serviceDonatecomporgan.setInfoid(serviceDonatecompletioninfo.getInfoid());
+ serviceDonatecomporgan.setDonatecompletioninfoId(serviceDonatecompletioninfo.getId());
+ serviceDonatecomporganService.save(serviceDonatecomporgan);
+ }
+ }
+ }
+ return serviceDonatecompletioninfo.getId();
+ }
+
+ @Override
+ public boolean edit(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
+ ServiceDonatecompletioninfo serviceDonatecompletioninfo = DtoConversionUtils.sourceToTarget(serviceDonatecompletioninfoVO, ServiceDonatecompletioninfo.class);
+ boolean b = false;
+ if (ObjectUtils.isNotEmpty(serviceDonatecompletioninfo)) {
+ b = this.updateById(serviceDonatecompletioninfo);
+ }
+ if (CollectionUtils.isNotEmpty(serviceDonatecompletioninfoVO.getServiceDonatecomporganList())) {
+ for (ServiceDonatecomporgan serviceDonatecomporgan : serviceDonatecompletioninfoVO.getServiceDonatecomporganList()) {
+ if (ObjectUtils.isNotEmpty(serviceDonatecomporgan.getId())) {
+ if (ObjectUtils.isNotEmpty(serviceDonatecomporgan.getDelFlag()) && serviceDonatecomporgan.getDelFlag() == 1) {
+ serviceDonatecomporganService.getById(serviceDonatecomporgan.getId());
+ } else {
+ serviceDonatecomporganService.updateById(serviceDonatecomporgan);
+ }
+ } else{
+ serviceDonatecomporganService.updateById(serviceDonatecomporgan);
+ }
+ }
+ }
+
+ return b;
+ }
+
+ @Override
+ public List<DonationCompletionBaseInfoDTO> getDonationCompletionBaseInfo(DonationCompletionBaseInfoVO donationCompletionBaseInfoVO) {
+ List<DonationCompletionBaseInfoDTO> donationCompletionBaseInfoDTOList = serviceDonatecompletioninfoMapper.getDonationCompletionBaseInfo(donationCompletionBaseInfoVO);
+
+ if (CollectionUtils.isNotEmpty(donationCompletionBaseInfoDTOList) && donationCompletionBaseInfoVO.getPageNum() != null) {
+ for (DonationCompletionBaseInfoDTO donationCompletionBaseInfoDTO : donationCompletionBaseInfoDTOList) {
+ ServiceDonatecomporgan serviceDonatecomporgan = new ServiceDonatecomporgan();
+ serviceDonatecomporgan.setInfoid(donationCompletionBaseInfoDTO.getInfoid());
+ List<ServiceDonatecomporgan> serviceDonatecomporgans = serviceDonatecomporganService.queryList(serviceDonatecomporgan);
+ donationCompletionBaseInfoDTO.setServiceDonatecomporganList(serviceDonatecomporgans);
+ }
+ }
+
+ return donationCompletionBaseInfoDTOList;
+ }
+
/**
* 鏆傛椂鍏堜笉鐢ㄤ簡
*
@@ -82,7 +144,7 @@
* @return
*/
@Override
- public List<ServiceDonatecompletioninfo> queryListDetail(ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
+ public List<ServiceDonatecompletioninfoDTO> queryListDetail(ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
LambdaQueryWrapper<ServiceDonatecompletioninfo> wrappers = Wrappers.lambdaQuery();
if (StringUtils.isNotBlank(serviceDonatecompletioninfo.getDonorno())) {
wrappers.eq(ServiceDonatecompletioninfo::getDonorno, serviceDonatecompletioninfo.getDonorno());
@@ -100,19 +162,21 @@
wrappers.eq(ServiceDonatecompletioninfo::getInfoid, serviceDonatecompletioninfo.getInfoid());
}
List<ServiceDonatecompletioninfo> serviceDonatecompletioninfoList = this.list(wrappers);
- if (CollectionUtils.isNotEmpty(serviceDonatecompletioninfoList)) {
- for (ServiceDonatecompletioninfo serviceDonatecompletioninfo1 : serviceDonatecompletioninfoList) {
- if (serviceDonatecompletioninfo1.getInfoid() != null) {
+
+ List<ServiceDonatecompletioninfoDTO> serviceDonatecompletioninfoDTOList = DtoConversionUtils.sourceToTarget(serviceDonatecompletioninfoList, ServiceDonatecompletioninfoDTO.class);
+ if (CollectionUtils.isNotEmpty(serviceDonatecompletioninfoDTOList)) {
+ for (ServiceDonatecompletioninfoDTO serviceDonatecompletioninfoDTO : serviceDonatecompletioninfoDTOList) {
+ if (serviceDonatecompletioninfoDTO.getInfoid() != null) {
ServiceDonatecomporgan serviceDonatecomporgan = new ServiceDonatecomporgan();
- serviceDonatecomporgan.setInfoid(serviceDonatecompletioninfo1.getInfoid());
+ serviceDonatecomporgan.setInfoid(serviceDonatecompletioninfoDTO.getInfoid());
List<ServiceDonatecomporgan> serviceDonatecomporgans = serviceDonatecomporganService.queryList(serviceDonatecomporgan);
- serviceDonatecompletioninfo1.setServiceDonatecomporganList(serviceDonatecomporgans);
+ serviceDonatecompletioninfoDTO.setServiceDonatecomporganList(serviceDonatecomporgans);
}
}
}
- return this.list(wrappers);
+ return serviceDonatecompletioninfoDTOList;
}
--
Gitblit v1.9.3