有可能员工上A班2次，后面一次请假的情况 2025-10-09

jjt-biz/src/main/java/com/jjt/emp/service/impl/TwinEmpCalcServiceImpl.java

@@ -146,8 +146,8 @@ public class TwinEmpCalcServiceImpl implements ITwinEmpCalcService {
 //        process(true, emp, calcMap, configMap, calcList, specHourMap);
 //        process(false, emp, calcMap, configMap, calcList, specHourMap);
         List<TwinEmpCalc> calcList = process(emp, effMap, configMap, specHourList);
-        //最后还需要合并，否则数据会重复
-        calcList = calcList.stream().collect(Collectors.groupingBy(o -> o.getDeviceId() + "-" + o.getDensity() + "-" + o.getMick() + "-" + o.getEmpTeam())).entrySet().stream().map(entry -> {
+        //最后还需要合并，否则数据会重复,还需要按照姓名 ，有可能员工上A班2次，后面一次请假的情况 2025-10-09
+        calcList = calcList.stream().collect(Collectors.groupingBy(o -> o.getDeviceId() + "-" + o.getDensity() + "-" + o.getMick() + "-" + o.getEmpTeam() + "-" + o.getEmpName())).entrySet().stream().map(entry -> {
             List<TwinEmpCalc> group = entry.getValue();
             TwinEmpCalc calc = group.get(0);
             // 合并产量