diff --git a/src/main/java/com/gunshi/project/xyt/controller/SzRuleByLawController.java b/src/main/java/com/gunshi/project/xyt/controller/SzRuleByLawController.java index 4293f24..74ded72 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/SzRuleByLawController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/SzRuleByLawController.java @@ -126,7 +126,7 @@ public class SzRuleByLawController extends AbstractCommonFileController { } if (Objects.nonNull(page.getStmAd())) { - query.ge(SzRuleByLaw::getAnnouncementDate, page.getStmAd()); + query.ge(SzRuleByLaw::getCreateTime, page.getStmAd()); } Date etmAd = page.getEtmAd(); @@ -135,7 +135,7 @@ public class SzRuleByLawController extends AbstractCommonFileController { calendar.set(Calendar.HOUR,23); calendar.set(Calendar.MINUTE,59); calendar.set(Calendar.SECOND,59); - query.le(SzRuleByLaw::getAnnouncementDate, calendar.getTime()); + query.le(SzRuleByLaw::getCreateTime, calendar.getTime()); } if (Objects.nonNull(page.getStmIm())) { @@ -152,7 +152,7 @@ public class SzRuleByLawController extends AbstractCommonFileController { } if (Objects.nonNull(page.getStmUd())) { - query.ge(SzRuleByLaw::getUploadDate, page.getStmUd()); + query.ge(SzRuleByLaw::getCreateTime, page.getStmUd()); } Date etmUd = page.getEtmUd(); @@ -161,10 +161,10 @@ public class SzRuleByLawController extends AbstractCommonFileController { calendar.set(Calendar.HOUR,23); calendar.set(Calendar.MINUTE,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 data = service.page(page.getPageSo().toPage(), query); data.getRecords() .forEach(item -> item.setFiles(fileService.getFiles(getGroupId(), String.valueOf(item.getId()))));