From 9ff5a9b1a3ce92b7bf4fcd3a8fdabbb1739cfe4b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 05 二月 2026 17:39:07 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java |   64 +++++++++++++++++++++++++++++--
 1 files changed, 59 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 7259405..c67d0bb 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
@@ -1,6 +1,5 @@
 package com.ruoyi.project.service.impl;
 
-import java.time.LocalDate;
 import java.time.ZoneId;
 import java.util.Date;
 import java.util.List;
@@ -8,16 +7,19 @@
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
 import com.ruoyi.project.common.CalculateDateUtils;
+import com.ruoyi.project.domain.vo.ServiceDonationwitnessVO;
+import com.ruoyi.project.domain.ServiceDonationwitnessorgan;
+import com.ruoyi.project.domain.vo.DonationwitnessBaseInfoVO;
 import com.ruoyi.project.domain.ServiceDonatebaseinfo;
-import com.ruoyi.project.domain.ServiceDonateorgan;
+import com.ruoyi.project.domain.dto.DonationwitnessBaseInfoDTO;
 import com.ruoyi.project.domain.vo.DonationWitnessVO;
 import com.ruoyi.project.domain.vo.TimeVO;
 import com.ruoyi.project.domain.vo.WitnessStatsVO;
 import com.ruoyi.project.mapper.ServiceDonatebaseinfoMapper;
-import com.ruoyi.project.mapper.ServiceDonateorganMapper;
+import com.ruoyi.project.mapper.ServiceDonationwitnessorganMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,7 +27,6 @@
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import java.util.ArrayList;
 import java.util.Map;
 
 import com.ruoyi.common.utils.StringUtils;
@@ -47,6 +48,9 @@
 
     @Autowired
     ServiceDonationwitnessMapper serviceDonationwitnessMapper;
+
+    @Autowired
+    ServiceDonationwitnessorganMapper serviceDonationwitnessorganMapper;
 
     @Autowired
     ServiceDonatebaseinfoMapper serviceDonatebaseinfoMapper;
@@ -81,6 +85,56 @@
     }
 
     @Override
+    public Boolean add(ServiceDonationwitnessVO serviceDonationwitnessVO) {
+        ServiceDonationwitness serviceDonationwitness = DtoConversionUtils.sourceToTarget(serviceDonationwitnessVO, ServiceDonationwitness.class);
+        boolean save = false;
+        if (ObjectUtils.isNotEmpty(serviceDonationwitness)) {
+            save = save(serviceDonationwitness);
+            if (save == true && ObjectUtils.isNotEmpty(serviceDonationwitnessVO.getServiceDonationwitnessorganList())) {
+                for (ServiceDonationwitnessorgan serviceDonationwitnessorgan : serviceDonationwitnessVO.getServiceDonationwitnessorganList()) {
+                    serviceDonationwitnessorgan.setDonationwitnessId(serviceDonationwitness.getId());
+                    serviceDonationwitnessorgan.setInfoid(serviceDonationwitness.getInfoid());
+                    serviceDonationwitnessorganMapper.insert(serviceDonationwitnessorgan);
+                }
+            }
+        }
+        return save;
+    }
+
+    @Override
+    public Boolean edit(ServiceDonationwitnessVO serviceDonationwitnessVO) {
+        ServiceDonationwitness serviceDonationwitness = DtoConversionUtils.sourceToTarget(serviceDonationwitnessVO, ServiceDonationwitness.class);
+        boolean update = false;
+        if (ObjectUtils.isNotEmpty(serviceDonationwitness)) {
+            update = updateById(serviceDonationwitness);
+        }
+
+        if (ObjectUtils.isNotEmpty(serviceDonationwitnessVO.getServiceDonationwitnessorganList())) {
+            for (ServiceDonationwitnessorgan serviceDonationwitnessorgan : serviceDonationwitnessVO.getServiceDonationwitnessorganList()) {
+                serviceDonationwitnessorganMapper.updateById(serviceDonationwitnessorgan);
+            }
+        }
+
+        return update;
+    }
+
+    @Override
+    public List<DonationwitnessBaseInfoDTO> getDonationwitnessBaseInfo(DonationwitnessBaseInfoVO donationwitnessBaseInfoVO) {
+        List<DonationwitnessBaseInfoDTO> donationwitnessBaseInfos = serviceDonationwitnessMapper.getDonationwitnessBaseInfo(donationwitnessBaseInfoVO);
+
+        //鑾峰彇鎵�鏈夊櫒瀹樹俊鎭�
+        if (!CollectionUtils.isEmpty(donationwitnessBaseInfos) && donationwitnessBaseInfoVO.getPageNum() != null) {
+            for (DonationwitnessBaseInfoDTO donationwitnessBaseInfoDTO : donationwitnessBaseInfos) {
+                ServiceDonationwitnessorgan serviceDonationwitnessorgan = new ServiceDonationwitnessorgan();
+                serviceDonationwitnessorgan.setInfoid(donationwitnessBaseInfoDTO.getInfoid());
+                List<ServiceDonationwitnessorgan> serviceDonationwitnessorgans = serviceDonationwitnessorganMapper.selectServiceDonationwitnessorganList(serviceDonationwitnessorgan);
+                donationwitnessBaseInfoDTO.setServiceDonationwitnessorgans(serviceDonationwitnessorgans);
+            }
+        }
+        return donationwitnessBaseInfos;
+    }
+
+    @Override
     public List<DonationWitnessVO> selectVOList(DonationWitnessVO donationWitnessVO) {
 
         SysUser user = SecurityUtils.getLoginUser().getUser();

--
Gitblit v1.9.3