xiangshan
/
rd-admin-java
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

This commit is contained in:
lijiaqi 2022-08-03 10:28:24 +08:00
parent 02016fcb4d
commit 9c91316785
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ydool/boot/api/controller/ApiBaseDataController.java
View File

@ -91,7 +91,7 @@ public class ApiBaseDataController extends ApiBaseController {
@GetMapping("dict") @GetMapping("dict")
@ResponseBody @ResponseBody
@ApiOperation(value = "根据字典类型拿字典列表") @ApiOperation(value = "根据字典类型拿字典列表")
@ApiImplicitParam(name = "type", value = "字典类型 例如:sys_yes_no") @ApiImplicitParam(name = "type", value = "字典类型 例如:sys_yes_no,conference_attachment_category")
public void dict(String type) { public void dict(String type) {
List<DictData> dictList = DictUtils.getDictList(type, null); List<DictData> dictList = DictUtils.getDictList(type, null);
render(Ret.ok().data(dictList)); render(Ret.ok().data(dictList));

4
src/main/java/com/ydool/boot/api/controller/ApiConferenceController.java
View File

@ -144,8 +144,8 @@ public class ApiConferenceController extends ApiBaseController {
wrapper.ge("attachment_num", 1); wrapper.ge("attachment_num", 1);
wrapper.eq("category", category); wrapper.eq("category", category);
if (StrUtil.isNotBlank(type)) { if (StrUtil.isNotBlank(type)) {
if("near".equals(type))wrapper.ge("start_time", LocalDateTime.now()); if ("near".equals(type)) wrapper.ge("start_time", LocalDateTime.now().minusDays(3L));
if("history".equals(type))wrapper.lt("start_time", LocalDateTime.now()); if ("history".equals(type)) wrapper.lt("start_time", LocalDateTime.now().minusDays(3L));
} }
Page page = conferenceService.page(new Page(getPageNum(), getPageSize()), wrapper); Page page = conferenceService.page(new Page(getPageNum(), getPageSize()), wrapper);