|
|
@ -662,7 +662,9 @@ public class KQFormatData extends BaseBean {
|
|
|
|
logInfo.put(""+weaver.systeminfo.SystemEnv.getHtmlLabelName(10005301,weaver.general.ThreadVarLanguage.getLang())+"",kqShiftRuleEntity);
|
|
|
|
logInfo.put(""+weaver.systeminfo.SystemEnv.getHtmlLabelName(10005301,weaver.general.ThreadVarLanguage.getLang())+"",kqShiftRuleEntity);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 考勤二开 设置第二次打卡,允许迟到239分钟
|
|
|
|
// 考勤二开 设置第二次打卡,允许迟到239分钟
|
|
|
|
if (workTime.getWorkMins() == 1440 && lsWorkTime.size() == 2 && lsWorkTime.get(1).getBeginTime().equals("24:00") && i == 1) {
|
|
|
|
new BaseBean().writeLog("###考勤二开###,i=[" + i + "],lsWorkTime.size()=[" + lsWorkTime.size() + "],lsWorkTime.get(1).getBeginTime()=[" + lsWorkTime.get(1).getBeginTime() + "]");
|
|
|
|
|
|
|
|
new BaseBean().writeLog(JSON.toJSON(lsWorkTime));
|
|
|
|
|
|
|
|
if (lsWorkTime.size() == 2 && lsWorkTime.get(1).getBeginTime().equals("24:00") && i == 1) {
|
|
|
|
WorkTimeEntity cusWorkTimeEntity = new WorkTimeEntity();
|
|
|
|
WorkTimeEntity cusWorkTimeEntity = new WorkTimeEntity();
|
|
|
|
BeanUtils.copyProperties(workTime,cusWorkTimeEntity);
|
|
|
|
BeanUtils.copyProperties(workTime,cusWorkTimeEntity);
|
|
|
|
Map<String, Object> shiftRuleInfo = cusWorkTimeEntity.getShiftRuleInfo();
|
|
|
|
Map<String, Object> shiftRuleInfo = cusWorkTimeEntity.getShiftRuleInfo();
|
|
|
|