From ac07f8eb085374d43777eacb144d2660b5445e26 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 21 Jan 2026 15:53:27 +0800
Subject: [PATCH] 处理Vo,Dto继承entity问题

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdSupplyDemandAuditServiceImpl.java |   25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdSupplyDemandAuditServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdSupplyDemandAuditServiceImpl.java
index 00010a0..04ab9d1 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdSupplyDemandAuditServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdSupplyDemandAuditServiceImpl.java
@@ -25,12 +25,10 @@
 import org.sxkj.gd.orderdata.mapper.GdSupplyDemandAuditMapper;
 import org.sxkj.gd.orderdata.service.IGdSupplyDemandAuditService;
 import org.sxkj.gd.orderdata.vo.GdSupplyDemandAuditVO;
-import org.sxkj.gd.orderdata.wrapper.GdSupplyDemandAuditWrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 供需需求审核记录表 服务实现类
@@ -39,20 +37,22 @@
  * @since 2026-01-16
  */
 @Service
-public class GdSupplyDemandAuditServiceImpl extends BaseServiceImpl<GdSupplyDemandAuditMapper, GdSupplyDemandAuditEntity> implements IGdSupplyDemandAuditService {
+public class GdSupplyDemandAuditServiceImpl extends
+		BaseServiceImpl<GdSupplyDemandAuditMapper, GdSupplyDemandAuditEntity> implements IGdSupplyDemandAuditService {
 
 	@Override
-	public IPage<GdSupplyDemandAuditVO> selectGdSupplyDemandAuditPage(IPage<GdSupplyDemandAuditVO> page, GdSupplyDemandAuditVO gdSupplyDemandAudit) {
+	public IPage<GdSupplyDemandAuditVO> selectGdSupplyDemandAuditPage(IPage<GdSupplyDemandAuditVO> page,
+			GdSupplyDemandAuditVO gdSupplyDemandAudit) {
 		return page.setRecords(baseMapper.selectGdSupplyDemandAuditPage(page, gdSupplyDemandAudit));
 	}
-
 
 	@Override
 	public List<GdSupplyDemandAuditExcel> exportGdSupplyDemandAudit(Wrapper<GdSupplyDemandAuditEntity> queryWrapper) {
 		List<GdSupplyDemandAuditExcel> gdSupplyDemandAuditList = baseMapper.exportGdSupplyDemandAudit(queryWrapper);
-		//gdSupplyDemandAuditList.forEach(gdSupplyDemandAudit -> {
-		//	gdSupplyDemandAudit.setTypeName(DictCache.getValue(DictEnum.YES_NO, GdSupplyDemandAudit.getType()));
-		//});
+		// gdSupplyDemandAuditList.forEach(gdSupplyDemandAudit -> {
+		// gdSupplyDemandAudit.setTypeName(DictCache.getValue(DictEnum.YES_NO,
+		// GdSupplyDemandAudit.getType()));
+		// });
 		return gdSupplyDemandAuditList;
 	}
 
@@ -66,14 +66,11 @@
 		if (demandId == null) {
 			throw new ServiceException("需求编号不能为空");
 		}
-		List<GdSupplyDemandAuditEntity> entities = baseMapper.selectSupplyDemandAuditList(demandId);
-		if (Func.isEmpty(entities)) {
+		List<GdSupplyDemandAuditVO> voList = baseMapper.selectSupplyDemandAuditList(demandId);
+		if (Func.isEmpty(voList)) {
 			return java.util.Collections.emptyList();
 		}
-		GdSupplyDemandAuditWrapper wrapper = GdSupplyDemandAuditWrapper.build();
-		return entities.stream()
-			.map(wrapper::entityVO)
-			.collect(Collectors.toList());
+		return voList;
 	}
 
 }

--
Gitblit v1.9.3