|
@@ -83,7 +83,7 @@ public class DingdingAddressBookController {
|
|
OapiAttendanceGetattcolumnsResponse rsp1 = client1.execute(req1, token);
|
|
OapiAttendanceGetattcolumnsResponse rsp1 = client1.execute(req1, token);
|
|
ArrayList<OapiAttendanceGetattcolumnsResponse.ColumnForTopVo> arrayList = new ArrayList<>();
|
|
ArrayList<OapiAttendanceGetattcolumnsResponse.ColumnForTopVo> arrayList = new ArrayList<>();
|
|
for (OapiAttendanceGetattcolumnsResponse.ColumnForTopVo column : rsp1.getResult().getColumns()) {
|
|
for (OapiAttendanceGetattcolumnsResponse.ColumnForTopVo column : rsp1.getResult().getColumns()) {
|
|
- if (column.getName().equals("应出勤天数") || column.getName().equals("出勤天数") || column.getName().equals("休息天数")){
|
|
|
|
|
|
+ if (column.getName().equals("应出勤天数") || column.getName().equals("出勤天数") || column.getName().equals("休息天数") || column.getName().equals("迟到次数")){
|
|
arrayList.add(column);
|
|
arrayList.add(column);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -97,6 +97,7 @@ public class DingdingAddressBookController {
|
|
String requiredAttDays ="";//应出勤天数
|
|
String requiredAttDays ="";//应出勤天数
|
|
String attDays = "";//出勤天数
|
|
String attDays = "";//出勤天数
|
|
String restDays = "";//休息天数
|
|
String restDays = "";//休息天数
|
|
|
|
+ String lateTimes = "";//迟到次数
|
|
OapiAttendanceGetcolumnvalResponse attRsp = getAttById(user.getUserid(), typeIds, dateFrom, dateTo);
|
|
OapiAttendanceGetcolumnvalResponse attRsp = getAttById(user.getUserid(), typeIds, dateFrom, dateTo);
|
|
//根据考勤信息列获取里面的数据
|
|
//根据考勤信息列获取里面的数据
|
|
for (OapiAttendanceGetcolumnvalResponse.ColumnValForTopVo columnVal : attRsp.getResult().getColumnVals()) {
|
|
for (OapiAttendanceGetcolumnvalResponse.ColumnValForTopVo columnVal : attRsp.getResult().getColumnVals()) {
|
|
@@ -126,11 +127,20 @@ public class DingdingAddressBookController {
|
|
}
|
|
}
|
|
restDays = String.valueOf(days);
|
|
restDays = String.valueOf(days);
|
|
}
|
|
}
|
|
|
|
+ if (columnForTopVo.getId().equals(columnVal.getColumnVo().getId()) && columnForTopVo.getName().equals("迟到次数")){
|
|
|
|
+ double days = 0;
|
|
|
|
+ for (OapiAttendanceGetcolumnvalResponse.ColumnDayAndVal val : columnVal.getColumnVals()) {
|
|
|
|
+ double v = Double.parseDouble(val.getValue());
|
|
|
|
+ days += v;
|
|
|
|
+ }
|
|
|
|
+ lateTimes = String.valueOf(days);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
ddUserDTO.setAttDays(attDays);
|
|
ddUserDTO.setAttDays(attDays);
|
|
ddUserDTO.setRequiredAttDays(requiredAttDays);
|
|
ddUserDTO.setRequiredAttDays(requiredAttDays);
|
|
ddUserDTO.setRestDays(restDays);
|
|
ddUserDTO.setRestDays(restDays);
|
|
|
|
+ ddUserDTO.setLateTimes(lateTimes);
|
|
|
|
|
|
userDTOS.add(ddUserDTO);
|
|
userDTOS.add(ddUserDTO);
|
|
}
|
|
}
|