Skip to content

8
8timerapiv200
Commit 2c346f9c by leialin
Options

Merge branch 'lal' into 'develop' 

Lal

See merge request 8timerv2/8timerapiv200!280
parents c38fe924 489e9109
Showing with 11 additions and 9 deletions
src/main/java/cn/timer/api/controller/kqgl/AttController.java
......@@ -1749,7 +1749,7 @@ public class AttController {
appmaps[d1] = spe.getTsrq();
d1++;
}
List<AttendanceWeeklySch> atwek = attendanceweeklyschservice.selectAttendanceMadeByUserid(Integer.valueOf(kqry.getEmpNum()));
List<AttendanceWeeklySch> atwek = attendanceweeklyschservice.selectAttendanceMadeByUserid(Integer.valueOf(kqry.getEmpNum()),kqry.getOrgCode());
String[] week= new String[atwek.size()];
int e = 0;
for(AttendanceWeeklySch awek : atwek){
......@@ -1811,7 +1811,7 @@ public class AttController {
apr.setRestday(xiuxi);//休息天数
apr.setAnswerday(shangban);//应出勤
}else{
List<AttendanceWeeklySch> atwek = attendanceweeklyschservice.selectAttendanceMadeByUserid(Integer.valueOf(kqry.getEmpNum()));
List<AttendanceWeeklySch> atwek = attendanceweeklyschservice.selectAttendanceMadeByUserid(Integer.valueOf(kqry.getEmpNum()),kqry.getOrgCode());
String[] week= new String[atwek.size()];
int e = 0;
for(AttendanceWeeklySch awek : atwek){
......@@ -2130,7 +2130,7 @@ public class AttController {
d++;
}
List<AttendanceWeeklySch> atwek = attendanceweeklyschservice.selectAttendanceMadeByUserid(userid);
List<AttendanceWeeklySch> atwek = attendanceweeklyschservice.selectAttendanceMadeByUserid(userid,qyid);
String[] week= new String[atwek.size()];
int e = 0;
for(AttendanceWeeklySch awek : atwek){
......@@ -2185,7 +2185,7 @@ public class AttController {
attcal.setAttshouldmade(shangban);//应出勤
}else{
List<AttendanceWeeklySch> atwek = attendanceweeklyschservice.selectAttendanceMadeByUserid(userid);
List<AttendanceWeeklySch> atwek = attendanceweeklyschservice.selectAttendanceMadeByUserid(userid,qyid);
String[] week= new String[atwek.size()];
int e = 0;
for(AttendanceWeeklySch awek : atwek){
......@@ -2275,7 +2275,9 @@ public class AttController {
}
/***********APP--调用接口结束*****************/
/********************************************************************************************************************************************************************************************************************************************************************************/
/**************************************************************************** APP--调用接口结束 *****************************************************************************************************************************************************************************/
/********************************************************************************************************************************************************************************************************************************************************************************/
/**
* 根据 年、月 获取对应的月份 的 天数
......@@ -5138,7 +5140,7 @@ public class AttController {
appmaps[d1] = spe.getTsrq();
d1++;
}
List<AttendanceWeeklySch> atwek = attendanceweeklyschservice.selectAttendanceMadeByUserid(Integer.valueOf(kqry.getEmpNum()));
List<AttendanceWeeklySch> atwek = attendanceweeklyschservice.selectAttendanceMadeByUserid(Integer.valueOf(kqry.getEmpNum()),qyid);
String[] week= new String[atwek.size()];
int e = 0;
for(AttendanceWeeklySch awek : atwek){
......@@ -5200,7 +5202,7 @@ public class AttController {
apr.setRestday(xiuxi);//休息天数
apr.setAnswerday(shangban);//应出勤
}else{
List<AttendanceWeeklySch> atwek = attendanceweeklyschservice.selectAttendanceMadeByUserid(Integer.valueOf(kqry.getEmpNum()));
List<AttendanceWeeklySch> atwek = attendanceweeklyschservice.selectAttendanceMadeByUserid(Integer.valueOf(kqry.getEmpNum()),qyid);
String[] week= new String[atwek.size()];
int e = 0;
for(AttendanceWeeklySch awek : atwek){
......
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
......@@ -1581,7 +1581,7 @@ public class SalaryManagementController {
appmaps[d1] = spe.getTsrq();
d1++;
}
List<AttendanceWeeklySch> atwek = attendanceweeklyschservice.selectAttendanceMadeByUserid(userid);
List<AttendanceWeeklySch> atwek = attendanceweeklyschservice.selectAttendanceMadeByUserid(userid,orgCode);
String[] week= new String[atwek.size()];
int e = 0;
for(AttendanceWeeklySch awek : atwek){
......@@ -1642,7 +1642,7 @@ public class SalaryManagementController {
attrep.setRestday(xiuxi);//休息天数
attrep.setAnswerday(shangban);//应出勤
}else{
List<AttendanceWeeklySch> atwek = attendanceweeklyschservice.selectAttendanceMadeByUserid(userid);
List<AttendanceWeeklySch> atwek = attendanceweeklyschservice.selectAttendanceMadeByUserid(userid,orgCode);
String[] week= new String[atwek.size()];
int e = 0;
for(AttendanceWeeklySch awek : atwek){
......
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