Commit 9dcee11880d6bc48c75c5fcd0b877465724b38b5
1 parent
e56bbc286b
Exists in
master
and in
8 other branches
add data import :机构、部门、用户(医生)
Showing 1 changed file with 19 additions and 16 deletions
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java
View file @
9dcee11
| ... | ... | @@ -157,41 +157,44 @@ |
| 157 | 157 | UsersQuery usersQuery = new UsersQuery(); |
| 158 | 158 | for (Organization o:organizationMap.values()) { |
| 159 | 159 | try { |
| 160 | - organizationQuery.setForeignId(organization.getForeignId()); | |
| 160 | + organizationQuery.setForeignId(o.getForeignId()); | |
| 161 | 161 | List<Organization> organizationList = organizationService.queryOrganization(organizationQuery); |
| 162 | 162 | if (organizationList != null && organizationList.size() > 0) { |
| 163 | 163 | for (Organization odb:organizationList) { |
| 164 | - organization.setId(odb.getId()); | |
| 165 | - organizationService.updateOrganization(organization); | |
| 164 | + o.setId(odb.getId()); | |
| 165 | + organizationService.updateOrganization(o); | |
| 166 | 166 | } |
| 167 | 167 | } else { |
| 168 | - organization.setCreated(organization.getModified()); | |
| 169 | - organizationService.addOrganization(organization); | |
| 168 | + o.setCreated(o.getModified()); | |
| 169 | + organizationService.addOrganization(o); | |
| 170 | 170 | } |
| 171 | 171 | for (Departments d:organization.getDepartmentsMap().values()) { |
| 172 | - departments.setOrgId(organization.getId()); | |
| 173 | - departmentsQuery.setForeignId(departments.getForeignId()); | |
| 172 | + d.setOrgId(o.getId()); | |
| 173 | + departmentsQuery.setForeignId(d.getForeignId()); | |
| 174 | 174 | List<Departments> departmentsList = departmentsService.queryDepartments(departmentsQuery); |
| 175 | 175 | if (departmentsList != null && departmentsList.size() > 0) { |
| 176 | 176 | for (Departments dd:departmentsList) { |
| 177 | - departments.setId(dd.getId()); | |
| 178 | - departmentsService.updateDepartments(departments); | |
| 177 | + d.setId(dd.getId()); | |
| 178 | + departmentsService.updateDepartments(d); | |
| 179 | 179 | } |
| 180 | 180 | } else { |
| 181 | - departments.setCreated(departments.getModified()); | |
| 182 | - departmentsService.addDepartments(departments); | |
| 181 | + d.setCreated(d.getModified()); | |
| 182 | + departmentsService.addDepartments(d); | |
| 183 | 183 | } |
| 184 | 184 | for (Users u:departments.getUsersMap().values()) { |
| 185 | - usersQuery.setForeignId(users.getForeignId()); | |
| 185 | + u.setOrgId(o.getId()); | |
| 186 | + u.setDeptId(d.getId()); | |
| 187 | + u.setKsId(d.getId()); | |
| 188 | + usersQuery.setForeignId(u.getForeignId()); | |
| 186 | 189 | List<Users> usersList = usersService.queryUsers(usersQuery); |
| 187 | 190 | if (usersList != null && usersList.size() > 0) { |
| 188 | 191 | for (Users du:usersList) { |
| 189 | - users.setId(du.getId()); | |
| 190 | - usersService.updateUsers(users); | |
| 192 | + u.setId(du.getId()); | |
| 193 | + usersService.updateUsers(u); | |
| 191 | 194 | } |
| 192 | 195 | } else { |
| 193 | - users.setCreated(users.getModified()); | |
| 194 | - usersService.addUsers(users); | |
| 196 | + u.setCreated(u.getModified()); | |
| 197 | + usersService.addUsers(u); | |
| 195 | 198 | } |
| 196 | 199 | } |
| 197 | 200 | } |