From a5e77720f3badb0cb1f2998a34607c759b07f7c1 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期六, 01 八月 2026 11:46:30 +0800
Subject: [PATCH] 器管获取附件新增infoId过滤条件
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
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 c67d0bb..1257d59 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
@@ -10,6 +10,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.common.CalculateDateUtils;
+import com.ruoyi.project.domain.ServiceMedicalevaluationorgan;
import com.ruoyi.project.domain.vo.ServiceDonationwitnessVO;
import com.ruoyi.project.domain.ServiceDonationwitnessorgan;
import com.ruoyi.project.domain.vo.DonationwitnessBaseInfoVO;
@@ -70,6 +71,9 @@
if (StringUtils.isNotBlank(serviceDonationwitness.getDonorno())) {
wrappers.eq(ServiceDonationwitness::getDonorno, serviceDonationwitness.getDonorno());
}
+ if (ObjectUtils.isNotEmpty(serviceDonationwitness.getInfoid())) {
+ wrappers.eq(ServiceDonationwitness::getInfoid, serviceDonationwitness.getInfoid());
+ }
if (StringUtils.isNotBlank(serviceDonationwitness.getGainhospitalname())) {
wrappers.like(ServiceDonationwitness::getGainhospitalname, serviceDonationwitness.getGainhospitalname());
}
@@ -85,7 +89,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)) {
@@ -98,20 +102,40 @@
}
}
}
- return save;
+ return serviceDonationwitness.getId();
}
@Override
public Boolean edit(ServiceDonationwitnessVO serviceDonationwitnessVO) {
ServiceDonationwitness serviceDonationwitness = DtoConversionUtils.sourceToTarget(serviceDonationwitnessVO, ServiceDonationwitness.class);
boolean update = false;
- if (ObjectUtils.isNotEmpty(serviceDonationwitness)) {
+
+ if (serviceDonationwitness.getDelFlag() != null && serviceDonationwitness.getDelFlag() == 1) {
+ update = removeById(serviceDonationwitness);
+ } else {
update = updateById(serviceDonationwitness);
}
- if (ObjectUtils.isNotEmpty(serviceDonationwitnessVO.getServiceDonationwitnessorganList())) {
+ if (update && !CollectionUtils.isEmpty(serviceDonationwitnessVO.getServiceDonationwitnessorganList())) {
for (ServiceDonationwitnessorgan serviceDonationwitnessorgan : serviceDonationwitnessVO.getServiceDonationwitnessorganList()) {
- serviceDonationwitnessorganMapper.updateById(serviceDonationwitnessorgan);
+ // 濡傛灉鐖惰妭鐐硅鍒犻櫎锛屽瓙鑺傜偣涔熻鍏ㄥ垹闄�
+ if (serviceDonationwitness.getDelFlag() != null && serviceDonationwitness.getDelFlag() == 1) {
+ serviceDonationwitnessorgan.setDelFlag(1);
+ }
+
+ //鍒ゆ柇鍒犻櫎杩樻槸淇敼
+ if (serviceDonationwitnessorgan.getDelFlag() != null && serviceDonationwitnessorgan.getDelFlag() == 1) {
+ serviceDonationwitnessorganMapper.deleteById(serviceDonationwitnessorgan.getId());
+ } else {
+ serviceDonationwitnessorganMapper.updateById(serviceDonationwitnessorgan);
+ }
+
+ //濡傛灉ID涓虹┖锛屽垯鏄柊澧�
+ if (serviceDonationwitnessorgan.getId() == null) {
+ serviceDonationwitnessorgan.setInfoid(serviceDonationwitness.getInfoid());
+ serviceDonationwitnessorgan.setDonationwitnessId(serviceDonationwitness.getId());
+ serviceDonationwitnessorganMapper.insert(serviceDonationwitnessorgan);
+ }
}
}
@@ -127,6 +151,7 @@
for (DonationwitnessBaseInfoDTO donationwitnessBaseInfoDTO : donationwitnessBaseInfos) {
ServiceDonationwitnessorgan serviceDonationwitnessorgan = new ServiceDonationwitnessorgan();
serviceDonationwitnessorgan.setInfoid(donationwitnessBaseInfoDTO.getInfoid());
+ serviceDonationwitnessorgan.setDelFlag(0);
List<ServiceDonationwitnessorgan> serviceDonationwitnessorgans = serviceDonationwitnessorganMapper.selectServiceDonationwitnessorganList(serviceDonationwitnessorgan);
donationwitnessBaseInfoDTO.setServiceDonationwitnessorgans(serviceDonationwitnessorgans);
}
--
Gitblit v1.9.3