From aace11a7e1201a8d1fc0b50b659368918d23e794 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 02 八月 2022 16:43:59 +0800
Subject: [PATCH] 一览接口fix
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java
index a012d3a..0101b78 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java
@@ -51,7 +51,7 @@
@Autowired
private EquipmentCheckStandardDetailService equipmentCheckStandardDetailService;
-
+
@Override
public ResultVO queryAll(PageQuery<KeypointEquipmentInfoQueryCriteria> pageQuery) {
Long pageIndex = pageQuery.getPageIndex();
@@ -61,6 +61,8 @@
page = baseMapper.selectPage(page,
QueryHelpPlus.getPredicate(KeypointEquipmentInfo.class, pageQuery.getSearchParams()));
List<KeypointEquipmentInfoDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), KeypointEquipmentInfoDto.class);
+
+ // TODO:获取所属部门名称
//获取额外信息
respList.forEach(f->{
@@ -91,7 +93,7 @@
return new SearchResultVO<>(
true,
pageIndex,
- pageSize,
+ pageSize,page.getPages(),
page.getTotal(),
respList,
ResultCodes.OK
@@ -230,4 +232,4 @@
equipmentTakecareStardardDetailService.removeByIds(idList);
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.2