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

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);