From fd5db10a0a6c2429a012501da022a4129259901b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 02 八月 2024 13:44:47 +0800
Subject: [PATCH] 修改值班信息接口
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 50 ++++++++++++++++++++------------------------------
1 files changed, 20 insertions(+), 30 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
index 1e52a35..b35ceb3 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -21,6 +21,7 @@
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.stream.Collectors;
/**
@@ -55,6 +56,11 @@
if(!"0".equals(workingProcedure)){
damageSelectWrapper.eq(Damage::getWorkingProcedure,workingProcedure);
}
+ List<Damage> damageList = baseMapper.selectList(damageSelectWrapper);
+
+ for (Damage damage : damageList) {
+ damage.setStatus(2);
+ }
return baseMapper.selectList(damageSelectWrapper);
}
@@ -62,27 +68,7 @@
* 鎻愪氦鎶ュ伐
*/
@Override
- public void submitDamage(String startTime, String endTime, int type, int status, String workingProcedures){
- LambdaUpdateWrapper<Damage> damageUpdateWrapper=new LambdaUpdateWrapper<>();
- LambdaQueryWrapper<Damage> damageLambdaQueryWrapper=new LambdaQueryWrapper<>()
-; damageUpdateWrapper.between(Damage::getDamageTime,startTime,endTime);
- damageLambdaQueryWrapper.between(Damage::getDamageTime,startTime,endTime);
- if (type!=0){
- damageUpdateWrapper.eq(Damage::getType,type);
- damageLambdaQueryWrapper.eq(Damage::getType,type);
- }
- if (status!=0){
- damageUpdateWrapper.eq(Damage::getStatus,status);
- damageLambdaQueryWrapper.eq(Damage::getStatus,status);
- }
- if(!"0".equals(workingProcedures)){
- damageUpdateWrapper.eq(Damage::getWorkingProcedure,workingProcedures);
- damageLambdaQueryWrapper.eq(Damage::getWorkingProcedure,workingProcedures);
- }
-// Damage damage=new Damage();
-// damage.setStatus(2);
-// baseMapper.update(damage,damageUpdateWrapper);
- List<Damage> damageList = baseMapper.selectList(damageLambdaQueryWrapper);
+ public void submitDamage(List<Damage> damageList){
Map<String, Map<String, Map<String, Map<String, List<Damage>>>>> resultMap = damageList.stream()
.collect(Collectors.groupingBy(
Damage::getProcessId,
@@ -125,15 +111,23 @@
// 鑾峰彇 Damage 鍒楄〃
List<Damage> damageListForTeamsGroupsName = teamsGroupsNameEntry.getValue();
+ //鎶ュ伐涓昏〃鏁版嵁
+ ReportingWork reportingWork=new ReportingWork();
+ reportingWork.setProcessId(processId);
+ reportingWork.setThisProcess(workingProcedure);
+ reportingWork.setDeviceName(deviceName);
+ reportingWork.setTeamsGroupsName(teamsGroupsName);
- // 浣跨敤 stream 瀵� damageListForTeamsGroupsName 杩涜鍐嶆鍒嗙粍
Map<Integer, Map<Integer, Map<String, List<Damage>>>> groupedByOrderTechBreakage = damageListForTeamsGroupsName.stream()
+ .map(damage -> Optional.ofNullable(damage)) // 浣跨敤Optional澶勭悊鍙兘涓簄ull鐨勫厓绱�
+ .filter(Optional::isPresent) // 杩囨护鎺夌┖鐨凮ptional
+ .map(Optional::get) // 鑾峰彇闈炵┖鐨凞amage瀵硅薄
.collect(Collectors.groupingBy(
- Damage::getOrderNumber,
+ damage -> Optional.ofNullable(damage.getOrderNumber()).orElse(0), // 浣跨敤orElse璁剧疆榛樿鍊硷紝浠ュ鐞唍ull鍊�
Collectors.groupingBy(
- Damage::getTechnologyNumber,
+ damage -> Optional.ofNullable(damage.getTechnologyNumber()).orElse(0), // 鍚屾牱澶勭悊technologyNumber鍙兘涓簄ull鐨勬儏鍐�
Collectors.groupingBy(
- Damage::getBreakageType,
+ damage -> Optional.ofNullable(damage.getBreakageType()).orElse("Unknown"), // 澶勭悊breakageType鍙兘涓簄ull鐨勬儏鍐�
Collectors.toList()
)
)
@@ -160,11 +154,7 @@
String breakageType = breakageTypeEntry.getKey();
System.out.println(" BreakageType: " + breakageType);
- ReportingWork reportingWork=new ReportingWork();
- reportingWork.setProcessId(processId);
- reportingWork.setThisProcess(workingProcedure);
- reportingWork.setDeviceName(deviceName);
- reportingWork.setTeamsGroupsName(teamsGroupsName);
+
// 鑾峰彇 Damage 鍒楄〃
List<Damage> damageListForBreakageType = breakageTypeEntry.getValue();
int completedQuantity=0;
--
Gitblit v1.8.0