Commit 825c09b67c87373eaf89f3220de119a620c25df2
1 parent
ca1a4e9193
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 75 additions and 31 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
View file @
825c09b
| ... | ... | @@ -93,38 +93,82 @@ |
| 93 | 93 | if (model == null) { |
| 94 | 94 | return new BaseResponse(); |
| 95 | 95 | } |
| 96 | + ResidentsArchiveModel model1 = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(model.getSpouseCardNo())), ResidentsArchiveModel.class); | |
| 97 | + | |
| 98 | + ResidentsArchiveModel manModel = null; | |
| 99 | + ResidentsArchiveModel wamenModel = null; | |
| 100 | + | |
| 101 | + //男 | |
| 102 | + if ("5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(model.getSex())) | |
| 103 | + { | |
| 104 | + manModel = model; | |
| 105 | + wamenModel = model1; | |
| 106 | + } | |
| 107 | + else | |
| 108 | + { | |
| 109 | + wamenModel= model; | |
| 110 | + manModel = model1; | |
| 111 | + } | |
| 96 | 112 | one = new PreEugenicsBaseModel(); |
| 97 | - one.setWifeName(model.getUsername()); | |
| 98 | - one.setWifeNation(model.getNationId()); | |
| 99 | - one.setWifeBirthday(model.getBirthday()); | |
| 100 | - one.setWifeAge(DateUtil.getAge(model.getBirthday()).toString()); | |
| 101 | - one.setWifeEducational(model.getLevelTypeId()); | |
| 102 | - one.setWifeCardType(model.getCertificateTypeId()); | |
| 103 | - one.setWifeCardNo(model.getCertificateNum()); | |
| 104 | - one.setWifeCareer(model.getProfessionTypeId()); | |
| 105 | - one.setWifePhone(model.getPhone()); | |
| 106 | - one.setWifeAccountNature(model.getCensusTypeId()); | |
| 113 | + ////男 | |
| 114 | + if (manModel != null) | |
| 115 | + { | |
| 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()); | |
| 107 | 127 | |
| 108 | - // 妇女户口地址 | |
| 109 | - one.setWifeAccountProvince(model.getProvinceRegisterId()); | |
| 110 | - one.setWifeAccountCity(model.getCityRegisterId()); | |
| 111 | - one.setWifeAccountArea(model.getAreaRegisterId()); | |
| 112 | - one.setWifeAccountStreet(model.getStreetRegisterId()); | |
| 113 | - one.setWifeAccountAddress(model.getAddressRegister()); | |
| 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()); | |
| 114 | 134 | |
| 115 | 135 | |
| 116 | - // 妇女居住地 | |
| 117 | - one.setWifeCurrentProvince(model.getProvinceId()); | |
| 118 | - one.setWifeCurrentCity(model.getCityId()); | |
| 119 | - one.setWifeCurrentArea(model.getAreaId()); | |
| 120 | - one.setWifeCurrentStreet(model.getStreetId()); | |
| 121 | - one.setWifeCurrentAddress(model.getAddress()); | |
| 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()); | |
| 122 | 142 | |
| 123 | - // 丈夫信息 | |
| 124 | - one.setHusbandName(model.getSpouseName()); | |
| 125 | - one.setHusbandPhone(model.getSpousePhone()); | |
| 126 | - one.setHusbandCardType(model.getSpouseCertTypeId()); | |
| 127 | - one.setHusbandCardNo(model.getSpouseCardNo()); | |
| 143 | + } | |
| 144 | + if (wamenModel != null) | |
| 145 | + { | |
| 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()); | |
| 157 | + | |
| 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()); | |
| 164 | + | |
| 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()); | |
| 171 | + } | |
| 128 | 172 | |
| 129 | 173 | BaseResponse baseResponse = new BaseResponse(); |
| 130 | 174 | baseResponse.setObject(one); |