Skip to content

8
8timerapiv200
Commit 54597521 by leialin
Options

Merge branch 'lal' into 'develop' 

提交

See merge request 8timerv2/8timerapiv200!508
parents 02111013 f68a7c6e
Showing with 6 additions and 6 deletions
src/main/java/cn/timer/api/controller/kqgl/AttController.java
...@@ -410,7 +410,7 @@ public class AttController { ...@@ -410,7 +410,7 @@ public class AttController {
if(mapuca != null && !(schedules[p].getBcid()).equals(mapuca.getBcid())){ if(mapuca != null && !(schedules[p].getBcid()).equals(mapuca.getBcid())){
List<PunchRecord> initial = punchrecordservice.getMaintenancePunchCardList(startDate,endDate,schedules[p].getUserid()); List<PunchRecord> initial = punchrecordservice.getMaintenancePunchCardList(startDate,endDate,schedules[p].getUserid(),qyid);
if(initial.size() > 0){ if(initial.size() > 0){
RestMethod(initial,initial.get(0).getDkmxid()); RestMethod(initial,initial.get(0).getDkmxid());
} }
...@@ -418,7 +418,7 @@ public class AttController { ...@@ -418,7 +418,7 @@ public class AttController {
//当天的所有打卡记录 //当天的所有打卡记录
List<PunchRecord> mapucalist = punchrecordservice.getMaintenancePunchCardList(startDate,endDate,schedules[p].getUserid()); List<PunchRecord> mapucalist = punchrecordservice.getMaintenancePunchCardList(startDate,endDate,schedules[p].getUserid(),qyid);
PunchRecord minAttid = null; PunchRecord minAttid = null;
PunchRecord maxAttid = null; PunchRecord maxAttid = null;
int dkmxid = 0; int dkmxid = 0;
...@@ -1682,7 +1682,7 @@ public class AttController { ...@@ -1682,7 +1682,7 @@ public class AttController {
int gzsc = punchcarddetailsservice.selectWorkingHours(Integer.valueOf(kqry.getEmpNum()),startDate,endDate); int gzsc = punchcarddetailsservice.selectWorkingHours(Integer.valueOf(kqry.getEmpNum()),startDate,endDate);
List<PunchRecord> initial = punchrecordservice.getMaintenancePunchCardList(startDate,endDate,Integer.valueOf(kqry.getEmpNum())); List<PunchRecord> initial = punchrecordservice.getMaintenancePunchCardList(startDate,endDate,Integer.valueOf(kqry.getEmpNum()),qyid);
int latenum = 0;// 迟到次数 int latenum = 0;// 迟到次数
int latehours = 0;// 迟到时长 int latehours = 0;// 迟到时长
int leanum = 0;// 早退次数 int leanum = 0;// 早退次数
...@@ -3483,14 +3483,14 @@ public class AttController { ...@@ -3483,14 +3483,14 @@ public class AttController {
PunchRecord mapuca = punchrecordservice.MaintenancePunchCard(startCorrDate,endCorrDate,userid); PunchRecord mapuca = punchrecordservice.MaintenancePunchCard(startCorrDate,endCorrDate,userid);
if(mapuca != null && !id.equals(mapuca.getBcid())){ if(mapuca != null && !id.equals(mapuca.getBcid())){
List<PunchRecord> initial = punchrecordservice.getMaintenancePunchCardList(startCorrDate,endCorrDate,userid); List<PunchRecord> initial = punchrecordservice.getMaintenancePunchCardList(startCorrDate,endCorrDate,userid,qyid);
if(initial.size() > 0){ if(initial.size() > 0){
RestMethod(initial,initial.get(0).getDkmxid()); RestMethod(initial,initial.get(0).getDkmxid());
} }
} }
//当天的所有打卡记录 //当天的所有打卡记录
List<PunchRecord> mapucalist = punchrecordservice.getMaintenancePunchCardList(startCorrDate,endCorrDate,userid); List<PunchRecord> mapucalist = punchrecordservice.getMaintenancePunchCardList(startCorrDate,endCorrDate,userid,qyid);
PunchRecord minAttid = null; PunchRecord minAttid = null;
PunchRecord maxAttid = null; PunchRecord maxAttid = null;
int dkmxid = 0; int dkmxid = 0;
...@@ -4941,7 +4941,7 @@ public class AttController { ...@@ -4941,7 +4941,7 @@ public class AttController {
int gzsc = punchcarddetailsservice.selectWorkingHours(Integer.valueOf(kqry.getEmpNum()),startDate,endDate); int gzsc = punchcarddetailsservice.selectWorkingHours(Integer.valueOf(kqry.getEmpNum()),startDate,endDate);
List<PunchRecord> initial = punchrecordservice.getMaintenancePunchCardList(startDate,endDate,Integer.valueOf(kqry.getEmpNum())); List<PunchRecord> initial = punchrecordservice.getMaintenancePunchCardList(startDate,endDate,Integer.valueOf(kqry.getEmpNum()),qyid);
int latenum = 0;// 迟到次数 int latenum = 0;// 迟到次数
int latehours = 0;// 迟到时长 int latehours = 0;// 迟到时长
int leanum = 0;// 早退次数 int leanum = 0;// 早退次数
......
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