From eaa8a45376682d87947c46f63c4b981a572d62ef Mon Sep 17 00:00:00 2001 From: sy Date: Wed, 29 Nov 2023 13:50:25 +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=E7=BC=96=E8=BE=91=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=B8=A6=E5=87=BA=E7=A6=8F=E5=88=A9=E9=A1=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=BC=B4=E7=BA=B3=E5=AF=B9=E8=B1=A1=EF=BC=88=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E6=88=96=E4=B8=AA=E4=BA=BA=EF=BC=89=E6=A0=87=E5=BF=97?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SIAccountServiceImpl.java | 2 ++ .../service/impl/SIBalanceServiceImpl.java | 6 ++++++ .../service/impl/SIRepairServiceImpl.java | 18 ++++++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 0e88c304c..197fec018 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -2763,6 +2763,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { map.put("title", group.getTitle()); map.put("titleSign", getTotalSign(group.getTitle())); map.put("paymentScope", "个人"); + map.put("paymentScopeSign", "per"); map.put("insuranceName", item.getLabel()); map.put("insuranceId", insuranceId); map.put("insuranceValue", dataMap.get(domkey[0])); @@ -2775,6 +2776,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { map.put("title", group.getTitle()); map.put("titleSign", getTotalSign(group.getTitle())); map.put("paymentScope", "公司"); + map.put("paymentScopeSign", "com"); map.put("insuranceName", item.getLabel()); map.put("insuranceId", insuranceId); map.put("insuranceValue", dataMap.get(domkey[0])); diff --git a/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java b/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java index 89db7ec47..80dd92f67 100644 --- a/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java @@ -163,6 +163,7 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService { comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); + comMap.put("paymentScopeSign", "com"); resultList.add(comMap); } if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { @@ -173,6 +174,7 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService { perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); + perMap.put("paymentScopeSign", "per"); resultList.add(perMap); } }); @@ -193,6 +195,7 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService { comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); + comMap.put("paymentScopeSign", "com"); resultList.add(comMap); } if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { @@ -203,6 +206,7 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService { perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); + perMap.put("paymentScopeSign", "per"); resultList.add(perMap); } }); @@ -223,6 +227,7 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService { comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); + comMap.put("paymentScopeSign", "com"); resultList.add(comMap); } if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { @@ -233,6 +238,7 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService { perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); + perMap.put("paymentScopeSign", "per"); resultList.add(perMap); } }); diff --git a/src/com/engine/salary/service/impl/SIRepairServiceImpl.java b/src/com/engine/salary/service/impl/SIRepairServiceImpl.java index 8356cba4e..6973aa99a 100644 --- a/src/com/engine/salary/service/impl/SIRepairServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIRepairServiceImpl.java @@ -236,6 +236,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); + comMap.put("paymentScopeSign", "com"); resultList.add(comMap); } if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { @@ -245,6 +246,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); + perMap.put("paymentScopeSign", "per"); resultList.add(perMap); } }); @@ -264,6 +266,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); + comMap.put("paymentScopeSign", "com"); resultList.add(comMap); } if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { @@ -273,6 +276,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); + perMap.put("paymentScopeSign", "per"); resultList.add(perMap); } }); @@ -292,6 +296,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); + comMap.put("paymentScopeSign", "com"); resultList.add(comMap); } if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { @@ -301,6 +306,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); + perMap.put("paymentScopeSign", "per"); resultList.add(perMap); } }); @@ -322,6 +328,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); + comMap.put("paymentScopeSign", "com"); resultList.add(comMap); } if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { @@ -331,6 +338,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); + perMap.put("paymentScopeSign", "per"); resultList.add(perMap); } }); @@ -356,6 +364,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); + comMap.put("paymentScopeSign", "com"); resultList.add(comMap); } if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { @@ -365,6 +374,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); + perMap.put("paymentScopeSign", "per"); resultList.add(perMap); } }); @@ -390,6 +400,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); + comMap.put("paymentScopeSign", "com"); resultList.add(comMap); } if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { @@ -399,6 +410,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); + perMap.put("paymentScopeSign", "per"); resultList.add(perMap); } }); @@ -424,6 +436,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); + comMap.put("paymentScopeSign", "com"); resultList.add(comMap); } if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { @@ -433,6 +446,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); + perMap.put("paymentScopeSign", "per"); resultList.add(perMap); } }); @@ -454,6 +468,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); + comMap.put("paymentScopeSign", "com"); resultList.add(comMap); } if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { @@ -463,6 +478,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); + perMap.put("paymentScopeSign", "per"); resultList.add(perMap); } }); @@ -484,6 +500,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { comMap.put("insuranceId", k); comMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); comMap.put("paymentScope", "公司"); + comMap.put("paymentScopeSign", "com"); resultList.add(comMap); } if (insuranceIdAndScopeList.contains(k + "-" + PaymentScopeEnum.SCOPE_PERSON.getValue())) { @@ -493,6 +510,7 @@ public class SIRepairServiceImpl extends Service implements SIRepairService { perMap.put("insuranceId", k); perMap.put("insuranceName", categoryNameMap.get(Long.valueOf(k))); perMap.put("paymentScope", "个人"); + perMap.put("paymentScopeSign", "per"); resultList.add(perMap); } });