|
@@ -215,9 +215,11 @@ public class WorkAttendanceController {
|
|
|
}
|
|
|
|
|
|
personMap.put("name",personInfo.getName());
|
|
|
- personMap.put("company",personInfo.getPosition1());
|
|
|
- personMap.put("department",personInfo.getPosition2());
|
|
|
- personMap.put("jobNumber",personInfo.getPosition3());
|
|
|
+ personMap.put("position1",personInfo.getPosition1());
|
|
|
+ personMap.put("position2",personInfo.getPosition2());
|
|
|
+ personMap.put("position3",personInfo.getPosition3());
|
|
|
+ personMap.put("position4",personInfo.getPosition4());
|
|
|
+ personMap.put("position5",personInfo.getPosition5());
|
|
|
personMap.put("workDays",workDays);
|
|
|
personMap.put("restDays",restDays);
|
|
|
personMap.put("lateNum",lateNum);
|
|
@@ -367,14 +369,14 @@ public class WorkAttendanceController {
|
|
|
String personName = (String) personMap.get("name");
|
|
|
row.createCell(0).setCellValue(personName);
|
|
|
|
|
|
- String companyName = (String) personMap.get("company");
|
|
|
- row.createCell(1).setCellValue(companyName);
|
|
|
+ String _position1 = (String) personMap.get("position1");
|
|
|
+ row.createCell(1).setCellValue(_position1);
|
|
|
|
|
|
- String department = (String) personMap.get("department");
|
|
|
- row.createCell(2).setCellValue(department);
|
|
|
+ String _position2 = (String) personMap.get("position2");
|
|
|
+ row.createCell(2).setCellValue(_position2);
|
|
|
|
|
|
- String personJobNumber = (String) personMap.get("jobNumber");
|
|
|
- row.createCell(3).setCellValue(personJobNumber);
|
|
|
+ String _position3 = (String) personMap.get("position3");
|
|
|
+ row.createCell(3).setCellValue(_position3);
|
|
|
|
|
|
Integer workDays = Integer.valueOf(personMap.get("workDays").toString());
|
|
|
row.createCell(4).setCellValue(workDays);
|