diff --git a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java index f52e600..51d3ff1 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java @@ -124,6 +124,9 @@ public class SocialDirectoryController extends BaseController { int type = (Integer) parms.get("type"); int page = (Integer) parms.getOrDefault("page", 1); int size = (Integer) parms.getOrDefault("size", 10); + if (size<=0){ + size=Constants.DetailPageSize; + } String keyword = (String) parms.getOrDefault("search_keyword", ""); if (type == 1301 || type == 1302 || type == 1306 || type == 1309 || type == 1314 || type == 1315 || type == 1320){ return success(socialDirectoryService.getDocList(type,page,size,keyword)); diff --git a/src/main/java/com/syjiaer/clinic/server/entity/common/dto/CommonLogQuery.java b/src/main/java/com/syjiaer/clinic/server/entity/common/dto/CommonLogQuery.java index d30d218..9313491 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/common/dto/CommonLogQuery.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/common/dto/CommonLogQuery.java @@ -2,8 +2,14 @@ package com.syjiaer.clinic.server.entity.common.dto; import lombok.Data; +import java.time.LocalDateTime; + @Data public class CommonLogQuery { private Integer pageNum; private Integer pageSize; + private String managerName; + private String message; + private LocalDateTime beginTime; + private LocalDateTime endTime; } diff --git a/src/main/java/com/syjiaer/clinic/server/service/common/CommonLogService.java b/src/main/java/com/syjiaer/clinic/server/service/common/CommonLogService.java index fa79d52..da1f6de 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/common/CommonLogService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/common/CommonLogService.java @@ -47,6 +47,18 @@ public class CommonLogService extends BaseService { */ public Page pageList(CommonLogQuery query) { QueryWrapper queryWrapper = new QueryWrapper<>(); + if (query.getManagerName() != null && !query.getManagerName().isEmpty()){ + queryWrapper.like("manager_name", query.getManagerName()); + } + if (query.getMessage() != null && !query.getMessage().isEmpty()){ + queryWrapper.like("message", query.getMessage()); + } + if (query.getBeginTime() != null){ + queryWrapper.ge("create_datetime", query.getBeginTime()); + } + if (query.getEndTime() != null){ + queryWrapper.le("create_datetime", query.getEndTime()); + } return pageHelper(query.getPageNum(), query.getPageSize(), queryWrapper, commonLogMapper, "id", false); }