fix store diary page
This commit is contained in:
@@ -15,8 +15,8 @@ import com.imyeyu.java.TimiJava;
|
||||
import com.imyeyu.java.bean.timi.TimiException;
|
||||
import com.imyeyu.spring.annotation.AOPLog;
|
||||
import com.imyeyu.spring.annotation.RequestRateLimit;
|
||||
import com.imyeyu.spring.bean.Page;
|
||||
import com.imyeyu.spring.bean.PageResult;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoStoreDiaryPage;
|
||||
import com.imyeyu.spring.util.ResponseView;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
@@ -49,12 +49,12 @@ public class GaoStoreDiaryController {
|
||||
@RequireGaoPermission(GaoPermissionCode.STORE_DIARY_READ)
|
||||
@PostMapping("/list")
|
||||
@JsonView(ResponseView.Public.class)
|
||||
public PageResult<Article> list(@RequestBody Page<Article> page) {
|
||||
public PageResult<Article> list(@RequestBody GaoStoreDiaryPage page) {
|
||||
TimiException.required(page, "未找到分页参数");
|
||||
Article example = TimiJava.defaultIfNull(page.getEqualsExample(), new Article());
|
||||
example.setBizType(Article.BizType.GAO_STORE_DIARY);
|
||||
example.setBizId(storeScopeService.resolveStoreId(example.getBizId()));
|
||||
page.setEqualsExample(example);
|
||||
TimiException.required(page.getBeginCreatedAt(), "未找到门店日记开始时间");
|
||||
TimiException.required(page.getEndCreatedAt(), "未找到门店日记结束时间");
|
||||
TimiException.requiredTrue(page.getBeginCreatedAt() < page.getEndCreatedAt(), "门店日记时间范围无效");
|
||||
page.setStoreId(storeScopeService.resolveStoreId(page.getStoreId()));
|
||||
return service.page(page);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.imyeyu.api.modules.gao.service;
|
||||
|
||||
import com.imyeyu.api.modules.common.entity.Article;
|
||||
import com.imyeyu.spring.bean.Page;
|
||||
import com.imyeyu.spring.bean.PageResult;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoStoreDiaryPage;
|
||||
|
||||
/// GAO 门店日记服务
|
||||
///
|
||||
@@ -14,7 +14,7 @@ public interface GaoStoreDiaryService {
|
||||
///
|
||||
/// @param page 分页查询条件
|
||||
/// @return 门店日记分页结果
|
||||
PageResult<Article> page(Page<Article> page);
|
||||
PageResult<Article> page(GaoStoreDiaryPage page);
|
||||
|
||||
/// 查询门店日记详情
|
||||
///
|
||||
|
||||
+8
-2
@@ -7,6 +7,8 @@ import com.imyeyu.api.modules.common.mapper.ArticleMapper;
|
||||
import com.imyeyu.api.modules.common.service.ArticleService;
|
||||
import com.imyeyu.api.modules.common.service.AttachmentService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoStoreDiaryService;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoStoreDiaryMapper;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoStoreDiaryPage;
|
||||
import com.imyeyu.java.TimiJava;
|
||||
import com.imyeyu.java.bean.timi.TimiException;
|
||||
import com.imyeyu.spring.bean.Page;
|
||||
@@ -26,10 +28,14 @@ public class GaoStoreDiaryServiceImplement implements GaoStoreDiaryService {
|
||||
private final ArticleService articleService;
|
||||
private final AttachmentService attachmentService;
|
||||
private final ArticleMapper articleMapper;
|
||||
private final GaoStoreDiaryMapper diaryMapper;
|
||||
|
||||
@Override
|
||||
public PageResult<Article> page(Page<Article> page) {
|
||||
return articleService.page(page);
|
||||
public PageResult<Article> page(GaoStoreDiaryPage page) {
|
||||
PageResult<Article> result = new PageResult<>();
|
||||
result.setTotal(diaryMapper.countByMonth(page));
|
||||
result.setList(diaryMapper.selectByMonth(page));
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
package com.imyeyu.api.modules.gao.vo;
|
||||
|
||||
import com.imyeyu.java.bean.BasePage;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/// GAO 门店日记月份分页查询请求
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-08-31
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class GaoStoreDiaryPage extends BasePage {
|
||||
|
||||
/// 门店 ID
|
||||
private String storeId;
|
||||
|
||||
/// 创建时间起点,包含
|
||||
private Long beginCreatedAt;
|
||||
|
||||
/// 创建时间终点,不包含
|
||||
private Long endCreatedAt;
|
||||
}
|
||||
Reference in New Issue
Block a user