dev
This commit is contained in:
parent
d6c8d90697
commit
388c5e9574
|
|
@ -124,6 +124,9 @@ public class SocialDirectoryController extends BaseController {
|
||||||
int type = (Integer) parms.get("type");
|
int type = (Integer) parms.get("type");
|
||||||
int page = (Integer) parms.getOrDefault("page", 1);
|
int page = (Integer) parms.getOrDefault("page", 1);
|
||||||
int size = (Integer) parms.getOrDefault("size", 10);
|
int size = (Integer) parms.getOrDefault("size", 10);
|
||||||
|
if (size<=0){
|
||||||
|
size=Constants.DetailPageSize;
|
||||||
|
}
|
||||||
String keyword = (String) parms.getOrDefault("search_keyword", "");
|
String keyword = (String) parms.getOrDefault("search_keyword", "");
|
||||||
if (type == 1301 || type == 1302 || type == 1306 || type == 1309 || type == 1314 || type == 1315 || type == 1320){
|
if (type == 1301 || type == 1302 || type == 1306 || type == 1309 || type == 1314 || type == 1315 || type == 1320){
|
||||||
return success(socialDirectoryService.getDocList(type,page,size,keyword));
|
return success(socialDirectoryService.getDocList(type,page,size,keyword));
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,14 @@ package com.syjiaer.clinic.server.entity.common.dto;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class CommonLogQuery {
|
public class CommonLogQuery {
|
||||||
private Integer pageNum;
|
private Integer pageNum;
|
||||||
private Integer pageSize;
|
private Integer pageSize;
|
||||||
|
private String managerName;
|
||||||
|
private String message;
|
||||||
|
private LocalDateTime beginTime;
|
||||||
|
private LocalDateTime endTime;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -47,6 +47,18 @@ public class CommonLogService extends BaseService {
|
||||||
*/
|
*/
|
||||||
public Page<CommonLog> pageList(CommonLogQuery query) {
|
public Page<CommonLog> pageList(CommonLogQuery query) {
|
||||||
QueryWrapper<CommonLog> queryWrapper = new QueryWrapper<>();
|
QueryWrapper<CommonLog> 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(),
|
return pageHelper(query.getPageNum(), query.getPageSize(),
|
||||||
queryWrapper, commonLogMapper, "id", false);
|
queryWrapper, commonLogMapper, "id", false);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue