yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#616 上传时间筛选结果错误

master
李一帆 2025-04-10 16:19:32 +08:00
parent a0cb7a87c4
commit 26a457331f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/gunshi/project/xyt/controller/SzRuleByLawController.java
View File

@ -126,7 +126,7 @@ public class SzRuleByLawController extends AbstractCommonFileController {
} }
if (Objects.nonNull(page.getStmAd())) { if (Objects.nonNull(page.getStmAd())) {
query.ge(SzRuleByLaw::getAnnouncementDate, page.getStmAd()); query.ge(SzRuleByLaw::getCreateTime, page.getStmAd());
} }
Date etmAd = page.getEtmAd(); Date etmAd = page.getEtmAd();
@ -135,7 +135,7 @@ public class SzRuleByLawController extends AbstractCommonFileController {
calendar.set(Calendar.HOUR,23); calendar.set(Calendar.HOUR,23);
calendar.set(Calendar.MINUTE,59); calendar.set(Calendar.MINUTE,59);
calendar.set(Calendar.SECOND,59); calendar.set(Calendar.SECOND,59);
query.le(SzRuleByLaw::getAnnouncementDate, calendar.getTime()); query.le(SzRuleByLaw::getCreateTime, calendar.getTime());
} }
if (Objects.nonNull(page.getStmIm())) { if (Objects.nonNull(page.getStmIm())) {
@ -152,7 +152,7 @@ public class SzRuleByLawController extends AbstractCommonFileController {
} }
if (Objects.nonNull(page.getStmUd())) { if (Objects.nonNull(page.getStmUd())) {
query.ge(SzRuleByLaw::getUploadDate, page.getStmUd()); query.ge(SzRuleByLaw::getCreateTime, page.getStmUd());
} }
Date etmUd = page.getEtmUd(); Date etmUd = page.getEtmUd();
@ -161,10 +161,10 @@ public class SzRuleByLawController extends AbstractCommonFileController {
calendar.set(Calendar.HOUR,23); calendar.set(Calendar.HOUR,23);
calendar.set(Calendar.MINUTE,59); calendar.set(Calendar.MINUTE,59);
calendar.set(Calendar.SECOND,59); calendar.set(Calendar.SECOND,59);
query.le(SzRuleByLaw::getUploadDate, calendar.getTime()); query.le(SzRuleByLaw::getCreateTime, calendar.getTime());
} }
query.orderByDesc(SzRuleByLaw::getUploadDate); query.orderByDesc(SzRuleByLaw::getCreateTime);
Page<SzRuleByLaw> data = service.page(page.getPageSo().toPage(), query); Page<SzRuleByLaw> data = service.page(page.getPageSo().toPage(), query);
data.getRecords() data.getRecords()
.forEach(item -> item.setFiles(fileService.getFiles(getGroupId(), String.valueOf(item.getId())))); .forEach(item -> item.setFiles(fileService.getFiles(getGroupId(), String.valueOf(item.getId()))));