Commit a4c5db20ce75b4620e75ea5089a977835ef921c0
1 parent
fcdb8484ff
Exists in
master
and in
8 other branches
修改产检删除
Showing 2 changed files with 8 additions and 4 deletions
platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java
View file @
a4c5db2
| ... | ... | @@ -167,11 +167,15 @@ |
| 167 | 167 | } |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | - if (null != dueDateStart && dueDateEnd != null) { | |
| 170 | + if (null != dueDateStart) { | |
| 171 | + c = Criteria.where("dueDate").gte(dueDateStart); | |
| 172 | + } | |
| 173 | + | |
| 174 | + if (null != dueDateEnd) { | |
| 171 | 175 | if (null != c) { |
| 172 | - c = c.where("dueDate").gte(dueDateStart).lte(dueDateEnd); | |
| 176 | + c = c.lte(dueDateEnd); | |
| 173 | 177 | } else { |
| 174 | - c = Criteria.where("dueDate").gte(dueDateStart).lte(dueDateEnd); | |
| 178 | + c = Criteria.where("dueDate").lte(dueDateEnd); | |
| 175 | 179 | } |
| 176 | 180 | } |
| 177 | 181 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
a4c5db2
| ... | ... | @@ -101,7 +101,7 @@ |
| 101 | 101 | String[] dates = nextDateStr.split(" - "); |
| 102 | 102 | antExRecordQuery.setDueDateStart(DateUtil.parseYMD(dates[0])); |
| 103 | 103 | if (dates.length == 2) { |
| 104 | - antExRecordQuery.setDueDateEnd(DateUtil.parseYMD(dates[0])); | |
| 104 | + antExRecordQuery.setDueDateEnd(DateUtil.parseYMD(dates[1])); | |
| 105 | 105 | } |
| 106 | 106 | } |
| 107 | 107 |