From 0bb9f6c3e894e56ff58d335110fbe4cfa87b64b2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 28 一月 2026 14:17:19 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 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..bb3bde1 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,17 @@
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.project.common.CalculateDateUtils;
+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 +25,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 +46,9 @@
@Autowired
ServiceDonationwitnessMapper serviceDonationwitnessMapper;
+
+ @Autowired
+ ServiceDonationwitnessorganMapper serviceDonationwitnessorganMapper;
@Autowired
ServiceDonatebaseinfoMapper serviceDonatebaseinfoMapper;
@@ -81,6 +83,22 @@
}
@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