Commit f9157492 authored by tangwei's avatar tangwei

增加关联

parent 70c065cc
...@@ -937,6 +937,9 @@ public class ExcelServiceImpl { ...@@ -937,6 +937,9 @@ public class ExcelServiceImpl {
firefighters.setResidence(tempCity[0]); firefighters.setResidence(tempCity[0]);
firefighters.setResidenceDetails(tempCity[1]); firefighters.setResidenceDetails(tempCity[1]);
} }
if (firefighters.getGender() != null) { if (firefighters.getGender() != null) {
String[] tempCity = firefighters.getGender().split("@"); String[] tempCity = firefighters.getGender().split("@");
firefighters.setGender(tempCity[0]); firefighters.setGender(tempCity[0]);
...@@ -967,6 +970,16 @@ public class ExcelServiceImpl { ...@@ -967,6 +970,16 @@ public class ExcelServiceImpl {
if (item.getTelephone() != null) { if (item.getTelephone() != null) {
firefighters.setMobilePhone(item.getTelephone()); firefighters.setMobilePhone(item.getTelephone());
} }
if(item.getAmosOrgCode()!= null){
firefighters.setAmosName(item.getAmosOrgCode());
}
if(item.getAmosOrgId()!= null){
firefighters.setAmosUserId(item.getAmosOrgId());
}
FirefightersInfoDto firefightersInfo = new FirefightersInfoDto(firefighters, firefightersContacts); FirefightersInfoDto firefightersInfo = new FirefightersInfoDto(firefighters, firefightersContacts);
firefightersService.saveFirefighters(firefightersInfo); firefightersService.saveFirefighters(firefightersInfo);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment