#SSKJ-2# 增加排班的公休的特殊情况

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);
+         *  二开代码，对排版公休(09:00-18:00) 进行特殊处理
-        params.add(signOutDate);
+         *  shil
-        params.add(signOutTime);
+         */
-        params.add(signOutId.length() == 0 ? null : signOutId);
+        BaseBean bb = new BaseBean();
-        kqLog.info("format in >>>>>userId" + userId + "kqDate==" + kqDate+":hostIps:"+hostIps+":uuid::"+uuid
+        String offdutyId = Util.null2String(PropBean.getUfPropValue("shift.offduty.id"),"7");
-                +":signInDate:"+signInDate+":signInTime::"+signInTime+":signOutDate:"+signOutDate+":signOutTime::"+signOutTime);
+        bb.writeLog("offdutyId:"+offdutyId);
-        params.add(signMins);
+        if(offdutyId.equals(workTime.getSerialId())){
-        params.add(attendanceMins);
+
-        params.add(beLateMins);
+          bb.writeLog("start 公休(09:00-18:00) ");
-        params.add(graveBeLateMins);
+          params.add(null);
-        params.add(leaveEarlyMins);
+          params.add(null);
-        params.add(graveLeaveEarlyMins);
+          params.add(null);
-        params.add(absenteeismMins);
+          params.add(null);
-        params.add(forgotCheckMins);
+          params.add(null);
-        params.add(leaveMins);
+          params.add(null);
-        params.add(JSONObject.toJSONString(leaveInfo));
+
-        params.add(evectionMins);
+          bb.writeLog("workTime.getSerialId() == 7 format in >>>>>userId" + userId + "kqDate==" + kqDate+":hostIps:"+hostIps+":uuid::"+uuid
-        params.add(outMins);
+                  +":signInDate:"+signInDate+":signInTime::"+signInTime+":signOutDate:"+signOutDate+":signOutTime::"+signOutTime);
-        params.add(forgotBeginWorkCheckMins);
+
-        params.add(JSONObject.toJSONString(otherinfo));
+          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")),",");