From d7b6a374543ec1f1363813382c4f3a0c6fdb8437 Mon Sep 17 00:00:00 2001
From: pangyang <475446853@qq.com>
Date: Fri, 27 Mar 2026 11:08:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BE=E6=89=8B=E5=85=8D=E8=B4=A3=E5=92=8C?=
 =?UTF-8?q?=E6=A7=BD=E6=B6=B2=E7=94=9F=E6=88=90=E6=9B=B2=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/quality/pojo/entity/RaiseHand.java        |  8 ++++++++
 .../controller/LiquidTankTaskCopyController.java   | 14 ++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHand.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHand.java
index 42e51c4b..3aa6f174 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHand.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHand.java
@@ -34,6 +34,14 @@ public class RaiseHand extends BaseEntity {
 	@Schema(description = "提出人")
 	private Long reportUserId;
 	private String reportUserName;
+
+	/**
+	 * 工艺员
+	 */
+	@Schema(description = "工艺员")
+	private Long processUserId;
+	private String processUserName;
+
 	/**
 	 * 岗位
 	 */
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java
index f782ff28..0590404b 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java
@@ -310,7 +310,8 @@ public class LiquidTankTaskCopyController extends BladeController {
         // value: 任务数据列表
         Map<String, List<LiquidTankTaskCopyVO>> treeMap = new TreeMap<>();
         // 遍历赋值到treeMap中
-        vos.forEach(vo -> {
+        for(LiquidTankTaskCopyVO vo : vos){
+//        vos.forEach(vo -> {
             final Long wtId = vo.getWorkTankId();
             final Long wcId = vo.getWorkCenterId();
 
@@ -318,16 +319,21 @@ public class LiquidTankTaskCopyController extends BladeController {
             final LocalDate date = vo.getSampleDate();
             final String keys = wtId + "_" + wcId + "_" + testElement;
             WorkTank tanke = workTankService.getById(wtId);
-            vo.setWorkTankName(tanke.getWorkTankCode());
+            if(tanke != null){
+                vo.setWorkTankName(tanke.getWorkTankCode());
+            }
+//            vo.setWorkTankName(tanke.getWorkTankCode());
             WorkCenter center = centerService.getById(wcId);
-            vo.setWcName(center.getWcName());
+            if(center != null){
+                vo.setWcName(center.getWcName());
+            }
             // 不包含，新建
             if (!treeMap.containsKey(keys)) {
                 List<LiquidTankTaskCopyVO> list = new ArrayList<>();
                 treeMap.put(keys, list);
             }
             treeMap.get(keys).add(vo);
-        });
+        }
         // 前端要求匹配对象
         LiquidTankWaveDrawVO allVO = new LiquidTankWaveDrawVO();
         List<LiquidTankWaveDrawSingleVO> allChart = allVO.getWaveData();