From 752fd2ee289b4b763ff508fb6929ab48e29fbae0 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 12 Mar 2020 14:33:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A6=87=E5=A5=B3=E5=BB=BA=E6=A1=A3=E6=89=93?= =?UTF-8?q?=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/ResidentsArchiveFacade.java | 25 ++++++++++ .../platform/operate/web/facade/ViewFacade.java | 26 +---------- .../operate/web/result/ResidentsArchiveResult.java | 54 ++++++++++++++++++++++ .../operate/web/result/ResidentsPageResult.java | 49 +------------------- 4 files changed, 81 insertions(+), 73 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index e127a4d..a5eafb8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -17,6 +17,7 @@ import com.lyms.platform.operate.web.result.ResidentsArchiveResult; import com.lyms.platform.operate.web.service.ITrackDownService; import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.utils.FunvCommonUtil; +import com.lyms.platform.operate.web.utils.UnitConstants; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; @@ -491,6 +492,30 @@ public class ResidentsArchiveFacade { model = modelList.get(0); //建档详情 result = getResult(model); + if (StringUtils.isNotEmpty(model.getSpouseCardNo())) + { + query.setId(null); + query.setCertificateNum(model.getSpouseCardNo()); + modelList.clear(); + modelList = residentsArchiveService.queryResident(query); + if (CollectionUtils.isNotEmpty(modelList)) + { + //是否显示打印指引单 + result.setIsPrint(true); + ResidentsArchiveModel model1 = modelList.get(0); + result.setSpouseName(model1.getUsername()); + result.setSpouseCardNo(model1.getCertificateNum()); + result.setSpouseSex(FunvCommonUtil.getBaseicConfigByid(model.getSex(), basicConfigService)); + if (model1.getBirthday() != null) { + result.setSpouseAge(com.lyms.platform.common.utils.StringUtils.unitHandle(DateUtil.getAge(model1.getBirthday(), new Date()).toString(), UnitConstants.SUI)); + } + //居住地 + String liveAddress = CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), + model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService); + result.setSpouseAddress(liveAddress); + result.setSpouseCreated(DateUtil.getyyyy_MM_dd(model.getBuildDay())); + } + } } List historyResults = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 8ddd796..582f8af 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -4951,31 +4951,7 @@ public class ViewFacade { ResidentsArchiveModel model = modelList.get(0); //建档详情 result = getResidentsPageResult(model); - if (StringUtils.isNotEmpty(model.getSpouseCardNo())) - { - query.setYn(YnEnums.YES.getId()); - query.setId(null); - query.setCertificateNum(model.getSpouseCardNo()); - modelList.clear(); - modelList = residentsArchiveService.queryResident(query); - if (CollectionUtils.isNotEmpty(modelList)) - { - //是否显示打印指引单 - result.setIsPrint(true); - ResidentsArchiveModel model1 = modelList.get(0); - result.setSpouseName(model1.getUsername()); - result.setSpouseCardNo(model1.getCertificateNum()); - result.setSpouseSex(getBasicConfig(model.getSex())); - if (model1.getBirthday() != null) { - result.setSpouseAge(com.lyms.platform.common.utils.StringUtils.unitHandle(DateUtil.getAge(model1.getBirthday(), new Date()).toString(), UnitConstants.SUI)); - } - //居住地 - String liveAddress = CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), - model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService); - result.setSpouseAddress(liveAddress); - result.setSpouseCreated(DateUtil.getyyyy_MM_dd(model.getBuildDay())); - } - } + } br.setData(result); br.setErrorcode(ErrorCodeConstants.SUCCESS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java index af8dae8..3293721 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java @@ -66,12 +66,26 @@ public class ResidentsArchiveResult { private String spouseName; //配偶证件号 private String spouseCardNo; + + //配偶性别 + private String spouseSex; + //配偶年龄 + private String spouseAge; + //配偶家庭住址 + private String spouseAddress; + //配偶建档时间 + private String spouseCreated; + + //配偶手机 private String spousePhone; //配偶证件类型Id private String spouseCertTypeId; + //是否打印指引单 陵城区妇幼 + private boolean isPrint; + /************配偶信息*************/ @@ -146,6 +160,46 @@ public class ResidentsArchiveResult { //身份证照片 private String photo; + public String getSpouseSex() { + return spouseSex; + } + + public void setSpouseSex(String spouseSex) { + this.spouseSex = spouseSex; + } + + public String getSpouseAge() { + return spouseAge; + } + + public void setSpouseAge(String spouseAge) { + this.spouseAge = spouseAge; + } + + public String getSpouseAddress() { + return spouseAddress; + } + + public void setSpouseAddress(String spouseAddress) { + this.spouseAddress = spouseAddress; + } + + public String getSpouseCreated() { + return spouseCreated; + } + + public void setSpouseCreated(String spouseCreated) { + this.spouseCreated = spouseCreated; + } + + public boolean isPrint() { + return isPrint; + } + + public void setIsPrint(boolean isPrint) { + this.isPrint = isPrint; + } + public String getPhoto() { return photo; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsPageResult.java index 53372c5..14fe17f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsPageResult.java @@ -51,14 +51,7 @@ public class ResidentsPageResult { private String spouseName; //配偶证件号 private String spouseCardNo; - //配偶性别 - private String spouseSex; - //配偶年龄 - private String spouseAge; - //配偶家庭住址 - private String spouseAddress; - //配偶建档时间 - private String spouseCreated; + //配偶手机 private String spousePhone; @@ -132,49 +125,9 @@ public class ResidentsPageResult { private String photo; - //是否打印指引单 陵城区妇幼 - private boolean isPrint; - - - public String getSpouseSex() { - return spouseSex; - } - - public void setSpouseSex(String spouseSex) { - this.spouseSex = spouseSex; - } - - public String getSpouseAge() { - return spouseAge; - } - public void setSpouseAge(String spouseAge) { - this.spouseAge = spouseAge; - } - public String getSpouseAddress() { - return spouseAddress; - } - public void setSpouseAddress(String spouseAddress) { - this.spouseAddress = spouseAddress; - } - - public String getSpouseCreated() { - return spouseCreated; - } - - public void setSpouseCreated(String spouseCreated) { - this.spouseCreated = spouseCreated; - } - - public boolean isPrint() { - return isPrint; - } - - public void setIsPrint(boolean isPrint) { - this.isPrint = isPrint; - } public String getPhoto() { return photo; -- 1.8.3.1