From edc71bd6eec46da16d7aea0e7a08e1f3e3ac4bb3 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Wed, 27 Mar 2024 09:18:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=EF=BC=8C=E5=87=BA=E5=8B=A4?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=E6=8A=A5=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AttendanceSummaryServiceImpl.java   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/com/engine/attendance/workflow/service/impl/AttendanceSummaryServiceImpl.java b/src/com/engine/attendance/workflow/service/impl/AttendanceSummaryServiceImpl.java
index 9aa66db..c4c4d08 100644
--- a/src/com/engine/attendance/workflow/service/impl/AttendanceSummaryServiceImpl.java
+++ b/src/com/engine/attendance/workflow/service/impl/AttendanceSummaryServiceImpl.java
@@ -43,6 +43,7 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS
     @Override
     public Map<String, Object> addAttendanceSummary(Map<String, Object> params) {
 
+        bs.writeLog("params : " +  params);
         ExecutorService taskExecutor = Executors.newCachedThreadPool();
         taskExecutor.execute(() -> {
             String mainIds = Util.null2String(params.get("mainIds"));
@@ -218,13 +219,13 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS
             bs.writeLog("currentDate : " + targetDate);
             if (typeSelect.equals("9")) {
                 String targetYear = String.valueOf(targetDate.getYear());
-                String targetMonth = targetDate.getMonth().toString();
+                String targetMonth = String.valueOf(targetDate.getMonthValue());
                 bs.writeLog("targetYear : " + targetYear + ", targetMonth : " + targetMonth);
                 dtDates = getDtDates(targetYear, targetMonth, subCompanyId, departmentId, resourceId, status);
             } else if (typeSelect.equals("10")) {
                 targetDate = targetDate.minusMonths(1);
                 String targetYear = String.valueOf(targetDate.getYear());
-                String targetMonth = targetDate.getMonth().toString();
+                String targetMonth = String.valueOf(targetDate.getMonthValue());
                 bs.writeLog("targetYear : " + targetYear + ", targetMonth : " + targetMonth);
                 dtDates = getDtDates(targetYear, targetMonth, subCompanyId, departmentId, resourceId, status);
             } else {
@@ -281,7 +282,10 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS
             //分页处理
             int start = pageIndex * pageSize;
             int end = Math.min((pageIndex + 1) * pageSize, dataList.size());
-            List<Map<String, String>> resultList = dataList.subList(start, end);
+            List<Map<String, String>> resultList = new ArrayList<>();
+            if (start <= dataList.size()) {
+                resultList = dataList.subList(start, end);
+            }
             count = dataList.size();
             if (count <= 0) {
                 pageCount = 0;
@@ -354,7 +358,7 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS
             bs.writeLog("dtDates_size : " + dtDates.size() + ", dtListSql : " + dtListSql);
             return dtDates;
         } else {
-            return null;
+            return new ArrayList<>();
         }
 
     }