|
|
@@ -1,5 +1,8 @@
|
|
|
package org.springblade.estate.feign;
|
|
|
|
|
|
+import cn.hutool.core.date.DateTime;
|
|
|
+import cn.hutool.core.date.DateUtil;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import io.swagger.annotations.ApiParam;
|
|
|
@@ -19,6 +22,7 @@ import org.springblade.estate.vo.GuestAuthorizeVO;
|
|
|
import org.springblade.estate.wrapper.GuestAuthorizeWrapper;
|
|
|
import org.springblade.estate.service.IGuestAuthorizeService;
|
|
|
|
|
|
+import java.util.Date;
|
|
|
import java.util.List;
|
|
|
/**
|
|
|
* 访客授权记录 client
|
|
|
@@ -104,12 +108,17 @@ public class GuestAuthorizeClient implements IGuestAuthorizeClient {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- @PostMapping("page")
|
|
|
- public BladePage<GuestAuthorize> page(@RequestBody GuestAuthorizeDTO guestAuthorizeDTO) {
|
|
|
+ @PostMapping("pageOfMonth")
|
|
|
+ public BladePage<GuestAuthorize> pageOfMonth(@RequestBody GuestAuthorizeDTO guestAuthorizeDTO) {
|
|
|
GuestAuthorize ga = new GuestAuthorize();
|
|
|
BeanUtil.copyProperties(guestAuthorizeDTO, ga);
|
|
|
- IPage<GuestAuthorize> page = guestAuthorizeService.page(Condition.getPage(guestAuthorizeDTO.getQuery()),
|
|
|
- Condition.getQueryWrapper(ga).lambda().orderByDesc(GuestAuthorize::getCreateTime));
|
|
|
+ DateTime now = DateUtil.date();
|
|
|
+ DateTime offsetMonth = DateUtil.offsetMonth(now, -1);
|
|
|
+ LambdaQueryWrapper<GuestAuthorize> queryWrapper = Condition.getQueryWrapper(ga)
|
|
|
+ .lambda()
|
|
|
+ .between(GuestAuthorize::getCreateTime,now,offsetMonth)
|
|
|
+ .orderByDesc(GuestAuthorize::getCreateTime);
|
|
|
+ IPage<GuestAuthorize> page = guestAuthorizeService.page(Condition.getPage(guestAuthorizeDTO.getQuery()),queryWrapper);
|
|
|
return BladePage.of(page);
|
|
|
}
|
|
|
|