From 25e22f35981047dad536938240b0a8dc35ffe908 Mon Sep 17 00:00:00 2001 From: wtt Date: Sun, 27 Sep 2020 17:20:53 +0800 Subject: [PATCH] update --- .../com/lyms/platform/pojo/PremaritalCheckup.java | 21 +++++++++++++++++++++ .../operate/web/facade/PremaritalCheckupFacade.java | 7 +++++++ .../web/request/PremaritalCheckupAddRequest.java | 20 ++++++++++++++++++++ .../web/result/PremaritalCheckupPageResult.java | 18 ++++++++++++++++++ .../operate/web/result/PremaritalCheckupResult.java | 18 ++++++++++++++++++ 5 files changed, 84 insertions(+) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java index e693325..bbfde8c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java @@ -81,6 +81,11 @@ public class PremaritalCheckup extends BaseModel { private Integer liYi; //子女(个数) private Integer childrenNum; + //陵城定制子 + private Integer childrenNumZ; + //陵城定制女 + private Integer childrenNumN; + //家族近亲婚配(1: 有 2: 无) private Integer nextOfKin; /* 有的情况下会选择以下条件 */ @@ -838,6 +843,22 @@ public class PremaritalCheckup extends BaseModel { this.renLiu = renLiu; } + public Integer getChildrenNumZ() { + return childrenNumZ; + } + + public void setChildrenNumZ(Integer childrenNumZ) { + this.childrenNumZ = childrenNumZ; + } + + public Integer getChildrenNumN() { + return childrenNumN; + } + + public void setChildrenNumN(Integer childrenNumN) { + this.childrenNumN = childrenNumN; + } + public Integer getChildrenNum() { return childrenNum; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index 6ffd131..c7e6d15 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -273,6 +273,9 @@ public class PremaritalCheckupFacade { checkupResult.setSangOu(result.getSangOu()); checkupResult.setLiYi(result.getLiYi()); checkupResult.setChildrenNum(result.getChildrenNum()); + checkupResult.setChildrenNumZ(result.getChildrenNumZ()); + checkupResult.setChildrenNumN(result.getChildrenNumN()); + checkupResult.setNextOfKin(result.getNextOfKin()); checkupResult.setParents(result.getParents()); checkupResult.setGrandparent(result.getGrandparent()); @@ -713,6 +716,8 @@ public class PremaritalCheckupFacade { checkup.setMaternalGrandparents(addRequest.getMaternalGrandparents()); checkup.setChildrenNum(addRequest.getChildrenNum()); + checkup.setChildrenNumZ(addRequest.getChildrenNumZ()); + checkup.setChildrenNumN(addRequest.getChildrenNumN()); /** * start 遵化新增字段 * @@ -1792,6 +1797,8 @@ public class PremaritalCheckupFacade { } checkupResult.setNextOfKin(nextOfKin); checkupResult.setChildrenNum(result.getChildrenNum() == null ? "" : result.getChildrenNum() + UnitConstants.REN); + checkupResult.setChildrenNumZ(result.getChildrenNumZ() == null ? "" : result.getChildrenNumZ() + UnitConstants.REN); + checkupResult.setChildrenNumN(result.getChildrenNumN() == null ? "" : result.getChildrenNumN() + UnitConstants.REN); /** * start 遵化新增字段 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java index cd830e4..555ff22 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java @@ -86,6 +86,10 @@ public class PremaritalCheckupAddRequest { private Integer liuchan; //子女(个数) private Integer childrenNum; + private Integer childrenNumZ; + private Integer childrenNumN; + + //家族近亲婚配(1: 有 2: 无) private Integer nextOfKin; /* 有的情况下会选择以下条件 */ @@ -626,6 +630,14 @@ public class PremaritalCheckupAddRequest { this.id = id; } + public Integer getChildrenNumN() { + return childrenNumN; + } + + public void setChildrenNumN(Integer childrenNumN) { + this.childrenNumN = childrenNumN; + } + public String getParentId() { return parentId; } @@ -1183,6 +1195,14 @@ public class PremaritalCheckupAddRequest { return xiongKuo; } + public Integer getChildrenNumZ() { + return childrenNumZ; + } + + public void setChildrenNumZ(Integer childrenNumZ) { + this.childrenNumZ = childrenNumZ; + } + public void setXiongKuo(Integer xiongKuo) { this.xiongKuo = xiongKuo; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java index 7229e48..56cbb69 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java @@ -96,6 +96,8 @@ public class PremaritalCheckupPageResult { private String nextOfKin; //子女(个数) private String childrenNum; + private String childrenNumZ; + private String childrenNumN; //既往婚育史(1: 有 2: 无) @@ -1037,6 +1039,22 @@ public class PremaritalCheckupPageResult { return ruFangFaYu; } + public String getChildrenNumZ() { + return childrenNumZ; + } + + public void setChildrenNumZ(String childrenNumZ) { + this.childrenNumZ = childrenNumZ; + } + + public String getChildrenNumN() { + return childrenNumN; + } + + public void setChildrenNumN(String childrenNumN) { + this.childrenNumN = childrenNumN; + } + public void setRuFangFaYu(String ruFangFaYu) { this.ruFangFaYu = ruFangFaYu; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java index b432b90..2904e1c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java @@ -66,6 +66,8 @@ public class PremaritalCheckupResult { private Integer liYi; //子女(个数) private Integer childrenNum; + private Integer childrenNumZ; + private Integer childrenNumN; //家族近亲婚配(1: 有 2: 无) private Integer nextOfKin; /* 有的情况下会选择以下条件 */ @@ -1284,6 +1286,22 @@ public class PremaritalCheckupResult { this.houJie = houJie; } + public Integer getChildrenNumZ() { + return childrenNumZ; + } + + public void setChildrenNumZ(Integer childrenNumZ) { + this.childrenNumZ = childrenNumZ; + } + + public Integer getChildrenNumN() { + return childrenNumN; + } + + public void setChildrenNumN(Integer childrenNumN) { + this.childrenNumN = childrenNumN; + } + public String getHouJieDetails() { return houJieDetails; } -- 1.8.3.1