jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 3afaa064f7cdaa55f3a2c4925599c2ccdba72a3b

Authored by wtt
1 parent 261e609e4b
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 2 changed files with 7 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java View file @ 3afaa06
... ... @@ -124,9 +124,11 @@
124 124 @ResponseBody
125 125 @TokenRequired
126 126 public BaseObjectResponse queryChooseBabys(HttpServletRequest request, @RequestParam(required = false) String vcCardNo,
127   - @RequestParam(required = false) String cardNo, String coupon, @RequestParam(required = false) String ynStatus) {
  127 + @RequestParam(required = false) String cardNo,
  128 + @RequestParam(required = false) String encoded,
  129 + String coupon, @RequestParam(required = false) String ynStatus) {
128 130 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
129   - return babyCheckFacade.queryChooseBabys(vcCardNo, cardNo, loginState.getId(), coupon, ynStatus);
  131 + return babyCheckFacade.queryChooseBabys(vcCardNo, cardNo,encoded, loginState.getId(), coupon, ynStatus);
130 132 }
131 133  
132 134  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 3afaa06
... ... @@ -1375,7 +1375,7 @@
1375 1375 * @param coupon
1376 1376 * @return
1377 1377 */
1378   - public BaseObjectResponse queryChooseBabys(String vcCardNo, String cardNo, Integer userId, String coupon, String ynStatus) {
  1378 + public BaseObjectResponse queryChooseBabys(String vcCardNo, String cardNo,String encoded, Integer userId, String coupon, String ynStatus) {
1379 1379  
1380 1380  
1381 1381 Map map = new HashMap();
1382 1382  
... ... @@ -1394,10 +1394,11 @@
1394 1394 boolean isBuild = false;
1395 1395 List<BabyChooseResult> results = new ArrayList<>();
1396 1396  
1397   - if (!StringUtils.isEmpty(vcCardNo) || !StringUtils.isEmpty(cardNo) || StringUtils.isNotEmpty(coupon)) {
  1397 + if (!StringUtils.isEmpty(vcCardNo) || !StringUtils.isEmpty(cardNo) || StringUtils.isNotEmpty(coupon)|| StringUtils.isNotEmpty(encoded) ) {
1398 1398 BabyModelQuery babyQuery = new BabyModelQuery();
1399 1399 babyQuery.setPhoneOrcardNo(StringUtils.isEmpty(cardNo) ? null : cardNo); //手机号码或者身份证号码
1400 1400 babyQuery.setVcCardNo(StringUtils.isEmpty(vcCardNo) ? null : vcCardNo);
  1401 + babyQuery.setEncoded(StringUtils.isEmpty(encoded) ? null : encoded);
1401 1402 if (StringUtils.isNotEmpty(ynStatus)) {
1402 1403 babyQuery.setDataStatus(false);
1403 1404 } else {