liquanyu / regional-platform

Download as
Browse Code »

Commit de8b2a79412a06d3d9bd032021fe6146ca09c79d

Authored by liquanyu
1 parent 33550a461a
Exists in master and in 1 other branch dev

update code

Showing 4 changed files with 52 additions and 2 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ de8b2a7
... ... @@ -55,6 +55,16 @@
55 55 private String enable;
56 56 private List<String> enableListNot;
57 57  
  58 + private String phoneOrcardNo;
  59 +
  60 + public String getPhoneOrcardNo() {
  61 + return phoneOrcardNo;
  62 + }
  63 +
  64 + public void setPhoneOrcardNo(String phoneOrcardNo) {
  65 + this.phoneOrcardNo = phoneOrcardNo;
  66 + }
  67 +
58 68 public List<String> getEnableListNot() {
59 69 return enableListNot;
60 70 }
... ... @@ -689,6 +699,19 @@
689 699 condition.andCondition(new MongoCondition(cr));
690 700  
691 701 }
  702 +
  703 +
  704 + if (null != phoneOrcardNo) {
  705 + MongoCondition c1 = MongoCondition.newInstance();
  706 + MongoCondition con1 = MongoCondition.newInstance("phone", phoneOrcardNo, MongoOper.IS);
  707 + MongoCondition con2 = MongoCondition.newInstance("mcertNo", phoneOrcardNo, MongoOper.IS);
  708 + if(c!=null) {
  709 + c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
  710 + }else {
  711 + c = c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
  712 + }
  713 + }
  714 +
692 715  
693 716 if (null != gteModified && null != gteCreated) {
694 717 MongoCondition mongoCondition = new MongoCondition("modified", gteModified, MongoOper.GTE);
platform-dal/src/main/java/com/lyms/platform/query/PersonModelQuery.java View file @ de8b2a7
... ... @@ -41,7 +41,10 @@
41 41  
42 42 private Integer yn;
43 43  
  44 + private String phoneOrcardNo;
44 45  
  46 +
  47 +
45 48 @Override
46 49 public MongoQuery convertToQuery() {
47 50 MongoCondition condition = MongoCondition.newInstance();
48 51  
49 52  
... ... @@ -71,10 +74,34 @@
71 74 Criteria c = Criteria.where("type").in(types[0],types[1]);
72 75 return new MongoCondition(condition.getCriteria().andOperator(c)).toMongoQuery();
73 76 }
  77 + Criteria c1 = null;
74 78  
  79 + if (null != phoneOrcardNo) {
  80 + MongoCondition c = MongoCondition.newInstance();
  81 + MongoCondition con1 = MongoCondition.newInstance("phone", phoneOrcardNo, MongoOper.IS);
  82 + MongoCondition con2 = MongoCondition.newInstance("cardNo", phoneOrcardNo, MongoOper.IS);
  83 + if(c1!=null) {
  84 + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
  85 + }else {
  86 + c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
  87 + }
  88 + }
  89 +
  90 + if (null != c1) {
  91 + condition = condition.andCondition(new MongoCondition(c1));
  92 +
  93 + }
  94 +
75 95 return condition.toMongoQuery();
76 96 }
77 97  
  98 + public String getPhoneOrcardNo() {
  99 + return phoneOrcardNo;
  100 + }
  101 +
  102 + public void setPhoneOrcardNo(String phoneOrcardNo) {
  103 + this.phoneOrcardNo = phoneOrcardNo;
  104 + }
78 105  
79 106 public Integer[] getTypes() {
80 107 return types;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ de8b2a7
... ... @@ -1232,7 +1232,7 @@
1232 1232 PersonModelQuery personModelQuery = new PersonModelQuery();
1233 1233 personModelQuery.setYn(YnEnums.YES.getId());
1234 1234 personModelQuery.setType(2);
1235   - personModelQuery.setCardNo(param.getCardNo());
  1235 + personModelQuery.setPhoneOrcardNo(param.getCardNo());
1236 1236 List<PersonModel> personModels = personService.queryPersons(personModelQuery);
1237 1237 if (CollectionUtils.isNotEmpty(personModels)) {
1238 1238 for (PersonModel babayPerson : personModels) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ de8b2a7
... ... @@ -729,7 +729,7 @@
729 729  
730 730 if (!StringUtils.isEmpty(vcCardNo) || !StringUtils.isEmpty(cardNo)) {
731 731 BabyModelQuery babyQuery = new BabyModelQuery();
732   - babyQuery.setMcertNo(StringUtils.isEmpty(cardNo) ? null : cardNo);
  732 + babyQuery.setPhoneOrcardNo(StringUtils.isEmpty(cardNo) ? null : cardNo); //手机号码或者身份证号码
733 733 babyQuery.setVcCardNo(StringUtils.isEmpty(vcCardNo) ? null : vcCardNo);
734 734 babyQuery.setYn(YnEnums.YES.getId());
735 735