Skip to content

8
8timerapiv200
Commit 68737c51 by leialin
Options

Merge branch 'lal' into 'develop' 

提交

See merge request 8timerv2/8timerapiv200!420
parents 24a14c7d 1e64f9dd
Showing with 11 additions and 1 deletions
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
...@@ -1605,6 +1605,10 @@ public class ClockInController { ...@@ -1605,6 +1605,10 @@ public class ClockInController {
kskd = false; kskd = false;
if(attdate.getAttsch().size() == 2) {//一套上下班 上班1 if(attdate.getAttsch().size() == 2) {//一套上下班 上班1
if(clock.getType() == 1) { if(clock.getType() == 1) {
if(starttime1ks == 0 && starttime1js == 0) {
atttype = clock.getType();
isRange = true;//在范围
}else {
boolean effectiveDate1 = ClockInTool.hourMinuteBetween(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(time_), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(starttime1ks), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(starttime1js),"yyyy-MM-dd HH:mm"); boolean effectiveDate1 = ClockInTool.hourMinuteBetween(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(time_), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(starttime1ks), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(starttime1js),"yyyy-MM-dd HH:mm");
if (effectiveDate1) {//在范围内就打卡 if (effectiveDate1) {//在范围内就打卡
atttype = clock.getType(); atttype = clock.getType();
...@@ -1612,7 +1616,12 @@ public class ClockInController { ...@@ -1612,7 +1616,12 @@ public class ClockInController {
}else { }else {
isRange = false; isRange = false;
} }
}
}else if(clock.getType() == 2){ }else if(clock.getType() == 2){
if(endtime1ks == 0 && endtime1js == 0) {
atttype = clock.getType();
isRange = true;//在范围
}else {
boolean effectiveDate2 = ClockInTool.hourMinuteBetween(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(time_), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(endtime1ks), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(endtime1js),"yyyy-MM-dd HH:mm"); boolean effectiveDate2 = ClockInTool.hourMinuteBetween(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(time_), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(endtime1ks), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(endtime1js),"yyyy-MM-dd HH:mm");
if (effectiveDate2) {//在范围内就打卡 if (effectiveDate2) {//在范围内就打卡
atttype = clock.getType(); atttype = clock.getType();
...@@ -1621,6 +1630,7 @@ public class ClockInController { ...@@ -1621,6 +1630,7 @@ public class ClockInController {
isRange = false; isRange = false;
} }
} }
}
}else { }else {
boolean getinto = true; boolean getinto = true;
//打卡时间 对比班次 接近哪个时间就打哪个时间的卡 //打卡时间 对比班次 接近哪个时间就打哪个时间的卡
...@@ -2833,7 +2843,7 @@ public class ClockInController { ...@@ -2833,7 +2843,7 @@ public class ClockInController {
} }
} }
if(bcsz != null) { if(bcsz != null && (dkjl.getSort())%2 > 0) {
int yxcdfzs = bcsz.getYxcdfzs();//允许迟到分钟数 int yxcdfzs = bcsz.getYxcdfzs();//允许迟到分钟数
int yzcdfzs = bcsz.getYzcdfzs();//严重迟到分钟数 int yzcdfzs = bcsz.getYzcdfzs();//严重迟到分钟数
int kgcdfzs = bcsz.getKgcdfzs();//旷工迟到分钟数 int kgcdfzs = bcsz.getKgcdfzs();//旷工迟到分钟数
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment