From fee66fde68610850d4c8c52df022b9d53a0cd3f7 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期三, 21 九月 2022 14:40:34 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentTestDetailServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentTestDetailServiceImpl.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentTestDetailServiceImpl.java
index 57f31f5..ba5cff9 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentTestDetailServiceImpl.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentTestDetailServiceImpl.java
@@ -6,6 +6,7 @@
import com.gkhy.safePlatform.equipment.repository.EquipmentTestDetailRepository;
import com.gkhy.safePlatform.equipment.entity.EquipmentTestDetail;
import com.gkhy.safePlatform.equipment.service.EquipmentTestDetailService;
+import com.gkhy.safePlatform.equipment.service.baseService.EquipmentTestDetailBaseService;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
@@ -26,10 +27,10 @@
* @since 2022-07-19 15:08:23
*/
@Service("equipmentTestDetailService")
-public class EquipmentTestDetailServiceImpl extends ServiceImpl<EquipmentTestDetailRepository, EquipmentTestDetail> implements EquipmentTestDetailService {
+public class EquipmentTestDetailServiceImpl implements EquipmentTestDetailService {
@Autowired
- private EquipmentTestDetailRepository equipmentTestDetailRepository;
+ private EquipmentTestDetailBaseService equipmentTestDetailBaseService;
@@ -39,14 +40,14 @@
Long pageSize = pageQuery.getPageSize();
IPage<EquipmentTestDetail> page = new Page<>(pageIndex, pageSize);
- page = baseMapper.selectPage(page,
+ page = equipmentTestDetailBaseService.selectPage(page,
QueryHelpPlus.getPredicate(EquipmentTestDetail.class, pageQuery.getSearchParams()));
List<EquipmentTestDetailDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), EquipmentTestDetailDto.class);
return new SearchResultVO<>(
true,
pageIndex,
- pageSize,
+ pageSize,page.getPages(),
page.getTotal(),
respList,
ResultCodes.OK
@@ -56,6 +57,6 @@
@Override
public List<EquipmentTestDetail> queryAll(EquipmentTestDetailQueryCriteria criteria) {
- return baseMapper.selectList(QueryHelpPlus.getPredicate(EquipmentTestDetail.class, criteria));
+ return equipmentTestDetailBaseService.queryAll(criteria);
}
}
\ No newline at end of file
--
Gitblit v1.9.2