Skip to content

8
8timerapiv200
Commit 343579cd by leialin
Options

Merge branch 'lal' into 'develop' 

提交

See merge request 8timerv2/8timerapiv200!413
parents 08861aa9 a41ddeaa
Showing with 13 additions and 4 deletions
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
...@@ -1009,7 +1009,7 @@ public class ClockInController { ...@@ -1009,7 +1009,7 @@ public class ClockInController {
KqglAssoDkjl.builder().id(dkjj.getId()).status(0).sort(0).build().updateById(); KqglAssoDkjl.builder().id(dkjj.getId()).status(0).sort(0).build().updateById();
msg = "打卡已更新数据"; msg = "打卡已更新数据";
sbyf = 0; sbyf = 0;
status_ = 2; // status_ = 2;
} }
int results = 0; int results = 0;
...@@ -2342,7 +2342,7 @@ public class ClockInController { ...@@ -2342,7 +2342,7 @@ public class ClockInController {
KqglAssoDkjl.builder().id(dkjj.getId()).status(0).sort(0).build().updateById(); KqglAssoDkjl.builder().id(dkjj.getId()).status(0).sort(0).build().updateById();
msg = "打卡已更新数据"; msg = "打卡已更新数据";
sbyf = 0; sbyf = 0;
status_ = 2; // status_ = 2;
} }
int results = 0; int results = 0;
...@@ -2682,7 +2682,7 @@ public class ClockInController { ...@@ -2682,7 +2682,7 @@ public class ClockInController {
ash.setIsdk(1); ash.setIsdk(1);
if(!now.equals(timme)) {//小于 if(!now.equals(timme)) {
ash.setIsupdate(0); ash.setIsupdate(0);
}else { }else {
...@@ -2699,7 +2699,7 @@ public class ClockInController { ...@@ -2699,7 +2699,7 @@ public class ClockInController {
bc++; bc++;
ash.setIsdk(1); ash.setIsdk(1);
if(!now.equals(timme)) {//小于 if(!now.equals(timme)) {
ash.setIsupdate(0); ash.setIsupdate(0);
}else { }else {
if(isxbdk == 2) { if(isxbdk == 2) {
...@@ -2797,6 +2797,15 @@ public class ClockInController { ...@@ -2797,6 +2797,15 @@ public class ClockInController {
int bcid = dkjl.getBcid(); int bcid = dkjl.getBcid();
int results = dkjl.getResults(); int results = dkjl.getResults();
KqglAssoBcsz bcsz = KqglAssoBcsz.builder().build().selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, bcid)); KqglAssoBcsz bcsz = KqglAssoBcsz.builder().build().selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, bcid));
if(now.equals(ClockInTool.stampToDate2(String.valueOf(ash.getTime())))) {
if(attdate.getAttsch().size() == 2) {
if(dkjl.getSort() == 2) {
ash.setIsupdate(1);
}
}
}
if(bcsz != null) { if(bcsz != null) {
int yxcdfzs = bcsz.getYxcdfzs();//允许迟到分钟数 int yxcdfzs = bcsz.getYxcdfzs();//允许迟到分钟数
int yzcdfzs = bcsz.getYzcdfzs();//严重迟到分钟数 int yzcdfzs = bcsz.getYzcdfzs();//严重迟到分钟数
......
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