|
@@ -152,7 +152,7 @@ public class KaoqinRecordServiceImpl implements IKaoqinRecordService {
|
|
//查询打卡信息
|
|
//查询打卡信息
|
|
KaoqinRecord kaoqinRecord = kaoqinRecordMapper.selectKaoqinRecordByRecordByUser(Long.parseLong(userId), date);
|
|
KaoqinRecord kaoqinRecord = kaoqinRecordMapper.selectKaoqinRecordByRecordByUser(Long.parseLong(userId), date);
|
|
//查询考勤规则
|
|
//查询考勤规则
|
|
- KaoqinConfig kaoqinConfig = kaoqinConfigMapper.selectKaoqinConfigBynew();
|
|
|
|
|
|
+ //KaoqinConfig kaoqinConfig = kaoqinConfigMapper.selectKaoqinConfigBynew();
|
|
if (kaoqinRecord == null) {
|
|
if (kaoqinRecord == null) {
|
|
//根据id查询人员信息
|
|
//根据id查询人员信息
|
|
SysUser sysUser = sysUserMapper.selectUserById(Long.parseLong(userId));
|
|
SysUser sysUser = sysUserMapper.selectUserById(Long.parseLong(userId));
|
|
@@ -171,14 +171,21 @@ public class KaoqinRecordServiceImpl implements IKaoqinRecordService {
|
|
kaoqinRecords.setKaTime(date);
|
|
kaoqinRecords.setKaTime(date);
|
|
kaoqinRecords.setCreateTime(DateUtils.getNowDate());
|
|
kaoqinRecords.setCreateTime(DateUtils.getNowDate());
|
|
//此次打卡为第一次打卡
|
|
//此次打卡为第一次打卡
|
|
|
|
+ //在上班之前打卡
|
|
|
|
+ // todo 学校逻辑,没有迟到,早退,只要打卡就行,只要两次卡
|
|
|
|
+ kaoqinRecords.setKaTimeAmIn(DateUtils.parseDate(time.split(" ")[1]));
|
|
|
|
+ kaoqinRecords.setKaTypeAmIn(ONE);
|
|
|
|
+ kaoqinRecords.setKaStatus(ONE);
|
|
|
|
+ //todo 正常逻辑
|
|
//判断是否在上班卡之前打卡
|
|
//判断是否在上班卡之前打卡
|
|
- if (DateUtils.compareTimes(time.split(" ")[1], DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimeAmIn()), "HH:mm:ss") <= 0) {
|
|
|
|
|
|
+ /*if (DateUtils.compareTimes(time.split(" ")[1], DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimeAmIn()), "HH:mm:ss") <= 0) {
|
|
//在上班之前打卡
|
|
//在上班之前打卡
|
|
kaoqinRecords.setKaTimeAmIn(DateUtils.parseDate(time.split(" ")[1]));
|
|
kaoqinRecords.setKaTimeAmIn(DateUtils.parseDate(time.split(" ")[1]));
|
|
kaoqinRecords.setKaTypeAmIn(ONE);
|
|
kaoqinRecords.setKaTypeAmIn(ONE);
|
|
kaoqinRecords.setKaStatus(ONE);
|
|
kaoqinRecords.setKaStatus(ONE);
|
|
|
|
|
|
- } else {
|
|
|
|
|
|
+ }
|
|
|
|
+ else {
|
|
//在上班之后打卡
|
|
//在上班之后打卡
|
|
//判断配置要打几次卡
|
|
//判断配置要打几次卡
|
|
if (TWO.equals(kaoqinConfig.getKaNum())) {
|
|
if (TWO.equals(kaoqinConfig.getKaNum())) {
|
|
@@ -205,29 +212,34 @@ public class KaoqinRecordServiceImpl implements IKaoqinRecordService {
|
|
kaoqinRecords.setKaTypeAmIn(FIVE);
|
|
kaoqinRecords.setKaTypeAmIn(FIVE);
|
|
kaoqinRecords.setKaTimeAmOut(DateUtils.parseDate(time.split(" ")[1]));
|
|
kaoqinRecords.setKaTimeAmOut(DateUtils.parseDate(time.split(" ")[1]));
|
|
kaoqinRecords.setKaTypeAmOut(ONE);
|
|
kaoqinRecords.setKaTypeAmOut(ONE);
|
|
- kaoqinRecord.setKaTimePmIn(DateUtils.parseDate(time.split(" ")[1]));
|
|
|
|
- kaoqinRecord.setKaTypePmIn(ONE);
|
|
|
|
|
|
+ kaoqinRecords.setKaTimePmIn(DateUtils.parseDate(time.split(" ")[1]));
|
|
|
|
+ kaoqinRecords.setKaTypePmIn(ONE);
|
|
|
|
|
|
} else if (DateUtils.isInTimeRange(time.split(" ")[1], DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimePmIn()), DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimePmOut()))) {
|
|
} else if (DateUtils.isInTimeRange(time.split(" ")[1], DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimePmIn()), DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimePmOut()))) {
|
|
//下午迟到 打卡类别-上午下班 1正常 2:迟到 3:外勤 4:早退
|
|
//下午迟到 打卡类别-上午下班 1正常 2:迟到 3:外勤 4:早退
|
|
kaoqinRecords.setKaTypeAmIn(FIVE);
|
|
kaoqinRecords.setKaTypeAmIn(FIVE);
|
|
kaoqinRecords.setKaTypeAmOut(FIVE);
|
|
kaoqinRecords.setKaTypeAmOut(FIVE);
|
|
- kaoqinRecord.setKaTimePmIn(DateUtils.parseDate(time.split(" ")[1]));
|
|
|
|
- kaoqinRecord.setKaTypePmIn(TWO);
|
|
|
|
|
|
+ kaoqinRecords.setKaTimePmIn(DateUtils.parseDate(time.split(" ")[1]));
|
|
|
|
+ kaoqinRecords.setKaTypePmIn(TWO);
|
|
|
|
|
|
} else if (DateUtils.compareTimes(time.split(" ")[1], DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimePmOut()), "HH:mm:ss") >= 0) {
|
|
} else if (DateUtils.compareTimes(time.split(" ")[1], DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimePmOut()), "HH:mm:ss") >= 0) {
|
|
//下午正常下班
|
|
//下午正常下班
|
|
kaoqinRecords.setKaTypeAmIn(FIVE);
|
|
kaoqinRecords.setKaTypeAmIn(FIVE);
|
|
kaoqinRecords.setKaTypeAmOut(FIVE);
|
|
kaoqinRecords.setKaTypeAmOut(FIVE);
|
|
- kaoqinRecord.setKaTypePmIn(FIVE);
|
|
|
|
|
|
+ kaoqinRecords.setKaTypePmIn(FIVE);
|
|
kaoqinRecords.setKaTimePmOut(DateUtils.parseDate(time.split(" ")[1]));
|
|
kaoqinRecords.setKaTimePmOut(DateUtils.parseDate(time.split(" ")[1]));
|
|
kaoqinRecords.setKaTypePmOut(ONE);
|
|
kaoqinRecords.setKaTypePmOut(ONE);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
kaoqinRecordMapper.insertKaoqinRecord(kaoqinRecords);
|
|
kaoqinRecordMapper.insertKaoqinRecord(kaoqinRecords);
|
|
} else {
|
|
} else {
|
|
- if (DateUtils.compareTimes(time.split(" ")[1], DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimeAmIn()), "HH:mm:ss") <= 0) {
|
|
|
|
|
|
+ // todo 学校逻辑,没有迟到,早退,只要打卡就行,只要两次卡
|
|
|
|
+ kaoqinRecord.setKaTimePmOut(DateUtils.parseDate(time.split(" ")[1]));
|
|
|
|
+ kaoqinRecord.setKaTypePmOut(ONE);
|
|
|
|
+ kaoqinRecord.setKaStatus(ONE);
|
|
|
|
+ //todo 正常逻辑
|
|
|
|
+ /*if (DateUtils.compareTimes(time.split(" ")[1], DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimeAmIn()), "HH:mm:ss") <= 0) {
|
|
//在上班之前打卡
|
|
//在上班之前打卡
|
|
kaoqinRecord.setKaTimeAmIn(DateUtils.parseDate(time.split(" ")[1]));
|
|
kaoqinRecord.setKaTimeAmIn(DateUtils.parseDate(time.split(" ")[1]));
|
|
kaoqinRecord.setKaTypeAmIn(ONE);
|
|
kaoqinRecord.setKaTypeAmIn(ONE);
|
|
@@ -283,7 +295,7 @@ public class KaoqinRecordServiceImpl implements IKaoqinRecordService {
|
|
kaoqinRecord.setKaTypePmOut(ONE);
|
|
kaoqinRecord.setKaTypePmOut(ONE);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
kaoqinRecordMapper.updateKaoqinRecord(kaoqinRecord);
|
|
kaoqinRecordMapper.updateKaoqinRecord(kaoqinRecord);
|
|
}
|
|
}
|
|
}
|
|
}
|