From 00c4dfc5ac687c93e0b7abafc33abb693b38edd6 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 05 八月 2024 09:14:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java |  100 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 98 insertions(+), 2 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 130e515..aae4a9a 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
@@ -1,14 +1,30 @@
 package com.mes.damage.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mes.damage.entity.Damage;
 import com.mes.damage.mapper.DamageMapper;
 import com.mes.damage.service.DamageService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.mapper.GlassInfoMapper;
+import com.mes.pp.entity.ReportingWork;
+import com.mes.work_assignment.entity.WorkAssignment;
+import com.mes.work_assignment.mapper.WorkAssignmentMapper;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * <p>
- *  鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
  * </p>
  *
  * @author wu
@@ -17,4 +33,84 @@
 @Service
 public class DamageServiceImpl extends ServiceImpl<DamageMapper, Damage> implements DamageService {
 
+    @Resource
+    GlassInfoMapper glassInfoMapper;
+    @Resource
+    WorkAssignmentMapper workAssignmentMapper;
+
+    /**
+     * 鏌ヨ鎶ュ伐淇℃伅
+     */
+    @Override
+    public List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure) {
+        LambdaQueryWrapper<Damage> damageSelectWrapper = new LambdaQueryWrapper<>();
+        damageSelectWrapper.between(Damage::getDamageTime, startTime, endTime);
+        if (type != 0) {
+            damageSelectWrapper.eq(Damage::getType, type);
+        }
+        if (status != 0) {
+            damageSelectWrapper.eq(Damage::getStatus, status);
+        }
+        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);
+    }
+
+    /**
+     * 鎻愪氦鎶ュ伐
+     */
+    @Override
+    public void submitDamage(List<Damage> damageList) {
+        Map<String, List<Damage>> firstMap = damageList.stream().collect(Collectors.groupingBy(e -> e.getProcessId() + ":"
+                + e.getWorkingProcedure() + ":" + e.getDeviceName() + ":" + e.getTeamsGroupsName()));
+
+        for (Map.Entry<String, List<Damage>> entry : firstMap.entrySet()) {
+            String key = entry.getKey();
+            List<Damage> damages = entry.getValue();
+
+            System.out.println("Key: " + key);
+
+            Map<String, List<Damage>> secondMap = damageList.stream().collect(Collectors.groupingBy(e -> e.getProcessId() + ":"
+                    + e.getWorkingProcedure() + ":" + e.getDeviceName() + ":" + e.getTeamsGroupsName()));
+
+            for (Map.Entry<String, List<Damage>> entrys : secondMap.entrySet()) {
+
+            }
+        }
+
+
+    }
+
+    /**
+     * 娣诲姞鎶ュ伐淇℃伅
+     */
+    @Override
+    public void insertDamage(Damage damage) {
+        LambdaQueryWrapper<GlassInfo> glassInfoSelectWrapper = new LambdaQueryWrapper<>();
+        glassInfoSelectWrapper.eq(GlassInfo::getGlassId, damage.getGlassId());
+        GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoSelectWrapper);
+        BeanUtils.copyProperties(glassInfo, damage);
+
+        LambdaQueryWrapper<WorkAssignment> workAssignmentSelectWrapper = new LambdaQueryWrapper<>();
+        workAssignmentSelectWrapper
+                .eq(WorkAssignment::getLine, damage.getLine())
+                .eq(WorkAssignment::getWorkProcesses, damage.getWorkingProcedure());
+        WorkAssignment workAssignment = workAssignmentMapper.selectOne(workAssignmentSelectWrapper);
+        if (workAssignment != null) {
+            damage.setTeamsGroupsName(workAssignment.getTeamsGroupsName());
+            damage.setDeviceName(workAssignment.getDeviceName());
+        }
+        damage.setProcessId(glassInfo.getFlowCardId());
+        damage.setOrderNumber(glassInfo.getGlassType());
+        damage.setTechnologyNumber(glassInfo.getLayer());
+        damage.setDamageTime(Timestamp.valueOf(LocalDateTime.now()));
+        damage.setType(2);
+        baseMapper.insert(damage);
+    }
 }

--
Gitblit v1.8.0