From dc1f8126ce1e5ff191a122a84ea65f4ba6918a04 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 09 八月 2022 11:13:46 +0800
Subject: [PATCH] 时间fix
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/RewardPunishmentDetailServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/RewardPunishmentDetailServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/RewardPunishmentDetailServiceImpl.java
index 481ac94..695ca5e 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/RewardPunishmentDetailServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/RewardPunishmentDetailServiceImpl.java
@@ -37,18 +37,18 @@
public ResultVO queryAll(PageQuery<RewardPunishmentDetailQueryCriteria> pageQuery) {
Long pageIndex = pageQuery.getPageIndex();
Long pageSize = pageQuery.getPageSize();
- IPage<RewardPunishmentDetail> page = new Page<>(pageIndex, pageSize);
+ IPage<RewardPunishmentDetailDto> page = new Page<>(pageIndex, pageSize);
- page = baseMapper.selectPage(page,
- QueryHelpPlus.getPredicate(RewardPunishmentDetail.class, pageQuery.getSearchParams()));
- List<RewardPunishmentDetailDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), RewardPunishmentDetailDto.class);
+ page = baseMapper.queryAll(page,
+ pageQuery.getSearchParams().getPersonId());
+// List<RewardPunishmentDetailDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), RewardPunishmentDetailDto.class);
return new SearchResultVO<>(
true,
pageIndex,
- pageSize,
+ pageSize,page.getPages(),
page.getTotal(),
- respList,
+ page.getRecords(),
ResultCodes.OK
);
}
@@ -58,4 +58,10 @@
public List<RewardPunishmentDetail> queryAll(RewardPunishmentDetailQueryCriteria criteria) {
return baseMapper.selectList(QueryHelpPlus.getPredicate(RewardPunishmentDetail.class, criteria));
}
+
+
+ @Override
+ public List<RewardPunishmentDetail> queryAllRelation(RewardPunishmentDetailQueryCriteria criteria) {
+ return baseMapper.queryAll(criteria.getPersonId());
+ }
}
\ No newline at end of file
--
Gitblit v1.9.2