|
@@ -607,11 +607,13 @@ public class WorkAttendanceApiController {
|
|
|
|
|
|
PersonInfo approvalPerson = personInfoService.get(fillAttendance.getApprovalPersonId());
|
|
PersonInfo approvalPerson = personInfoService.get(fillAttendance.getApprovalPersonId());
|
|
|
|
|
|
|
|
+ PersonInfo workerPerson = personInfoService.get(fillAttendance.getPersonId());
|
|
|
|
+
|
|
WorkAttendanceDTO workAttendanceDTO = new WorkAttendanceDTO();
|
|
WorkAttendanceDTO workAttendanceDTO = new WorkAttendanceDTO();
|
|
BeanUtils.copyProperties(fillAttendance, workAttendanceDTO);
|
|
BeanUtils.copyProperties(fillAttendance, workAttendanceDTO);
|
|
workAttendanceDTO.setFillAttendanceDayAndTime(fillAttendance.getFillDay() + " " + fillAttendance.getFillAttendanceTime());
|
|
workAttendanceDTO.setFillAttendanceDayAndTime(fillAttendance.getFillDay() + " " + fillAttendance.getFillAttendanceTime());
|
|
- workAttendanceDTO.setPersonName(personInfo.getName());
|
|
|
|
- workAttendanceDTO.setFaceImageUrl(personInfo.getFaceImageUrl());
|
|
|
|
|
|
+ workAttendanceDTO.setPersonName(workerPerson.getName());
|
|
|
|
+ workAttendanceDTO.setFaceImageUrl(workerPerson.getFaceImageUrl());
|
|
workAttendanceDTO.setApprovalPersonName(approvalPerson.getName());
|
|
workAttendanceDTO.setApprovalPersonName(approvalPerson.getName());
|
|
if (fillAttendance.getType().equals("1")) {
|
|
if (fillAttendance.getType().equals("1")) {
|
|
workAttendanceDTO.setTypeN("外勤打卡");
|
|
workAttendanceDTO.setTypeN("外勤打卡");
|