Commit 8582276bb8cddfb390b22366eb55bbadf7d35eb5
1 parent
825c09b67c
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 40 additions and 40 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
View file @
8582276
| ... | ... | @@ -114,60 +114,60 @@ |
| 114 | 114 | if (manModel != null) |
| 115 | 115 | { |
| 116 | 116 | //男性基本信息 |
| 117 | - one.setHusbandName(model.getUsername()); | |
| 118 | - one.setHusbandNation(model.getNationId()); | |
| 119 | - one.setHusbandBirthday(model.getBirthday()); | |
| 120 | - one.setHusbandAge(DateUtil.getAge(model.getBirthday()).toString()); | |
| 121 | - one.setHusbandEducational(model.getLevelTypeId()); | |
| 122 | - one.setHusbandCardType(model.getCertificateTypeId()); | |
| 123 | - one.setHusbandCardNo(model.getCertificateNum()); | |
| 124 | - one.setHusbandCareer(model.getProfessionTypeId()); | |
| 125 | - one.setHusbandPhone(model.getPhone()); | |
| 126 | - one.setHusbandAccountNature(model.getCensusTypeId()); | |
| 117 | + one.setHusbandName(manModel.getUsername()); | |
| 118 | + one.setHusbandNation(manModel.getNationId()); | |
| 119 | + one.setHusbandBirthday(manModel.getBirthday()); | |
| 120 | + one.setHusbandAge(DateUtil.getAge(manModel.getBirthday()).toString()); | |
| 121 | + one.setHusbandEducational(manModel.getLevelTypeId()); | |
| 122 | + one.setHusbandCardType(manModel.getCertificateTypeId()); | |
| 123 | + one.setHusbandCardNo(manModel.getCertificateNum()); | |
| 124 | + one.setHusbandCareer(manModel.getProfessionTypeId()); | |
| 125 | + one.setHusbandPhone(manModel.getPhone()); | |
| 126 | + one.setHusbandAccountNature(manModel.getCensusTypeId()); | |
| 127 | 127 | |
| 128 | 128 | // 男性户口地址 |
| 129 | - one.setHusbandAccountProvince(model.getProvinceRegisterId()); | |
| 130 | - one.setHusbandAccountCity(model.getCityRegisterId()); | |
| 131 | - one.setHusbandAccountArea(model.getAreaRegisterId()); | |
| 132 | - one.setHusbandAccountStreet(model.getStreetRegisterId()); | |
| 133 | - one.setHusbandAccountAddress(model.getAddressRegister()); | |
| 129 | + one.setHusbandAccountProvince(manModel.getProvinceRegisterId()); | |
| 130 | + one.setHusbandAccountCity(manModel.getCityRegisterId()); | |
| 131 | + one.setHusbandAccountArea(manModel.getAreaRegisterId()); | |
| 132 | + one.setHusbandAccountStreet(manModel.getStreetRegisterId()); | |
| 133 | + one.setHusbandAccountAddress(manModel.getAddressRegister()); | |
| 134 | 134 | |
| 135 | 135 | |
| 136 | 136 | // 男性居住地 |
| 137 | - one.setHusbandCurrentProvince(model.getProvinceId()); | |
| 138 | - one.setHusbandCurrentCity(model.getCityId()); | |
| 139 | - one.setHusbandCurrentArea(model.getAreaId()); | |
| 140 | - one.setHusbandCurrentStreet(model.getStreetId()); | |
| 141 | - one.setHusbandCurrentAddress(model.getAddress()); | |
| 137 | + one.setHusbandCurrentProvince(manModel.getProvinceId()); | |
| 138 | + one.setHusbandCurrentCity(manModel.getCityId()); | |
| 139 | + one.setHusbandCurrentArea(manModel.getAreaId()); | |
| 140 | + one.setHusbandCurrentStreet(manModel.getStreetId()); | |
| 141 | + one.setHusbandCurrentAddress(manModel.getAddress()); | |
| 142 | 142 | |
| 143 | 143 | } |
| 144 | 144 | if (wamenModel != null) |
| 145 | 145 | { |
| 146 | 146 | //女性性基本信息 |
| 147 | - one.setWifeName(model.getUsername()); | |
| 148 | - one.setWifeNation(model.getNationId()); | |
| 149 | - one.setWifeBirthday(model.getBirthday()); | |
| 150 | - one.setWifeAge(DateUtil.getAge(model.getBirthday()).toString()); | |
| 151 | - one.setWifeEducational(model.getLevelTypeId()); | |
| 152 | - one.setWifeCardType(model.getCertificateTypeId()); | |
| 153 | - one.setWifeCardNo(model.getCertificateNum()); | |
| 154 | - one.setWifeCareer(model.getProfessionTypeId()); | |
| 155 | - one.setWifePhone(model.getPhone()); | |
| 156 | - one.setWifeAccountNature(model.getCensusTypeId()); | |
| 147 | + one.setWifeName(wamenModel.getUsername()); | |
| 148 | + one.setWifeNation(wamenModel.getNationId()); | |
| 149 | + one.setWifeBirthday(wamenModel.getBirthday()); | |
| 150 | + one.setWifeAge(DateUtil.getAge(wamenModel.getBirthday()).toString()); | |
| 151 | + one.setWifeEducational(wamenModel.getLevelTypeId()); | |
| 152 | + one.setWifeCardType(wamenModel.getCertificateTypeId()); | |
| 153 | + one.setWifeCardNo(wamenModel.getCertificateNum()); | |
| 154 | + one.setWifeCareer(wamenModel.getProfessionTypeId()); | |
| 155 | + one.setWifePhone(wamenModel.getPhone()); | |
| 156 | + one.setWifeAccountNature(wamenModel.getCensusTypeId()); | |
| 157 | 157 | |
| 158 | 158 | // 妇女户口地址 |
| 159 | - one.setWifeAccountProvince(model.getProvinceRegisterId()); | |
| 160 | - one.setWifeAccountCity(model.getCityRegisterId()); | |
| 161 | - one.setWifeAccountArea(model.getAreaRegisterId()); | |
| 162 | - one.setWifeAccountStreet(model.getStreetRegisterId()); | |
| 163 | - one.setWifeAccountAddress(model.getAddressRegister()); | |
| 159 | + one.setWifeAccountProvince(wamenModel.getProvinceRegisterId()); | |
| 160 | + one.setWifeAccountCity(wamenModel.getCityRegisterId()); | |
| 161 | + one.setWifeAccountArea(wamenModel.getAreaRegisterId()); | |
| 162 | + one.setWifeAccountStreet(wamenModel.getStreetRegisterId()); | |
| 163 | + one.setWifeAccountAddress(wamenModel.getAddressRegister()); | |
| 164 | 164 | |
| 165 | 165 | // 妇女居住地 |
| 166 | - one.setWifeCurrentProvince(model.getProvinceId()); | |
| 167 | - one.setWifeCurrentCity(model.getCityId()); | |
| 168 | - one.setWifeCurrentArea(model.getAreaId()); | |
| 169 | - one.setWifeCurrentStreet(model.getStreetId()); | |
| 170 | - one.setWifeCurrentAddress(model.getAddress()); | |
| 166 | + one.setWifeCurrentProvince(wamenModel.getProvinceId()); | |
| 167 | + one.setWifeCurrentCity(wamenModel.getCityId()); | |
| 168 | + one.setWifeCurrentArea(wamenModel.getAreaId()); | |
| 169 | + one.setWifeCurrentStreet(wamenModel.getStreetId()); | |
| 170 | + one.setWifeCurrentAddress(wamenModel.getAddress()); | |
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | BaseResponse baseResponse = new BaseResponse(); |