Skip to content

8
8timerapiv200
Commit 6d429444 by ilal
Options

提交

parent 38d98481
Showing with 7 additions and 6 deletions
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
...@@ -3116,7 +3116,7 @@ public class ClockInController { ...@@ -3116,7 +3116,7 @@ public class ClockInController {
attdate.getAttsch().get(0).setIsdk(1); attdate.getAttsch().get(0).setIsdk(1);
} }
if(attsch.get(1).getDajl().getId() == null && attsch.get(1).getDajl().getDktime() == null) { if(attsch.get(1).getDajl().getId() == null && attsch.get(1).getDajl().getDktime() == null && attsch.get(1).getDajl().getId() != 999) {
attsch.get(1).getDajl().setDktime(null); attsch.get(1).getDajl().setDktime(null);
attsch.get(1).getDajl().setStatus(17);//缺卡 attsch.get(1).getDajl().setStatus(17);//缺卡
attsch.get(1).getDajl().setSort(attdate.getAttsch().get(1).getSort()); attsch.get(1).getDajl().setSort(attdate.getAttsch().get(1).getSort());
...@@ -3145,7 +3145,7 @@ public class ClockInController { ...@@ -3145,7 +3145,7 @@ public class ClockInController {
attsch.get(0).getDajl().setId(888); attsch.get(0).getDajl().setId(888);
attdate.getAttsch().get(0).setIsdk(1); attdate.getAttsch().get(0).setIsdk(1);
} }
if(attsch.get(1).getDajl().getId() == null && attsch.get(1).getDajl().getDktime() == null) { if(attsch.get(1).getDajl().getId() == null && attsch.get(1).getDajl().getDktime() == null && attsch.get(1).getDajl().getId() != 999) {
attsch.get(1).getDajl().setDktime(null); attsch.get(1).getDajl().setDktime(null);
attsch.get(1).getDajl().setStatus(17);//缺卡 attsch.get(1).getDajl().setStatus(17);//缺卡
attsch.get(1).getDajl().setSort(attdate.getAttsch().get(1).getSort()); attsch.get(1).getDajl().setSort(attdate.getAttsch().get(1).getSort());
...@@ -3159,7 +3159,7 @@ public class ClockInController { ...@@ -3159,7 +3159,7 @@ public class ClockInController {
attsch.get(2).getDajl().setId(888); attsch.get(2).getDajl().setId(888);
attdate.getAttsch().get(2).setIsdk(1); attdate.getAttsch().get(2).setIsdk(1);
} }
if(attsch.get(3).getDajl().getId() == null && attsch.get(3).getDajl().getDktime() == null) { if(attsch.get(3).getDajl().getId() == null && attsch.get(3).getDajl().getDktime() == null && attsch.get(3).getDajl().getId() != 999) {
attsch.get(3).getDajl().setDktime(null); attsch.get(3).getDajl().setDktime(null);
attsch.get(3).getDajl().setStatus(17);//缺卡 attsch.get(3).getDajl().setStatus(17);//缺卡
attsch.get(3).getDajl().setSort(attdate.getAttsch().get(3).getSort()); attsch.get(3).getDajl().setSort(attdate.getAttsch().get(3).getSort());
......
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
...@@ -890,14 +890,15 @@ public class TimeCardController { ...@@ -890,14 +890,15 @@ public class TimeCardController {
public Result<Object> PunchCardWIFI(@CurrentUser UserBean userBean,@RequestBody KqglAssoDkwx kqglassodkwx) { public Result<Object> PunchCardWIFI(@CurrentUser UserBean userBean,@RequestBody KqglAssoDkwx kqglassodkwx) {
List<KqglAssoDkwx> cxwifi = KqglAssoDkwx.builder().build().selectList(new QueryWrapper<KqglAssoDkwx>().lambda().eq(KqglAssoDkwx::getQyid, userBean.getOrgCode()).eq(KqglAssoDkwx::getMac, kqglassodkwx.getMac())); List<KqglAssoDkwx> cxwifi = KqglAssoDkwx.builder().build().selectList(new QueryWrapper<KqglAssoDkwx>().lambda().eq(KqglAssoDkwx::getQyid, userBean.getOrgCode()).eq(KqglAssoDkwx::getMac, kqglassodkwx.getMac()));
if(cxwifi.size() > 0) { if(cxwifi.size() > 0 && kqglassodkwx.getId() == null) {
return ResultUtil.error("此WiFi已存在"); return ResultUtil.error("此WiFi已存在");
}else { }
kqglassodkwx.setLuryid(userBean.getEmpNum()); kqglassodkwx.setLuryid(userBean.getEmpNum());
kqglassodkwx.setLusjTime(new Date().getTime()); kqglassodkwx.setLusjTime(new Date().getTime());
kqglassodkwx.setQyid(userBean.getOrgCode()); kqglassodkwx.setQyid(userBean.getOrgCode());
return kqglassodkwx.insertOrUpdate() ? ResultUtil.success("添加成功!") : ResultUtil.error("添加失败!"); return kqglassodkwx.insertOrUpdate() ? ResultUtil.success("添加成功!") : ResultUtil.error("添加失败!");
}
} }
/** /**
......
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