From 459efae42264bd0de7f78a3c09c03b1aec2c5318 Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Wed, 29 Apr 2026 10:25:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/springblade/desk/order/pojo/vo/MoldDemandVo.java  | 5 +++++
 .../desk/dashboard/service/impl/DsPartServiceImpl.java    | 5 ++---
 .../desk/order/service/impl/MoldDemandServiceImpl.java    | 3 +++
 .../springblade/desk/order/wrapper/MoldDemandWrapper.java | 8 ++++++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldDemandVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldDemandVo.java
index b67557fa..0c97b1fa 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldDemandVo.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldDemandVo.java
@@ -60,4 +60,9 @@ public class MoldDemandVo extends MoldDemand {
 	 * 申报记录
 	 */
 	List<MoldApplyVo> nearlyApplyList;
+
+	/**
+	 * 关联订单数量
+	 */
+	Integer linkOrderNum;
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java
index 92545668..e7a716b3 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java
@@ -214,12 +214,12 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 
 	@Override
 	public DsPartEntity selectDsPartByPatCodeAndVersion(String partCode, String version) {
-		//查询最新版本号 对应的零件
+		// 查询最新版本号对应的零件
 		if (StringUtils.isEmpty(version)) {
 			List<DsPartVersionEntity> partVersionEntityList = partVersionService.selectByPartCode(partCode);
 			Optional<DsPartVersionEntity> maxEntity = partVersionEntityList.stream()
 					.filter(entity -> entity.getPartVersion() != null)
-					.max(Comparator.comparing(DsPartVersionEntity::getPartVersion));
+					.max(Comparator.comparingInt(entity -> Integer.parseInt(entity.getPartVersion())));
 
 			if (maxEntity.isPresent()) {
 				DsPartVersionEntity maxPartVersionEntity = maxEntity.get();
@@ -229,7 +229,6 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
 		}
 
 		DsPartEntity part = dsPartMapper.selectByPartCodeAndVersion(partCode, version);
-
 		return part;
 	}
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java
index c27b1e67..79a3067e 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java
@@ -46,6 +46,9 @@ public class MoldDemandServiceImpl extends BaseServiceImpl<MoldDemandMapper, Mol
 	public IPage<MoldDemand> selectPage(IPage<MoldDemand> page, MoldDemand entity) {
 		entity.setMafStatus(MoldDemandEnum.MAF_STATUS_CREATE.getCode());
 		List<MoldDemand> dataList = baseMapper.selectPage(page, entity);
+		for (MoldDemand moldDemand : dataList) {
+
+		}
 		return page.setRecords(dataList);
 	}
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldDemandWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldDemandWrapper.java
index 02ff673a..e4286136 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldDemandWrapper.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldDemandWrapper.java
@@ -1,5 +1,7 @@
 package org.springblade.desk.order.wrapper;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
@@ -9,6 +11,7 @@ import org.springblade.desk.order.pojo.vo.MoldDemandVo;
 import org.springblade.system.cache.UserCache;
 import org.springblade.system.pojo.entity.User;
 
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -34,6 +37,11 @@ public class MoldDemandWrapper extends BaseEntityWrapper<MoldDemand, MoldDemandV
 		vo.setStatusName(MoldDemandEnum.getName(entity.getStatus()));
 		vo.setMafStatusName(MoldDemandEnum.getName(entity.getMafStatus()));
 		vo.setMafTypeName(MoldDemandEnum.getName(entity.getMafType()));
+		String linkOrderIds = entity.getLinkOrderIds();
+
+		List<String> orderIdList = StrUtil.splitTrim(linkOrderIds, ',');
+		int count = CollUtil.isEmpty(orderIdList) ? 0 : orderIdList.size();
+		vo.setLinkOrderNum(count);
 		return vo;
 	}
 }