Commit 452ba5caf5fd8f97cf1f12e4e1c03413d578eb70
1 parent
0bc5116e7f
Exists in
master
and in
6 other branches
产筛
Showing 1 changed file with 14 additions and 12 deletions
platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java
View file @
452ba5c
| ... | ... | @@ -68,13 +68,13 @@ |
| 68 | 68 | //处理意见 |
| 69 | 69 | private String treatOpinion; |
| 70 | 70 | |
| 71 | - private boolean isOpinion; | |
| 71 | + private Boolean isOpinion; | |
| 72 | 72 | |
| 73 | - public boolean isOpinion() { | |
| 73 | + public Boolean getIsOpinion() { | |
| 74 | 74 | return isOpinion; |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - public void setIsOpinion(boolean isOpinion) { | |
| 77 | + public void setIsOpinion(Boolean isOpinion) { | |
| 78 | 78 | this.isOpinion = isOpinion; |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | |
| 82 | 82 | |
| 83 | 83 | |
| ... | ... | @@ -577,21 +577,23 @@ |
| 577 | 577 | |
| 578 | 578 | Criteria c = null; |
| 579 | 579 | |
| 580 | - if (isOpinion) | |
| 580 | + if (isOpinion != null) | |
| 581 | 581 | { |
| 582 | - if (null != treatOpinion) { | |
| 583 | - condition = condition.and("treatOpinion", treatOpinion, MongoOper.LIKE); | |
| 582 | + if (isOpinion) | |
| 583 | + { | |
| 584 | + if (null != treatOpinion) { | |
| 585 | + condition = condition.and("treatOpinion", treatOpinion, MongoOper.LIKE); | |
| 586 | + } | |
| 587 | + else | |
| 588 | + { | |
| 589 | + condition = condition.and("treatOpinion", null, MongoOper.NE); | |
| 590 | + } | |
| 584 | 591 | } |
| 585 | 592 | else |
| 586 | 593 | { |
| 587 | - condition = condition.and("treatOpinion", null, MongoOper.NE); | |
| 594 | + condition = condition.and("treatOpinion", false, MongoOper.EXISTS); | |
| 588 | 595 | } |
| 589 | 596 | } |
| 590 | - else | |
| 591 | - { | |
| 592 | - condition = condition.and("treatOpinion", false, MongoOper.EXISTS); | |
| 593 | - } | |
| 594 | - | |
| 595 | 597 | |
| 596 | 598 | if (null != buildTimeStart) { |
| 597 | 599 | c = Criteria.where("buildTime").gte(buildTimeStart); |