From 9fd753a08e9f577f6f5e6f863dbffb645c6a59c7 Mon Sep 17 00:00:00 2001
From: chenwei <3291673014@qq.com>
Date: Sun, 28 Apr 2024 19:58:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=B7=AE=E6=B5=81=E7=A8=8B=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=A4=96=E5=8B=A4=E6=89=93=E5=8D=A1=E4=B8=8D=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E8=80=83=E5=8B=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/kq/biz/KQReportBiz.java | 38 +++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/com/engine/kq/biz/KQReportBiz.java b/src/com/engine/kq/biz/KQReportBiz.java
index 1c84357..d2ffc77 100644
--- a/src/com/engine/kq/biz/KQReportBiz.java
+++ b/src/com/engine/kq/biz/KQReportBiz.java
@@ -381,7 +381,7 @@ public class KQReportBiz extends BaseBean {
 
       //考勤二开--转事假
 
-      datas.putAll(getDailyToComLeaveData(params,user));
+//      datas.putAll(getDailyToComLeaveData(params,user));
 
       //考勤二开--异常考勤转事假
 
@@ -417,7 +417,7 @@ public class KQReportBiz extends BaseBean {
 
       //考勤二开--转事假
 
-      datas.putAll(getToComLeaveData(params,user));
+//      datas.putAll(getToComLeaveData(params,user));
 
       //考勤二开--统计公休时长
 
@@ -962,23 +962,23 @@ public class KQReportBiz extends BaseBean {
         sqlWhere += " and c.loginid is not null " + (rs.getDBType().equals("oracle") ? "" : " and c.loginid<>'' ");
       }
 
-      sql = " select * from (select * from uf_casleave a left join hrmresource b on a.resourceid = b.id " +
-              " where a.startdate >='" + fromDate + "' and a.enddate <='" + toDate +"' and ( a.isdecu = 0 or a.isdecu is null ) ) c where 1=1 " + sqlWhere;
-      basebean.writeLog("getDailyToComLeaveData sql: " + sql);
-
-      rs.executeQuery(sql);
-      while (rs.next()) {
-        double duration = Util.getDoubleValue(Util.null2String(rs.getString("duration")));
-        String kqdate = Util.null2String(rs.getString("startdate"));
-        if ( duration > 0.00){
-          double temp = Util.getDoubleValue(Util.null2String(datas.get("DailyToComLeaveData|" + resourceId + "|" + kqdate)));
-          if (temp <= 0.00) {
-            datas.put("DailyToComLeaveData|" + resourceId + "|" + kqdate, duration);
-          } else {
-            datas.put("DailyToComLeaveData|" + resourceId + "|" + kqdate, temp + duration);
-          }
-        }
-      }
+//      sql = " select * from (select * from uf_casleave a left join hrmresource b on a.resourceid = b.id " +
+//              " where a.startdate >='" + fromDate + "' and a.enddate <='" + toDate +"' and ( a.isdecu = 0 or a.isdecu is null ) ) c where 1=1 " + sqlWhere;
+//      basebean.writeLog("getDailyToComLeaveData sql: " + sql);
+//
+//      rs.executeQuery(sql);
+//      while (rs.next()) {
+//        double duration = Util.getDoubleValue(Util.null2String(rs.getString("duration")));
+//        String kqdate = Util.null2String(rs.getString("startdate"));
+//        if ( duration > 0.00){
+//          double temp = Util.getDoubleValue(Util.null2String(datas.get("DailyToComLeaveData|" + resourceId + "|" + kqdate)));
+//          if (temp <= 0.00) {
+//            datas.put("DailyToComLeaveData|" + resourceId + "|" + kqdate, duration);
+//          } else {
+//            datas.put("DailyToComLeaveData|" + resourceId + "|" + kqdate, temp + duration);
+//          }
+//        }
+//      }
 
 
     }catch (Exception e){