From f60327c377097f67ed42c349bda2a54c3147b7be Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 07 三月 2024 16:35:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java
index 1dd2231..bd83963 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java
@@ -41,11 +41,12 @@
List<Map<String, Object>> ReworkMap =reworkMapper.getSelectRework(offset,pageSize);
- List<BasicDataProduce> basicDataProduceList=basicDateProduceMapper.SelectWorkBasicTeams();
+
for (Map<String, Object> item:ReworkMap){
item.put("reworkTeam","");
List<BasicDataProduce> basicCategory=new ArrayList<>();
+ List<BasicDataProduce> basicDataProduceList=basicDateProduceMapper.SelectWorkBasicTeams(item.get("reworkProcesses").toString());
for (BasicDataProduce basicDataProduce:basicDataProduceList){
if(Objects.equals(basicDataProduce.getBasicData().getBasicName(),item.get("reworkProcesses"))){
basicCategory.add(basicDataProduce);
--
Gitblit v1.8.0