From 3a1b824203d9e6a4c2a55e2d0d8adc0bae4f03d0 Mon Sep 17 00:00:00 2001 From: zf <1603559716@qq.com> Date: 星期一, 25 三月 2024 13:11:32 +0800 Subject: [PATCH] 安全物资和设备管理调整v2 --- equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentTakecareStardardDetailServiceImpl.java | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentTakecareStardardDetailServiceImpl.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentTakecareStardardDetailServiceImpl.java index cbb8abe..704fbab 100644 --- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentTakecareStardardDetailServiceImpl.java +++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentTakecareStardardDetailServiceImpl.java @@ -6,6 +6,7 @@ import com.gkhy.safePlatform.equipment.repository.EquipmentTakecareStardardDetailRepository; import com.gkhy.safePlatform.equipment.entity.EquipmentTakecareStardardDetail; import com.gkhy.safePlatform.equipment.service.EquipmentTakecareStardardDetailService; +import com.gkhy.safePlatform.equipment.service.baseService.EquipmentTakecareStardardDetailBaseService; 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 15:22:05 */ @Service("equipmentTakecareStardardDetailService") -public class EquipmentTakecareStardardDetailServiceImpl extends ServiceImpl<EquipmentTakecareStardardDetailRepository, EquipmentTakecareStardardDetail> implements EquipmentTakecareStardardDetailService { +public class EquipmentTakecareStardardDetailServiceImpl implements EquipmentTakecareStardardDetailService { @Autowired - private EquipmentTakecareStardardDetailRepository equipmentTakecareStardardDetailRepository; - - - + private EquipmentTakecareStardardDetailBaseService equipmentTakecareStardardDetailBaseService; + + + @Override public ResultVO queryAll(PageQuery<EquipmentTakecareStardardDetailQueryCriteria> pageQuery) { Long pageIndex = pageQuery.getPageIndex(); Long pageSize = pageQuery.getPageSize(); IPage<EquipmentTakecareStardardDetail> page = new Page<>(pageIndex, pageSize); - page = baseMapper.selectPage(page, + page = equipmentTakecareStardardDetailBaseService.selectPage(page, QueryHelpPlus.getPredicate(EquipmentTakecareStardardDetail.class, pageQuery.getSearchParams())); List<EquipmentTakecareStardardDetailDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), EquipmentTakecareStardardDetailDto.class); @@ -56,6 +57,6 @@ @Override public List<EquipmentTakecareStardardDetail> queryAll(EquipmentTakecareStardardDetailQueryCriteria criteria) { - return baseMapper.selectList(QueryHelpPlus.getPredicate(EquipmentTakecareStardardDetail.class, criteria)); + return equipmentTakecareStardardDetailBaseService.queryAll(criteria); } -} +} \ No newline at end of file -- Gitblit v1.9.2