From 16c43f8679ff0f816f6ab3e43396a8fcdba6f54c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 7 Jul 2022 14:37:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E5=BC=95=E7=94=A8=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E5=8A=A0=E7=8F=AD=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/RemoteAttend4SalaryServiceImpl.java  | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java b/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java
index 1b784b42d..875879df1 100644
--- a/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java
+++ b/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java
@@ -12,6 +12,7 @@ import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import weaver.general.Util;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -47,7 +48,7 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt
                             .forEach(leave -> {
                                 Map<String, String> map = Maps.newHashMapWithExpectedSize(2);
                                 map.put("code", leave.get("dataIndex").toString());
-                                map.put("name", leave.get("title") + "(" + leave.get("unit").toString() + ")");
+                                map.put("name", Util.null2String(column.get("title")) + "-" + leave.get("title") + "(" + leave.get("unit").toString() + ")");
                                 columns.add(map);
                             });
                 }
@@ -56,14 +57,28 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt
             else if (dataIndex.equals("overtime") && column.get("children") != null) {
                 List<Map> list = (List<Map>) column.get("children");
                 if (CollectionUtils.isNotEmpty(list)) {
-                    list.stream()
-                            .filter(leave -> leave.get("dataIndex") != null && StringUtils.isNotBlank(leave.get("dataIndex").toString()))
-                            .forEach(leave -> {
-                                Map<String, String> map = Maps.newHashMapWithExpectedSize(2);
-                                map.put("code", leave.get("dataIndex").toString());
-                                map.put("name", leave.get("title") + "(" + leave.get("unit").toString() + ")");
-                                columns.add(map);
-                            });
+                    for (int i = 0; i < list.size(); i++) {
+                        Map overtimeMap = list.get(i);
+                        if (overtimeMap.get("dataIndex") != null && StringUtils.isNotBlank(overtimeMap.get("dataIndex").toString()) && overtimeMap.get("children") == null) {
+                            Map<String, String> map = Maps.newHashMapWithExpectedSize(2);
+                            map.put("code", overtimeMap.get("dataIndex").toString());
+                            map.put("name", Util.null2String(column.get("title")) + "-" + overtimeMap.get("title") + "(" + overtimeMap.get("unit").toString() + ")");
+                            columns.add(map);
+                        }
+                        if (overtimeMap.get("dataIndex") != null && StringUtils.isNotBlank(overtimeMap.get("dataIndex").toString()) && overtimeMap.get("children") != null) {
+                            List<Map> overtimes = (List<Map>) overtimeMap.get("children");
+                            if (CollectionUtils.isNotEmpty(overtimes)) {
+                                overtimes.stream().filter(leave -> leave.get("dataIndex") != null && StringUtils.isNotBlank(leave.get("dataIndex").toString()))
+                                        .forEach(leave -> {
+                                            Map<String, String> map = Maps.newHashMapWithExpectedSize(2);
+                                            map.put("code", leave.get("dataIndex").toString());
+                                            map.put("name", Util.null2String(column.get("title")) + "-" + Util.null2String(overtimeMap.get("title")) + "-" + leave.get("title") + "(" + leave.get("unit").toString() + ")");
+                                            columns.add(map);
+                                        });
+                            }
+                        }
+
+                    }
                 }
             }
             //普通考勤