From 9c913167855657ec6fa4c502949d9325d17b9e2f Mon Sep 17 00:00:00 2001 From: lijiaqi Date: Wed, 3 Aug 2022 10:28:24 +0800 Subject: [PATCH] update --- .../ydool/boot/api/controller/ApiBaseDataController.java | 2 +- .../boot/api/controller/ApiConferenceController.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ydool/boot/api/controller/ApiBaseDataController.java b/src/main/java/com/ydool/boot/api/controller/ApiBaseDataController.java index f1fbc69..1e74a28 100644 --- a/src/main/java/com/ydool/boot/api/controller/ApiBaseDataController.java +++ b/src/main/java/com/ydool/boot/api/controller/ApiBaseDataController.java @@ -91,7 +91,7 @@ public class ApiBaseDataController extends ApiBaseController { @GetMapping("dict") @ResponseBody @ApiOperation(value = "根据字典类型拿字典列表") - @ApiImplicitParam(name = "type", value = "字典类型 例如:sys_yes_no") + @ApiImplicitParam(name = "type", value = "字典类型 例如:sys_yes_no,conference_attachment_category") public void dict(String type) { List dictList = DictUtils.getDictList(type, null); render(Ret.ok().data(dictList)); diff --git a/src/main/java/com/ydool/boot/api/controller/ApiConferenceController.java b/src/main/java/com/ydool/boot/api/controller/ApiConferenceController.java index bb9501d..9c16c17 100644 --- a/src/main/java/com/ydool/boot/api/controller/ApiConferenceController.java +++ b/src/main/java/com/ydool/boot/api/controller/ApiConferenceController.java @@ -138,14 +138,14 @@ public class ApiConferenceController extends ApiBaseController { @DynamicResponseParameters(properties = { @DynamicParameter(name = "data", value = "会议", dataTypeClass = Conference.class) }) - public void conferenceHaveAttachmentList(String title, String category,String type) { + public void conferenceHaveAttachmentList(String title, String category, String type) { QueryWrapper wrapper = getQueryWrapper(title); //上传文件数>=1 wrapper.ge("attachment_num", 1); wrapper.eq("category", category); - if(StrUtil.isNotBlank(type)){ - if("near".equals(type))wrapper.ge("start_time", LocalDateTime.now()); - if("history".equals(type))wrapper.lt("start_time", LocalDateTime.now()); + if (StrUtil.isNotBlank(type)) { + if ("near".equals(type)) wrapper.ge("start_time", LocalDateTime.now().minusDays(3L)); + if ("history".equals(type)) wrapper.lt("start_time", LocalDateTime.now().minusDays(3L)); } Page page = conferenceService.page(new Page(getPageNum(), getPageSize()), wrapper);