|
@@ -188,9 +188,11 @@ public class SyncTranForAtsFacadeControllerBean extends AbstractSyncTranForAtsFa
|
|
|
IPerson iPerson = PersonFactory.getLocalInstance(ctx);
|
|
|
PersonCollection personCollection = iPerson.getPersonCollection("select number ");
|
|
|
Set<String> persNoSet = new HashSet();
|
|
|
+ HashMap<String,PersonInfo> persInfoMap = new HashMap();
|
|
|
for (int i = 0; i < personCollection.size(); i++) {
|
|
|
PersonInfo personInfo = personCollection.get(i);
|
|
|
persNoSet.add(personInfo.getNumber().toString());
|
|
|
+ persInfoMap.put(personInfo.getNumber().toString(),personInfo);
|
|
|
}
|
|
|
|
|
|
//"id": 928547,
|
|
@@ -265,6 +267,8 @@ public class SyncTranForAtsFacadeControllerBean extends AbstractSyncTranForAtsFa
|
|
|
logger.error("打卡同步:personNumber not exist in shr system, personNumber=" + personNumber);
|
|
|
continue;
|
|
|
}
|
|
|
+ // 姓名
|
|
|
+ cardInfo.setProposer(persInfoMap.get(personNumber));
|
|
|
setCardId.add(personNumber);
|
|
|
cardColl.add(cardInfo);
|
|
|
}
|
|
@@ -287,7 +291,7 @@ public class SyncTranForAtsFacadeControllerBean extends AbstractSyncTranForAtsFa
|
|
|
Map<String, AttendanceFileInfo> attendanceFileMap = AttendanceFileFactory.getLocalInstance(ctx).getPersonByAttendanceNum(setCardId);
|
|
|
logger.error("attendanceFileMap-----" + attendanceFileMap);
|
|
|
logger.error("setCardId-----" + setCardId);
|
|
|
-
|
|
|
+ IPerson personIns = PersonFactory.getLocalInstance(ctx);
|
|
|
CoreBaseCollection cardCollFinally = new CoreBaseCollection();
|
|
|
Collection<Map> seccussArray = new ArrayList<>();
|
|
|
Collection<JSONObject> notExistRecords = new ArrayList<>();
|
|
@@ -315,8 +319,6 @@ public class SyncTranForAtsFacadeControllerBean extends AbstractSyncTranForAtsFa
|
|
|
cardInfo.setPunchCardSource(PunchCardSourceEnum.attenceMachine);
|
|
|
// 考勤实体
|
|
|
AttendanceFileInfo attendanceFileInfo = attendanceFileMap.get(cardInfo.getAttendanceNum());
|
|
|
- // 姓名
|
|
|
- cardInfo.setProposer(attendanceFileInfo.getProposer());
|
|
|
// HR 组织
|
|
|
cardInfo.setHrOrgUnit(attendanceFileInfo.getHrOrgUnit());
|
|
|
// 行政组织
|