Commit ec6e9a643aae334a9d0f3fca24f6c7af0e709f49
1 parent
328b1451e4
Exists in
master
and in
6 other branches
肌萎缩
Showing 1 changed file with 8 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
View file @
ec6e9a6
... | ... | @@ -33,6 +33,7 @@ |
33 | 33 | import java.io.IOException; |
34 | 34 | import java.io.OutputStream; |
35 | 35 | import java.util.*; |
36 | +import java.util.regex.Pattern; | |
36 | 37 | |
37 | 38 | @Component |
38 | 39 | public class SmnFacade { |
... | ... | @@ -203,9 +204,9 @@ |
203 | 204 | if(StringUtils.isNotEmpty(param.getHusbandQueryNo())) |
204 | 205 | { |
205 | 206 | query.addCriteria(new Criteria(). |
206 | - orOperator(Criteria.where("husbandSmns.husbandPhone").is(param.getHusbandQueryNo()), | |
207 | - Criteria.where("husbandSmns.husbandCardNo").is(param.getHusbandQueryNo()), | |
208 | - Criteria.where("husbandSmns.husbandName").is(param.getHusbandQueryNo()))); | |
207 | + orOperator(Criteria.where("husbandSmns.husbandPhone").regex(Pattern.compile("^.*"+param.getHusbandQueryNo()+".*$")), | |
208 | + Criteria.where("husbandSmns.husbandCardNo").regex(Pattern.compile("^.*"+param.getHusbandQueryNo()+".*$")), | |
209 | + Criteria.where("husbandSmns.husbandName").regex(Pattern.compile("^.*"+param.getHusbandQueryNo()+".*$")))); | |
209 | 210 | } |
210 | 211 | String husbandYbNum = param.getHusbandYbNum(); |
211 | 212 | if (StringUtils.isNotEmpty(husbandYbNum)) { |
... | ... | @@ -251,7 +252,9 @@ |
251 | 252 | |
252 | 253 | if(StringUtils.isNotEmpty(param.getQueryNo())) |
253 | 254 | { |
254 | - query.addCriteria(new Criteria().orOperator(Criteria.where("phone").is(param.getQueryNo()), Criteria.where("cardNo").is(param.getQueryNo()), Criteria.where("username").regex("/"+param.getQueryNo()+"/"))); | |
255 | + query.addCriteria(new Criteria().orOperator(Criteria.where("phone").regex(Pattern.compile("^.*"+param.getQueryNo()+".*$")), | |
256 | + Criteria.where("cardNo").regex(Pattern.compile("^.*"+param.getQueryNo()+".*$")), | |
257 | + Criteria.where("username").regex(Pattern.compile("^.*"+param.getQueryNo()+".*$")))); | |
255 | 258 | } |
256 | 259 | String ybNum = param.getYbNum(); |
257 | 260 | if (StringUtils.isNotEmpty(ybNum)) { |
... | ... | @@ -342,6 +345,7 @@ |
342 | 345 | query.with(new Sort(Sort.Direction.DESC, "created")); |
343 | 346 | } |
344 | 347 | |
348 | + System.out.println(query.toString()); | |
345 | 349 | long count = mongoTemplate.count(query, SmnModel.class); |
346 | 350 | param.mysqlBuild((int) count); |
347 | 351 | query.skip(param.getOffset()).limit(param.getLimit()); |