From 5cb0c7daae6900554d818ad9eeaf8d0d27dd1716 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Mon, 11 Nov 2024 13:26:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4-=E8=80=83=E5=8B=A4=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=E6=8A=A5=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/AttendanceSummaryServiceImpl.java    |  2 +-
 .../jucailinkq/common/util/DbTools.java       | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.java b/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.java
index d34453a..224ea95 100644
--- a/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.java
+++ b/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.java
@@ -1494,7 +1494,7 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS
                 cqSql += " and (b.status = 0 or b.status = 1 or b.status = 2 or b.status = 3) ";
             }
         }
-        List<Map<String,Object>> cqDates = DbTools.getSqlToList(cqSql);
+        List<Map<String,Object>> cqDates = DbTools.getSqlToListKeyOriginal(cqSql);
         //先根据分部、部门、人员、项目分组
         Map<String, List<Map<String,Object>>> toDealCqDataWithGroup = new HashMap<>();
         //判断单一人员所有查询的考勤项目是否存在都为0的情况，存在则不输出查询结果，不存在则记录人员的groupKey在下面对象
diff --git a/src/com/engine/jucailinkq/common/util/DbTools.java b/src/com/engine/jucailinkq/common/util/DbTools.java
index f59801e..2df1cd7 100644
--- a/src/com/engine/jucailinkq/common/util/DbTools.java
+++ b/src/com/engine/jucailinkq/common/util/DbTools.java
@@ -58,6 +58,26 @@ public class DbTools {
         return result;
     }
 
+    public static List<Map<String,Object>> getSqlToListKeyOriginal(String sql,Object...value){
+        RecordSet rs = thread.get();
+
+        List<Map<String,Object>> result = new ArrayList<>();
+        if (value == null || value.length <=0 || "".equals(value)){
+            rs.executeQuery(sql);
+        }else {
+            rs.executeQuery(sql,value);
+        }
+        while (rs.next()){
+            Map<String,Object> dataMap = new HashMap<>();
+            String[] columns = rs.getColumnName();
+            for (String column:columns){
+                dataMap.put(column,rs.getString(column));
+            }
+            result.add(dataMap);
+        }
+        return result;
+    }
+
 //    public static List<Map<String,Object>> getSqlToList(String sql,String dataSourceName){
 //        RecordSetDataSource rs = threads.get();
 //        if (rs == null){