From f241a39f07acc5d5ede28b4152d74cbb84e4885b Mon Sep 17 00:00:00 2001 From: zhangfeng <1603559716@qq.com> Date: 星期二, 08 十一月 2022 08:37:36 +0800 Subject: [PATCH] 安全物资和设备管理 --- equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentTakecareDetailServiceImpl.java | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentTakecareDetailServiceImpl.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentTakecareDetailServiceImpl.java index 40837cd..5a6e7df 100644 --- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentTakecareDetailServiceImpl.java +++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentTakecareDetailServiceImpl.java @@ -6,6 +6,7 @@ import com.gkhy.safePlatform.equipment.repository.EquipmentTakecareDetailRepository; import com.gkhy.safePlatform.equipment.entity.EquipmentTakecareDetail; import com.gkhy.safePlatform.equipment.service.EquipmentTakecareDetailService; +import com.gkhy.safePlatform.equipment.service.baseService.EquipmentTakecareDetailBaseService; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import com.gkhy.safePlatform.commons.enums.ResultCodes; @@ -26,20 +27,20 @@ * @since 2022-07-19 14:40:28 */ @Service("equipmentTakecareDetailService") -public class EquipmentTakecareDetailServiceImpl extends ServiceImpl<EquipmentTakecareDetailRepository, EquipmentTakecareDetail> implements EquipmentTakecareDetailService { +public class EquipmentTakecareDetailServiceImpl implements EquipmentTakecareDetailService { @Autowired - private EquipmentTakecareDetailRepository equipmentTakecareDetailRepository; - - - + private EquipmentTakecareDetailBaseService equipmentTakecareDetailBaseService; + + + @Override public ResultVO queryAll(PageQuery<EquipmentTakecareDetailQueryCriteria> pageQuery) { Long pageIndex = pageQuery.getPageIndex(); Long pageSize = pageQuery.getPageSize(); IPage<EquipmentTakecareDetail> page = new Page<>(pageIndex, pageSize); - page = baseMapper.selectPage(page, + page = equipmentTakecareDetailBaseService.selectPage(page, QueryHelpPlus.getPredicate(EquipmentTakecareDetail.class, pageQuery.getSearchParams())); List<EquipmentTakecareDetailDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), EquipmentTakecareDetailDto.class); @@ -56,6 +57,6 @@ @Override public List<EquipmentTakecareDetail> queryAll(EquipmentTakecareDetailQueryCriteria criteria) { - return baseMapper.selectList(QueryHelpPlus.getPredicate(EquipmentTakecareDetail.class, criteria)); + return equipmentTakecareDetailBaseService.queryAll(criteria); } -} +} \ No newline at end of file -- Gitblit v1.9.2