From 20d3e1da6517ed5e55ae3613ccbbb01f1b9eda2e Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 25 四月 2026 11:53:11 +0800
Subject: [PATCH] fix(approve): 修复审批流程中的数据类型和业务逻辑问题
---
src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java
index 24de514..e0ab30b 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java
@@ -8,10 +8,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.service.CustomerFollowUpFileService;
import com.ruoyi.dto.SimplePersonDto;
-import com.ruoyi.production.dto.ProcessContentDto;
-import com.ruoyi.production.dto.ProcessRouteAnticlockwiseDto;
-import com.ruoyi.production.dto.ProductionPrintOrderDto;
-import com.ruoyi.production.dto.SaveProductionPrintOrderDto;
+import com.ruoyi.production.dto.*;
import com.ruoyi.production.mapper.ProductOrderMapper;
import com.ruoyi.production.mapper.ProductionPrintOrderMapper;
import com.ruoyi.production.pojo.ProductOrder;
@@ -53,6 +50,7 @@
processContentDto.setId(IdUtil.simpleUUID());
}
});
+ MaterialInfoDto materialInfoDtoFirst = dto.getMaterialInfo().get(0);
// 璋冪敤宸ュ簭鏂瑰 鍑芥暟
List<ProcessRouteAnticlockwiseDto> processRouteAnticlockwiseDtos = processContentDtoList.stream().map(it -> {
ProcessRouteAnticlockwiseDto pdto = new ProcessRouteAnticlockwiseDto();
@@ -62,8 +60,9 @@
pdto.setProcessRouteNum(it.getProcessPositive());
pdto.setProcessRouteAddNum(it.getProcessPositive());
// pdto.setProcessRouteRequire(); 宸ヨ壓瑕佹眰
- pdto.setProductModelId(dto.getProductModelId());
- pdto.setUserIds(it.getReportWorkerList().stream().map(SimplePersonDto::getUserName).collect(Collectors.joining(",")));
+ pdto.setProductModelId(Long.valueOf(materialInfoDtoFirst.getProductModelId()));
+ pdto.setUserIds(it.getReportWorkerList().stream().map(SimplePersonDto::getUserId).map(String::valueOf).collect(Collectors.joining(",")));
+ pdto.setUserNames(it.getReportWorkerList().stream().map(SimplePersonDto::getUserName).collect(Collectors.joining(",")));
pdto.setDeviceId(it.getDeviceId());
pdto.setUuid(it.getId());
return pdto;
--
Gitblit v1.9.3