From 825c09b67c87373eaf89f3220de119a620c25df2 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 19 Mar 2020 10:06:21 +0800 Subject: [PATCH] update --- .../web/service/impl/PreEugebicsServiceImpl.java | 106 +++++++++++++++------ 1 file changed, 75 insertions(+), 31 deletions(-) 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 a6fd944..2924d24 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 @@ -93,38 +93,82 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen if (model == null) { return new BaseResponse(); } + ResidentsArchiveModel model1 = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(model.getSpouseCardNo())), ResidentsArchiveModel.class); + + ResidentsArchiveModel manModel = null; + ResidentsArchiveModel wamenModel = null; + + //男 + if ("5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(model.getSex())) + { + manModel = model; + wamenModel = model1; + } + else + { + wamenModel= model; + manModel = model1; + } one = new PreEugenicsBaseModel(); - 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.setWifeAccountProvince(model.getProvinceRegisterId()); - one.setWifeAccountCity(model.getCityRegisterId()); - one.setWifeAccountArea(model.getAreaRegisterId()); - one.setWifeAccountStreet(model.getStreetRegisterId()); - one.setWifeAccountAddress(model.getAddressRegister()); - - - // 妇女居住地 - one.setWifeCurrentProvince(model.getProvinceId()); - one.setWifeCurrentCity(model.getCityId()); - one.setWifeCurrentArea(model.getAreaId()); - one.setWifeCurrentStreet(model.getStreetId()); - one.setWifeCurrentAddress(model.getAddress()); - - // 丈夫信息 - one.setHusbandName(model.getSpouseName()); - one.setHusbandPhone(model.getSpousePhone()); - one.setHusbandCardType(model.getSpouseCertTypeId()); - one.setHusbandCardNo(model.getSpouseCardNo()); + ////男 + 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.setHusbandAccountProvince(model.getProvinceRegisterId()); + one.setHusbandAccountCity(model.getCityRegisterId()); + one.setHusbandAccountArea(model.getAreaRegisterId()); + one.setHusbandAccountStreet(model.getStreetRegisterId()); + one.setHusbandAccountAddress(model.getAddressRegister()); + + + // 男性居住地 + one.setHusbandCurrentProvince(model.getProvinceId()); + one.setHusbandCurrentCity(model.getCityId()); + one.setHusbandCurrentArea(model.getAreaId()); + one.setHusbandCurrentStreet(model.getStreetId()); + one.setHusbandCurrentAddress(model.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.setWifeAccountProvince(model.getProvinceRegisterId()); + one.setWifeAccountCity(model.getCityRegisterId()); + one.setWifeAccountArea(model.getAreaRegisterId()); + one.setWifeAccountStreet(model.getStreetRegisterId()); + one.setWifeAccountAddress(model.getAddressRegister()); + + // 妇女居住地 + one.setWifeCurrentProvince(model.getProvinceId()); + one.setWifeCurrentCity(model.getCityId()); + one.setWifeCurrentArea(model.getAreaId()); + one.setWifeCurrentStreet(model.getStreetId()); + one.setWifeCurrentAddress(model.getAddress()); + } BaseResponse baseResponse = new BaseResponse(); baseResponse.setObject(one); -- 1.8.3.1