From fbb676a64c65b2875de696fff76d936ff1000149 Mon Sep 17 00:00:00 2001
From: liweidong-hj <liweidong-hj@huafang.com>
Date: Tue, 9 Jun 2026 16:16:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/entity/DsMoldChangeEntity.java       |  4 +--
 .../dashboard/pojo/vo/DsMoldChangeVO.java     |  5 ++++
 .../dashboard/mapper/MoldChangeMapper.xml     |  1 +
 .../service/impl/DsMoldChangeServiceImpl.java | 26 +++++++++++++++++++
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsMoldChangeEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsMoldChangeEntity.java
index c7029dd7f..6ba383183 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsMoldChangeEntity.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsMoldChangeEntity.java
@@ -63,13 +63,13 @@ public class DsMoldChangeEntity extends BaseEntity {
 	/**
 	 * 变更类型：1.新图 2.变更
 	 */
-	@Schema(description = "变更类型：1.新图 2.变更")
+	@Schema(description = "变更类型：1001.新图 1002.变更")
 	private Integer changeType;
 
 	/**
 	 * 处理方式：1.模具布置 2.库存报废
 	 */
-	@Schema(description = "处理方式：1.模具布置 2.库存报废")
+	@Schema(description = "处理方式：2001.模具布置 2002.库存报废")
 	private String processMode;
 
 	/**
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsMoldChangeVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsMoldChangeVO.java
index d1e6eb036..c751fca12 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsMoldChangeVO.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsMoldChangeVO.java
@@ -53,4 +53,9 @@ public class DsMoldChangeVO extends DsMoldChangeEntity {
 	 */
 	private String processModeStr;
 
+	/**
+	 * 维护人
+	 */
+	private String createUserStr;
+
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/MoldChangeMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/MoldChangeMapper.xml
index 74f218aea..d46ad9d5c 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/MoldChangeMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/MoldChangeMapper.xml
@@ -8,6 +8,7 @@
         <if test="moldChange.partCode != null and moldChange.partCode != ''">
             AND PART_CODE LIKE '%' || #{moldChange.partCode} || '%'
         </if>
+        order by update_time desc
     </select>
 
 </mapper>
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsMoldChangeServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsMoldChangeServiceImpl.java
index 331849cec..68ed4dfe6 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsMoldChangeServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsMoldChangeServiceImpl.java
@@ -28,12 +28,19 @@ package org.springblade.desk.dashboard.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jodd.util.StringPool;
 import jodd.util.StringUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.dashboard.mapper.DsMoldChangeMapper;
 import org.springblade.desk.dashboard.pojo.entity.DsMoldChangeEntity;
 import org.springblade.desk.dashboard.pojo.enums.DsMoldChangeEnum;
 import org.springblade.desk.dashboard.pojo.vo.DsMoldChangeVO;
 import org.springblade.desk.dashboard.service.IDsMoldChangeService;
+import org.springblade.system.feign.IUserClient;
+import org.springblade.system.pojo.entity.User;
+import org.springblade.system.pojo.entity.UserInfo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
@@ -47,8 +54,11 @@ import java.util.stream.Collectors;
  * @author BladeX
  * @since 2025-11-12
  */
+@Slf4j
 @Service
 public class DsMoldChangeServiceImpl extends BaseServiceImpl<DsMoldChangeMapper, DsMoldChangeEntity> implements IDsMoldChangeService {
+    @Autowired
+    IUserClient userClient;
 
     @Override
     public IPage<DsMoldChangeVO> selectDsMoldChangePage(IPage<DsMoldChangeVO> page, DsMoldChangeVO moldChange) {
@@ -70,6 +80,22 @@ public class DsMoldChangeServiceImpl extends BaseServiceImpl<DsMoldChangeMapper,
                         .collect(Collectors.joining("、"));
                 dsMoldChangeVO.setProcessModeStr(processModeStr);
             }
+
+            if(null != dsMoldChangeVO.getCreateUser()){
+                // 安全获取用户名称
+                try {
+                    R<UserInfo> userInfoR = userClient.userInfo(Func.toLong(dsMoldChangeVO.getCreateUser()));
+                    if (userInfoR != null && userInfoR.getData() != null) {
+                        User user = userInfoR.getData().getUser();
+                        if (user != null) {
+                            dsMoldChangeVO.setCreateUserStr(user.getName());
+                        }
+                    }
+                } catch (Exception e) {
+                    log.error("获取用户信息失败, userId: {}", dsMoldChangeVO.getCreateUser(), e);
+                }
+
+            }
         }
         return page.setRecords(moldChangeList);
     }