Skip to content

8
8timerapiv200
Commit 41af1573 by leialin
Options

Merge branch 'lal' into 'develop' 

Lal

See merge request 8timerv2/8timerapiv200!434
parents b5d56062 46ad4550
Showing with 4 additions and 2 deletions
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
...@@ -2605,7 +2605,7 @@ public class ClockInController { ...@@ -2605,7 +2605,7 @@ public class ClockInController {
boolean iscrdk = true; boolean iscrdk = true;
String crlasttime = null;//次日最后打卡时间 String crlasttime = null;//次日最后打卡时间
boolean bycf = true; boolean bycf = true;
/****************次日开始***************/ /****************昨日开始***************/
int sb1 = 0,xb1 = 0,sb2 = 0,xb2 = 0,sb3 = 0,xb3 = 0; int sb1 = 0,xb1 = 0,sb2 = 0,xb2 = 0,sb3 = 0,xb3 = 0;
//先判断前一天是否存在次日打卡的方式 //先判断前一天是否存在次日打卡的方式
KqglAssoBcsz jianchashif = KqglAssoBcsz.builder().build().selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, attsch.get(0).getId())); KqglAssoBcsz jianchashif = KqglAssoBcsz.builder().build().selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, attsch.get(0).getId()));
...@@ -2680,6 +2680,7 @@ public class ClockInController { ...@@ -2680,6 +2680,7 @@ public class ClockInController {
if(ectivedate) { if(ectivedate) {
attschbefo.setIsdk(0); attschbefo.setIsdk(0);
}else { }else {
bc++;
attschbefo.setIsdk(1); attschbefo.setIsdk(1);
} }
} }
...@@ -2687,6 +2688,7 @@ public class ClockInController { ...@@ -2687,6 +2688,7 @@ public class ClockInController {
if(ectivedate) { if(ectivedate) {
attschbefo.setIsdk(0); attschbefo.setIsdk(0);
}else { }else {
bc++;
attschbefo.setIsdk(1); attschbefo.setIsdk(1);
} }
} }
...@@ -2728,7 +2730,7 @@ public class ClockInController { ...@@ -2728,7 +2730,7 @@ public class ClockInController {
} }
} }
/****************次日结束***************/ /****************昨日结束***************/
int bccs = attdate.getAttsch().size(); int bccs = attdate.getAttsch().size();
int r = 1; int r = 1;
......
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