|
@@ -8,8 +8,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.ozs.common.core.domain.vo.SysLoginInfoVo;
|
|
import com.ozs.common.core.domain.vo.SysLoginInfoVo;
|
|
import com.ozs.common.core.domain.vo.SysOperlogVo;
|
|
import com.ozs.common.core.domain.vo.SysOperlogVo;
|
|
|
|
+import com.ozs.common.utils.DateUtils;
|
|
import com.ozs.system.domain.SysLoginInfo;
|
|
import com.ozs.system.domain.SysLoginInfo;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
+import org.apache.poi.ss.usermodel.DateUtil;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
import org.springframework.util.ObjectUtils;
|
|
import org.springframework.util.ObjectUtils;
|
|
@@ -66,6 +68,12 @@ public class SysOperlogController extends BaseController {
|
|
if (!ObjectUtils.isEmpty(sysOperlogVo.getOperTime())) {
|
|
if (!ObjectUtils.isEmpty(sysOperlogVo.getOperTime())) {
|
|
wrapper.like(SysOperLog::getOperTime, sysOperlogVo.getOperTime());
|
|
wrapper.like(SysOperLog::getOperTime, sysOperlogVo.getOperTime());
|
|
}
|
|
}
|
|
|
|
+ if (!ObjectUtils.isEmpty(sysOperlogVo.getStartTime())) {
|
|
|
|
+ wrapper.ge(SysOperLog::getOperTime, sysOperlogVo.getStartTime());
|
|
|
|
+ }
|
|
|
|
+ if (!ObjectUtils.isEmpty(sysOperlogVo.getEndTime())) {
|
|
|
|
+ wrapper.le(SysOperLog::getOperTime, sysOperlogVo.getEndTime());
|
|
|
|
+ }
|
|
IPage<SysOperLog> page = operLogService.page(new Page<>(sysOperlogVo.getPageNum(), sysOperlogVo.getPageSize()), wrapper);
|
|
IPage<SysOperLog> page = operLogService.page(new Page<>(sysOperlogVo.getPageNum(), sysOperlogVo.getPageSize()), wrapper);
|
|
return AjaxResult.success(page);
|
|
return AjaxResult.success(page);
|
|
}
|
|
}
|