From 9dcee11880d6bc48c75c5fcd0b877465724b38b5 Mon Sep 17 00:00:00 2001 From: baohanddd Date: Sat, 30 Apr 2016 20:00:27 +0800 Subject: [PATCH] =?UTF-8?q?add=20data=20import=20:=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E3=80=81=E9=83=A8=E9=97=A8=E3=80=81=E7=94=A8=E6=88=B7(?= =?UTF-8?q?=E5=8C=BB=E7=94=9F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataImportTaskServiceImpl.java | 35 ++++++++++++---------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java index be43350..ad5a690 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java @@ -157,41 +157,44 @@ public class DataImportTaskServiceImpl implements DataImportTaskService { UsersQuery usersQuery = new UsersQuery(); for (Organization o:organizationMap.values()) { try { - organizationQuery.setForeignId(organization.getForeignId()); + organizationQuery.setForeignId(o.getForeignId()); List organizationList = organizationService.queryOrganization(organizationQuery); if (organizationList != null && organizationList.size() > 0) { for (Organization odb:organizationList) { - organization.setId(odb.getId()); - organizationService.updateOrganization(organization); + o.setId(odb.getId()); + organizationService.updateOrganization(o); } } else { - organization.setCreated(organization.getModified()); - organizationService.addOrganization(organization); + o.setCreated(o.getModified()); + organizationService.addOrganization(o); } for (Departments d:organization.getDepartmentsMap().values()) { - departments.setOrgId(organization.getId()); - departmentsQuery.setForeignId(departments.getForeignId()); + d.setOrgId(o.getId()); + departmentsQuery.setForeignId(d.getForeignId()); List departmentsList = departmentsService.queryDepartments(departmentsQuery); if (departmentsList != null && departmentsList.size() > 0) { for (Departments dd:departmentsList) { - departments.setId(dd.getId()); - departmentsService.updateDepartments(departments); + d.setId(dd.getId()); + departmentsService.updateDepartments(d); } } else { - departments.setCreated(departments.getModified()); - departmentsService.addDepartments(departments); + d.setCreated(d.getModified()); + departmentsService.addDepartments(d); } for (Users u:departments.getUsersMap().values()) { - usersQuery.setForeignId(users.getForeignId()); + u.setOrgId(o.getId()); + u.setDeptId(d.getId()); + u.setKsId(d.getId()); + usersQuery.setForeignId(u.getForeignId()); List usersList = usersService.queryUsers(usersQuery); if (usersList != null && usersList.size() > 0) { for (Users du:usersList) { - users.setId(du.getId()); - usersService.updateUsers(users); + u.setId(du.getId()); + usersService.updateUsers(u); } } else { - users.setCreated(users.getModified()); - usersService.addUsers(users); + u.setCreated(u.getModified()); + usersService.addUsers(u); } } } -- 1.8.3.1