Commit 6c7246428e9711d33b0e7f42e8e6cd95d7a037cb
1 parent
b78bca2507
Exists in
master
and in
1 other branch
增加设置parentid
Showing 2 changed files with 10 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
6c72464
| ... | ... | @@ -254,6 +254,8 @@ |
| 254 | 254 | List<BabyApplyOrderResult> babyApplyOrderResults = new ArrayList<>(); |
| 255 | 255 | referralApplyOrderQuery.setName(applyOrderQueryRequest.getName()); |
| 256 | 256 | referralApplyOrderQuery.setCardNo(applyOrderQueryRequest.getCardNo()); |
| 257 | + referralApplyOrderQuery.setPhone(applyOrderQueryRequest.getPhone()); | |
| 258 | + | |
| 257 | 259 | //1 转入 0转出 |
| 258 | 260 | if ("1".equals(applyOrderQueryRequest.getAction())) { |
| 259 | 261 | List data = autoMatchFacade.matchOrgId(userId); |
| ... | ... | @@ -266,7 +268,9 @@ |
| 266 | 268 | referralApplyOrderQuery.setOutHospitalId(data.get(0) + ""); |
| 267 | 269 | } |
| 268 | 270 | } |
| 269 | - referralApplyOrderQuery.setExpVip(applyOrderQueryRequest.getTyVip()); | |
| 271 | + if(null!=applyOrderQueryRequest.getTyVip() &&Boolean.TRUE.equals(applyOrderQueryRequest.getTyVip())){ | |
| 272 | + referralApplyOrderQuery.setExpVip(1); | |
| 273 | + } | |
| 270 | 274 | |
| 271 | 275 | List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); |
| 272 | 276 | if (CollectionUtils.isNotEmpty(orderModels)) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java
View file @
6c72464
| ... | ... | @@ -14,10 +14,10 @@ |
| 14 | 14 | private String cardNo; |
| 15 | 15 | //儿童姓名 |
| 16 | 16 | private String name; |
| 17 | - //联系方式 | |
| 18 | - private String phone; | |
| 19 | 17 | //月龄开始 |
| 20 | 18 | private String ylStart; |
| 19 | + //联系方式 | |
| 20 | + private String phone; | |
| 21 | 21 | //月龄结束 |
| 22 | 22 | private String ylEnd; |
| 23 | 23 | //高危id |
| ... | ... | @@ -33,7 +33,7 @@ |
| 33 | 33 | //转出日期 |
| 34 | 34 | private String transferred; |
| 35 | 35 | //体验会员 |
| 36 | - private Integer tyVip; | |
| 36 | + private Boolean tyVip; | |
| 37 | 37 | // //1 转入 0转出 |
| 38 | 38 | private String action; |
| 39 | 39 | |
| 40 | 40 | |
| ... | ... | @@ -125,11 +125,11 @@ |
| 125 | 125 | this.transferred = transferred; |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | - public Integer getTyVip() { | |
| 128 | + public Boolean getTyVip() { | |
| 129 | 129 | return tyVip; |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | - public void setTyVip(Integer tyVip) { | |
| 132 | + public void setTyVip(Boolean tyVip) { | |
| 133 | 133 | this.tyVip = tyVip; |
| 134 | 134 | } |
| 135 | 135 |