shiyang / regional-platform

Download as
Browse Code »

Commit d87999d05fad4e2a611eb345ccbeadd9d6777261

Authored by hanshaofeng
2 parents 6d3a7ba565 2d607cff5f
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ d87999d
... ... @@ -351,7 +351,7 @@
351 351 result.setId(model.getId());
352 352 result.setUsername(model.getUsername());
353 353 result.setSex(model.getSex());
354   - result.setBirthDay(model.getBuildDay());
  354 + result.setBirthday(model.getBirthday());
355 355 result.setCountryId(model.getCountryId());
356 356 result.setNationId(model.getNationId());
357 357 result.setMarriageId(model.getMarriageId());
... ... @@ -377,11 +377,11 @@
377 377 result.setStreetRegisterId(model.getStreetRegisterId());
378 378 result.setAddressRegister(model.getAddressRegister());
379 379  
380   - result.setPastHistory(JsonUtil.str2Obj(model.getPastHistory(), Map.class));
381   - result.setFamilyHistory(JsonUtil.str2Obj(model.getFamilyHistory(),Map.class));
382   - result.setPersonalHistory(JsonUtil.str2Obj(model.getPresentHistory(),Map.class));
383   - result.setYwgmHistory(JsonUtil.str2Obj(model.getYwgmHistory(),Map.class));
384   - result.setPresentHistory(JsonUtil.str2Obj(model.getPresentHistory(),Map.class));
  380 + result.setPastHistory(model.getPastHistory()==null ? null :JsonUtil.jkstr2Obj(model.getPastHistory(), Map.class));
  381 + result.setFamilyHistory(model.getFamilyHistory() == null ? null : JsonUtil.jkstr2Obj(model.getFamilyHistory(), Map.class));
  382 + result.setPersonalHistory(model.getPresentHistory() == null ? null :JsonUtil.jkstr2Obj(model.getPresentHistory(), Map.class));
  383 + result.setYwgmHistory(model.getYwgmHistory() == null ? null :JsonUtil.jkstr2Obj(model.getYwgmHistory(), Map.class));
  384 + result.setPresentHistory(model.getPresentHistory() == null ? null : JsonUtil.jkstr2Obj(model.getPresentHistory(),Map.class));
385 385  
386 386 result.setVcCardNo(model.getVcCardNo());
387 387 result.setBuildDoctor(model.getBuildDoctor());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java View file @ d87999d
... ... @@ -17,7 +17,7 @@
17 17 //性别
18 18 private String sex;
19 19 //出生日期
20   - private String birthDay;
  20 + private String birthday;
21 21 //国籍
22 22 private String countryId;
23 23 //民族Id
24 24  
... ... @@ -115,12 +115,12 @@
115 115 this.sex = sex;
116 116 }
117 117  
118   - public String getBirthDay() {
119   - return birthDay;
  118 + public String getBirthday() {
  119 + return birthday;
120 120 }
121 121  
122   - public void setBirthDay(String birthDay) {
123   - this.birthDay = birthDay;
  122 + public void setBirthday(String birthday) {
  123 + this.birthday = birthday;
124 124 }
125 125  
126 126 public String getCountryId() {