Commit 9ebf05aa94701b21d42401fe03ccbf74126efe54
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
View file @
9ebf05a
| ... | ... | @@ -404,31 +404,42 @@ |
| 404 | 404 | } |
| 405 | 405 | else if (i == 1) |
| 406 | 406 | { |
| 407 | - antExRecordQuery.setcDueWeekStart(16); | |
| 407 | + antExRecordQuery.setcDueWeekStart(16*7); | |
| 408 | 408 | antExRecordQuery.setcDueWeekEnd((20 + 1) * 7 - 1); |
| 409 | 409 | } |
| 410 | 410 | else if (i == 2) |
| 411 | 411 | { |
| 412 | - antExRecordQuery.setcDueWeekStart(21); | |
| 412 | + antExRecordQuery.setcDueWeekStart(21*7); | |
| 413 | 413 | antExRecordQuery.setcDueWeekEnd((24 + 1) * 7 - 1); |
| 414 | 414 | } |
| 415 | 415 | else if (i == 3) |
| 416 | 416 | { |
| 417 | - antExRecordQuery.setcDueWeekStart(28); | |
| 417 | + antExRecordQuery.setcDueWeekStart(28*7); | |
| 418 | 418 | antExRecordQuery.setcDueWeekEnd((36 + 1) * 7 - 1); |
| 419 | 419 | } |
| 420 | 420 | else if (i == 4) |
| 421 | 421 | { |
| 422 | - antExRecordQuery.setcDueWeekStart(37); | |
| 422 | + antExRecordQuery.setcDueWeekStart(37*7); | |
| 423 | 423 | antExRecordQuery.setcDueWeekEnd((40 + 1) * 7 - 1); |
| 424 | 424 | } |
| 425 | 425 | |
| 426 | 426 | List<AntExRecordModel> list = recordService.queryAntExRecords(antExRecordQuery); |
| 427 | 427 | if (CollectionUtils.isNotEmpty(list)) |
| 428 | 428 | { |
| 429 | - AntExRecordModel m = list.get(list.size() - 1); | |
| 430 | - m.setIsFirst(1); | |
| 431 | - recordService.updateOne(m,m.getId()); | |
| 429 | + for (int j = 0 ; j < list.size() ; j++) | |
| 430 | + { | |
| 431 | + AntExRecordModel m = list.get(j); | |
| 432 | + if (j == (list.size() - 1)) | |
| 433 | + { | |
| 434 | + m.setIsFirst(1); | |
| 435 | + } | |
| 436 | + else | |
| 437 | + { | |
| 438 | + m.setIsFirst(2); | |
| 439 | + } | |
| 440 | + recordService.updateOne(m,m.getId()); | |
| 441 | + } | |
| 442 | + | |
| 432 | 443 | } |
| 433 | 444 | } |
| 434 | 445 | } |