From 80bfb1e02e33031a9bbc5ef2b666a6e857f0e74e Mon Sep 17 00:00:00 2001
From: shilei <798989044@qq.com>
Date: Fri, 17 Nov 2023 18:59:14 +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 | 106 +++++++++++++++++++-----
 1 file changed, 84 insertions(+), 22 deletions(-)

diff --git a/src/com/engine/kq/biz/KQFormatData.java b/src/com/engine/kq/biz/KQFormatData.java
index 024daee..1acf6a5 100644
--- a/src/com/engine/kq/biz/KQFormatData.java
+++ b/src/com/engine/kq/biz/KQFormatData.java
@@ -19,6 +19,7 @@ import weaver.conn.RecordSet;
 import weaver.general.BaseBean;
 import weaver.general.InitServer;
 import weaver.general.Util;
+import weaver.interfaces.sskj.comInfo.PropBean;
 
 import java.util.*;
 import java.util.regex.Matcher;
@@ -848,28 +849,89 @@ public class KQFormatData extends BaseBean {
         params.add(workEndDate);
         params.add(kqTimesArrayComInfo.turn48to24Time(ori_workEndTime));
         params.add(workMins);
-        params.add(signInDate);
-        params.add(signInTime);
-        params.add(signInId.length() == 0 ? null : signInId);
-        params.add(signOutDate);
-        params.add(signOutTime);
-        params.add(signOutId.length() == 0 ? null : signOutId);
-        kqLog.info("format in >>>>>userId" + userId + "kqDate==" + kqDate+":hostIps:"+hostIps+":uuid::"+uuid
-                +":signInDate:"+signInDate+":signInTime::"+signInTime+":signOutDate:"+signOutDate+":signOutTime::"+signOutTime);
-        params.add(signMins);
-        params.add(attendanceMins);
-        params.add(beLateMins);
-        params.add(graveBeLateMins);
-        params.add(leaveEarlyMins);
-        params.add(graveLeaveEarlyMins);
-        params.add(absenteeismMins);
-        params.add(forgotCheckMins);
-        params.add(leaveMins);
-        params.add(JSONObject.toJSONString(leaveInfo));
-        params.add(evectionMins);
-        params.add(outMins);
-        params.add(forgotBeginWorkCheckMins);
-        params.add(JSONObject.toJSONString(otherinfo));
+
+        /***
+         *  二开代码，对排版公休(09:00-18:00) 进行特殊处理
+         *  shil
+         */
+        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("start 公休(09:00-18:00) ");
+          params.add(null);
+          params.add(null);
+          params.add(null);
+          params.add(null);
+          params.add(null);
+          params.add(null);
+
+          bb.writeLog("workTime.getSerialId() == 7 format in >>>>>userId" + userId + "kqDate==" + kqDate+":hostIps:"+hostIps+":uuid::"+uuid
+                  +":signInDate:"+signInDate+":signInTime::"+signInTime+":signOutDate:"+signOutDate+":signOutTime::"+signOutTime);
+
+          params.add(0);
+          params.add(0);
+          params.add(0);
+          params.add(0);
+          params.add(0);
+          params.add(0);
+          params.add(0);
+          params.add(0);
+          params.add(0);
+          params.add(new JSONObject());
+          params.add(0);
+          params.add(0);
+          params.add(0);
+          params.add(new JSONObject());
+
+        }else{
+          params.add(signInDate);
+          params.add(signInTime);
+          params.add(signInId.length() == 0 ? null : signInId);
+          params.add(signOutDate);
+          params.add(signOutTime);
+          params.add(signOutId.length() == 0 ? null : signOutId);
+          kqLog.info("format in >>>>>userId" + userId + "kqDate==" + kqDate+":hostIps:"+hostIps+":uuid::"+uuid
+                  +":signInDate:"+signInDate+":signInTime::"+signInTime+":signOutDate:"+signOutDate+":signOutTime::"+signOutTime);
+          params.add(signMins);
+          params.add(attendanceMins);
+          params.add(beLateMins);
+          params.add(graveBeLateMins);
+          params.add(leaveEarlyMins);
+          params.add(graveLeaveEarlyMins);
+          params.add(absenteeismMins);
+          params.add(forgotCheckMins);
+          params.add(leaveMins);
+          params.add(JSONObject.toJSONString(leaveInfo));
+          params.add(evectionMins);
+          params.add(outMins);
+          params.add(forgotBeginWorkCheckMins);
+          params.add(JSONObject.toJSONString(otherinfo));
+        }
+
+//        params.add(signInDate);
+//        params.add(signInTime);
+//        params.add(signInId.length() == 0 ? null : signInId);
+//        params.add(signOutDate);
+//        params.add(signOutTime);
+//        params.add(signOutId.length() == 0 ? null : signOutId);
+//        kqLog.info("format in >>>>>userId" + userId + "kqDate==" + kqDate+":hostIps:"+hostIps+":uuid::"+uuid
+//                +":signInDate:"+signInDate+":signInTime::"+signInTime+":signOutDate:"+signOutDate+":signOutTime::"+signOutTime);
+//        params.add(signMins);
+//        params.add(attendanceMins);
+//        params.add(beLateMins);
+//        params.add(graveBeLateMins);
+//        params.add(leaveEarlyMins);
+//        params.add(graveLeaveEarlyMins);
+//        params.add(absenteeismMins);
+//        params.add(forgotCheckMins);
+//        params.add(leaveMins);
+//        params.add(JSONObject.toJSONString(leaveInfo));
+//        params.add(evectionMins);
+//        params.add(outMins);
+//        params.add(forgotBeginWorkCheckMins);
+//        params.add(JSONObject.toJSONString(otherinfo));
 
         Map<String,Object> definedFieldInfo = new KQFormatBiz().getDefinedField();
         String[] definedFields = Util.splitString(Util.null2String(definedFieldInfo.get("definedField")),",");