From 93e36c526fe445c14d5fb19f3653f8a8e55e3a6c Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期四, 09 五月 2024 15:49:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
index cf60362..59a06be 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
@@ -14,9 +14,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* <p>
@@ -43,16 +41,49 @@
@Override
@DS("pp")
- public List<Map> saveUpPattenUsage(String engineeringId) {
+ public List<UpPattenUsage> selectSaveUpPattenUsage(String engineeringId) {
+ List<OptimizeUpPattenUsage> upPattenUsageList = null;
if (engineeringId != null) {
-
- List<Map> upPattenUsageList=optimizeProjectMapper.selectJoinList(Map.class,new MPJQueryWrapper<OptimizeProject>()
+ upPattenUsageList = optimizeProjectMapper.selectJoinList(OptimizeUpPattenUsage.class, new MPJQueryWrapper<OptimizeProject>()
.select("t.project_no,t.glass_type,b.width,b.height,REGEXP_REPLACE(t.glass_thickness,'\\D','')as glass_thickness,b.heat_layout_sort")
.leftJoin("optimize_layout b on t.project_no=b.project_no")
- .eq("b.project_no",engineeringId));
+ .eq("b.project_no", engineeringId));
}
- return Collections.emptyList();
+ // 鍒涘缓涓�涓� List 鐢ㄤ簬淇濆瓨鏄犲皠鍚庣殑瀹炰綋瀵硅薄
+ List<UpPattenUsage> resultList = new ArrayList<>();
+
+// 閬嶅巻鏌ヨ缁撴灉涓殑姣忎釜 Map 瀵硅薄
+ if (upPattenUsageList != null) {
+ for (OptimizeUpPattenUsage map : upPattenUsageList) {
+ // 鍒涘缓涓�涓柊鐨� OptimizeProject 瀵硅薄
+ UpPattenUsage optimizeProject = new UpPattenUsage();
+ // 灏� Map 涓殑姣忎釜閿�煎鏄犲皠鍒� OptimizeProject 瀵硅薄鐨勭浉搴斿瓧娈典笂
+ optimizeProject.setEngineeringId((String) map.getProjectNo());
+ optimizeProject.setFilmsId((String) map.getGlassType());
+ optimizeProject.setWidth((Double) map.getWidth());
+ optimizeProject.setHeight((Double) map.getHeight());
+ optimizeProject.setThickness((Double)map.getHeight());
+ optimizeProject.setLayoutSequence((Integer) map.getHeatLayoutSort());
+ optimizeProject.setState(0);
+ // 灏嗘槧灏勫悗鐨勫璞℃坊鍔犲埌缁撴灉鍒楄〃涓�
+ resultList.add(optimizeProject);
+ }
+ }
+ log.info("鏌ヨ鍑轰笂鐗囬『搴忛泦鍚堜繚瀛樺埌瀹炰綋绫粄}",resultList);
+ return resultList;
+ }
+
+ @Override
+ public void saveUpPattenUsage(List<UpPattenUsage> upPattenUsage) {
+ this.saveBatch(upPattenUsage);
+ //淇濆瓨鍘熺墖浣跨敤璇︽儏琛�
+ }
+
+ //@Override
+ public void selectSaveGlassinfo(String engineeringId) {
+ //淇濆瓨鐜荤拑淇℃伅琛�
+ //optimizeProjectMapper.selectJoinList();
}
--
Gitblit v1.8.0