From 9c24e3e1cf11af8d67267cb19a556477e2921a1f Mon Sep 17 00:00:00 2001
From: shilei <798989044@qq.com>
Date: Fri, 15 Dec 2023 10:10:05 +0800
Subject: [PATCH] =?UTF-8?q?#SSKJ-2#=20=E5=A2=9E=E5=8A=A0=E6=8E=92=E7=8F=AD?=
 =?UTF-8?q?=E7=9A=84=E5=85=AC=E4=BC=91=E7=9A=84=E7=89=B9=E6=AE=8A=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/kq/biz/KQFormatData.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/com/engine/kq/biz/KQFormatData.java b/src/com/engine/kq/biz/KQFormatData.java
index 13ee3eb..250462b 100644
--- a/src/com/engine/kq/biz/KQFormatData.java
+++ b/src/com/engine/kq/biz/KQFormatData.java
@@ -935,8 +935,8 @@ public class KQFormatData extends BaseBean {
          */
         BaseBean bb = new BaseBean();
         String offdutyId = Util.null2String(PropBean.getUfPropValue("shift.offduty.id"),"7");
-        bb.writeLog("offdutyId:"+offdutyId);
-        if(offdutyId.equals(workTime.getSerialId())){
+        bb.writeLog("userid:"+userId+"  offdutyId:"+offdutyId+"  getSerialId:"+serialid);
+        if(offdutyId.equals(serialid)){
 
           bb.writeLog("start 公休(09:00-18:00) ");
           params.add(null);
@@ -959,16 +959,18 @@ public class KQFormatData extends BaseBean {
           params.add(0);
           params.add(0);
 
-          Map<String,Object> leaveInfo_gx = new HashMap<>();//请假信息
-          Map<String,Object> otherinfo_gx = new HashMap<>();//存一些用得到的信息
+          Map<String,Object> leaveInfo_gx = new HashMap<String,Object>();//请假信息
+          Map<String,Object> otherinfo_gx = new HashMap<String,Object>();//存一些用得到的信息
 
-          params.add(JSONObject.toJSONString(leaveInfo_gx));
+          params.add(null);
           params.add(0);
           params.add(0);
           params.add(0);
-          params.add(JSONObject.toJSONString(otherinfo_gx));
+          params.add(null);
 
         }else{
+
+          bb.writeLog("qit start");
           params.add(signInDate);
           params.add(signInTime);
           params.add(signInId.length() == 0 ? null : signInId);