diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java index 2924d24..dbb7aa6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java @@ -114,60 +114,60 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen if (manModel != null) { //男性基本信息 - one.setHusbandName(model.getUsername()); - one.setHusbandNation(model.getNationId()); - one.setHusbandBirthday(model.getBirthday()); - one.setHusbandAge(DateUtil.getAge(model.getBirthday()).toString()); - one.setHusbandEducational(model.getLevelTypeId()); - one.setHusbandCardType(model.getCertificateTypeId()); - one.setHusbandCardNo(model.getCertificateNum()); - one.setHusbandCareer(model.getProfessionTypeId()); - one.setHusbandPhone(model.getPhone()); - one.setHusbandAccountNature(model.getCensusTypeId()); + one.setHusbandName(manModel.getUsername()); + one.setHusbandNation(manModel.getNationId()); + one.setHusbandBirthday(manModel.getBirthday()); + one.setHusbandAge(DateUtil.getAge(manModel.getBirthday()).toString()); + one.setHusbandEducational(manModel.getLevelTypeId()); + one.setHusbandCardType(manModel.getCertificateTypeId()); + one.setHusbandCardNo(manModel.getCertificateNum()); + one.setHusbandCareer(manModel.getProfessionTypeId()); + one.setHusbandPhone(manModel.getPhone()); + one.setHusbandAccountNature(manModel.getCensusTypeId()); // 男性户口地址 - one.setHusbandAccountProvince(model.getProvinceRegisterId()); - one.setHusbandAccountCity(model.getCityRegisterId()); - one.setHusbandAccountArea(model.getAreaRegisterId()); - one.setHusbandAccountStreet(model.getStreetRegisterId()); - one.setHusbandAccountAddress(model.getAddressRegister()); + one.setHusbandAccountProvince(manModel.getProvinceRegisterId()); + one.setHusbandAccountCity(manModel.getCityRegisterId()); + one.setHusbandAccountArea(manModel.getAreaRegisterId()); + one.setHusbandAccountStreet(manModel.getStreetRegisterId()); + one.setHusbandAccountAddress(manModel.getAddressRegister()); // 男性居住地 - one.setHusbandCurrentProvince(model.getProvinceId()); - one.setHusbandCurrentCity(model.getCityId()); - one.setHusbandCurrentArea(model.getAreaId()); - one.setHusbandCurrentStreet(model.getStreetId()); - one.setHusbandCurrentAddress(model.getAddress()); + one.setHusbandCurrentProvince(manModel.getProvinceId()); + one.setHusbandCurrentCity(manModel.getCityId()); + one.setHusbandCurrentArea(manModel.getAreaId()); + one.setHusbandCurrentStreet(manModel.getStreetId()); + one.setHusbandCurrentAddress(manModel.getAddress()); } if (wamenModel != null) { //女性性基本信息 - one.setWifeName(model.getUsername()); - one.setWifeNation(model.getNationId()); - one.setWifeBirthday(model.getBirthday()); - one.setWifeAge(DateUtil.getAge(model.getBirthday()).toString()); - one.setWifeEducational(model.getLevelTypeId()); - one.setWifeCardType(model.getCertificateTypeId()); - one.setWifeCardNo(model.getCertificateNum()); - one.setWifeCareer(model.getProfessionTypeId()); - one.setWifePhone(model.getPhone()); - one.setWifeAccountNature(model.getCensusTypeId()); + one.setWifeName(wamenModel.getUsername()); + one.setWifeNation(wamenModel.getNationId()); + one.setWifeBirthday(wamenModel.getBirthday()); + one.setWifeAge(DateUtil.getAge(wamenModel.getBirthday()).toString()); + one.setWifeEducational(wamenModel.getLevelTypeId()); + one.setWifeCardType(wamenModel.getCertificateTypeId()); + one.setWifeCardNo(wamenModel.getCertificateNum()); + one.setWifeCareer(wamenModel.getProfessionTypeId()); + one.setWifePhone(wamenModel.getPhone()); + one.setWifeAccountNature(wamenModel.getCensusTypeId()); // 妇女户口地址 - one.setWifeAccountProvince(model.getProvinceRegisterId()); - one.setWifeAccountCity(model.getCityRegisterId()); - one.setWifeAccountArea(model.getAreaRegisterId()); - one.setWifeAccountStreet(model.getStreetRegisterId()); - one.setWifeAccountAddress(model.getAddressRegister()); + one.setWifeAccountProvince(wamenModel.getProvinceRegisterId()); + one.setWifeAccountCity(wamenModel.getCityRegisterId()); + one.setWifeAccountArea(wamenModel.getAreaRegisterId()); + one.setWifeAccountStreet(wamenModel.getStreetRegisterId()); + one.setWifeAccountAddress(wamenModel.getAddressRegister()); // 妇女居住地 - one.setWifeCurrentProvince(model.getProvinceId()); - one.setWifeCurrentCity(model.getCityId()); - one.setWifeCurrentArea(model.getAreaId()); - one.setWifeCurrentStreet(model.getStreetId()); - one.setWifeCurrentAddress(model.getAddress()); + one.setWifeCurrentProvince(wamenModel.getProvinceId()); + one.setWifeCurrentCity(wamenModel.getCityId()); + one.setWifeCurrentArea(wamenModel.getAreaId()); + one.setWifeCurrentStreet(wamenModel.getStreetId()); + one.setWifeCurrentAddress(wamenModel.getAddress()); } BaseResponse baseResponse = new BaseResponse();