Skip to content

8
8timerapiv200
Commit 44aa20a2 by leialin
Options

Merge branch 'lal' into 'develop' 

Lal

See merge request 8timerv2/8timerapiv200!338
parents 79713305 80828539
Showing with 7 additions and 4 deletions
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
......@@ -375,7 +375,7 @@ public class ClockInController {
// atttype = 1;
}else {
kskd = false;
// atttype = 2;
atttype = 2;
}
}else {
//最后一次卡的时候 再继续打视为更新最后一次打卡
......@@ -406,7 +406,7 @@ public class ClockInController {
atttype = 2;
}else {
kskd = false;
// atttype = 2;
atttype = 2;
getinto2 = false;
isRange = true;//在范围
}
......@@ -437,7 +437,7 @@ public class ClockInController {
atttype = 4;
}else {
kskd = false;
// atttype = 4;
atttype = 4;
getinto2 = false;
isRange = true;//在范围
}
......@@ -470,7 +470,7 @@ public class ClockInController {
atttype = 6;
}else {
kskd = false;
// atttype = 6;
atttype = 6;
getinto2 = false;
isRange = true;//在范围
}
......@@ -1680,6 +1680,7 @@ public class ClockInController {
getinto2 = false;
}else {
kskd = false;//更新最后一次打卡
atttype = clock.getType();
}
}else {
if(getinto2) {
......@@ -1711,6 +1712,7 @@ public class ClockInController {
getinto2 = false;
}else {
kskd = false;
atttype = clock.getType();
}
}else {
if(getinto2) {
......@@ -1745,6 +1747,7 @@ public class ClockInController {
getinto2 = false;
}else {
kskd = false;
atttype = clock.getType();
}
}else {
if(getinto2) {
......
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