From dfcd7d88b05b4516287da959dc6390471d90b7bc Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Thu, 24 Nov 2022 10:43:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E7=A6=8F?=
 =?UTF-8?q?=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=80=80?=
 =?UTF-8?q?=E5=B7=AE=E6=95=B0=E6=8D=AE=E5=8D=95=E6=9D=A1=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SIAccountServiceImpl.java    | 36 +++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index 9019e07e5..293d41e80 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -2257,8 +2257,40 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
         getPaymentGroup(otherComJson, "公司", "其他福利", dataMap, addGroups);
 
         Map<String, Object> resultMap = new HashMap<>();
-        resultMap.put("data", dataMap);
-        resultMap.put("items", addGroups);
+//        resultMap.put("data", dataMap);
+//        resultMap.put("items", addGroups);
+
+        List<Map<String, String>> perList = new ArrayList<>();
+        List<Map<String, String>> comList = new ArrayList<>();
+        for (SearchConditionGroup group : addGroups) {
+
+            for (SearchConditionItem item : group.getItems()) {
+                Map<String, String> map = new HashMap<>();
+
+                String[] domkey = item.getDomkey();
+                String insuranceId = domkey[0].substring(3);
+                if (group.getTitle().contains("个人")) {
+                    map.put("title", group.getTitle());
+                    map.put("paymentScope", "个人");
+                    map.put("insuranceName", item.getLabel());
+                    map.put("insuranceId", insuranceId);
+                    map.put("insuranceValue", dataMap.get(domkey[0]));
+                    perList.add(map);
+                } else if (group.getTitle().contains("公司")) {
+                    map.put("title", group.getTitle());
+                    map.put("paymentScope", "公司");
+                    map.put("insuranceName", item.getLabel());
+                    map.put("insuranceId", insuranceId);
+                    map.put("insuranceValue", dataMap.get(domkey[0]));
+                    comList.add(map);
+                }
+            }
+        }
+
+        List<Map<String, String>> resultList = new ArrayList<>();
+        resultList.addAll(perList);
+        resultList.addAll(comList);
+        resultMap.put("data", resultList);
 
         return resultMap;
     }