From e2ab5a1340f86de69cc1630cc3b7846a6e8f8b2a Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Tue, 27 Dec 2022 15:34:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=89=B0=E8=8B=A6=E5=9C=B0=E5=8C=BA=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GetKQ4OverseasAllowanceCountServiceImpl.java     |  2 +-
 .../impl/OverseasAllowanceCountServiceImpl.java      | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/com/engine/bjcj220907/service/impl/GetKQ4OverseasAllowanceCountServiceImpl.java b/src/com/engine/bjcj220907/service/impl/GetKQ4OverseasAllowanceCountServiceImpl.java
index 2f133a6..3642bbe 100644
--- a/src/com/engine/bjcj220907/service/impl/GetKQ4OverseasAllowanceCountServiceImpl.java
+++ b/src/com/engine/bjcj220907/service/impl/GetKQ4OverseasAllowanceCountServiceImpl.java
@@ -85,7 +85,7 @@ public class GetKQ4OverseasAllowanceCountServiceImpl extends Service implements
                     List<Date> qqDate = new ArrayList<>();
                     attDateList.stream().forEach(a -> {
                         Object o = i.get(sdf.format(a));
-                        baseBean.writeLog("i.get(sdf.format(a)) o:"+o);
+//                        baseBean.writeLog("i.get(sdf.format(a)) o:"+o);
                         String attCal = "";
                         try{
                             Map attCalMap =(Map) o;
diff --git a/src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java b/src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java
index b375a61..a257b1f 100644
--- a/src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java
+++ b/src/com/engine/bjcj220907/service/impl/OverseasAllowanceCountServiceImpl.java
@@ -42,10 +42,6 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse
      */
     @Override
     public void countOverseasAllowance(Calendar countCal) {
-        //TODO
-
-        countCal.set(Calendar.MONTH,9);
-
         // 境外津贴包含：境外津贴（天标准）+境外工龄补贴（月标准）+艰苦地区补贴（天标准）
         // 考勤开始日期
         Calendar startAttendanceCal = BjcjCommonUtils.getStartAttendanceCal(countCal.getTime());
@@ -105,6 +101,7 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse
      * @date 2022/12/23 18:04
      */
     private void handleJkdqDays(List<JWJT> results, Map<String, Object> kqData, Map<Integer, List<JwCZInfoDetail>> gwhgInfos) {
+        baseBean.writeLog("开始处理艰苦地区补贴天数");
         results.forEach(result -> {
             // 获取境外常驻的艰苦地区 和 第三国出差及境外国内出差的艰苦地区
             ArrayList<JKDQBT> dsgAndJwgncc = new ArrayList<>();
@@ -132,10 +129,8 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse
             List<Date> qqDate = (List <Date>)  kqData.get(result.getUser() + "-qq");
             // 公务回国List
             List<JwCZInfoDetail> gwhgList = gwhgInfos.get(new Integer(result.getUser()));
-            if(result.getUser().equals("109")){
-                System.out.println("-");
-            }
-
+            baseBean.writeLog(result.getUser()+"缺勤List："+qqDate);
+            baseBean.writeLog(result.getUser()+"公务回国List："+gwhgList);
             // 减去缺勤、公务回国
             jwcc.stream().forEach(cc -> {
                 Calendar countKs = Calendar.getInstance();
@@ -165,6 +160,7 @@ public class OverseasAllowanceCountServiceImpl extends Service implements Overse
             });
 
         });
+        baseBean.writeLog("处理艰苦地区补贴天数结束");
     }