From 5703d0e9865df3ba05bb02bc382ce59fbf5f7da0 Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期五, 12 八月 2022 16:59:06 +0800 Subject: [PATCH] Merge branch 'genchuang' of https://sinanoaq.cn:8888/r/safePlatform-out into master --- emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyWorkApproveServiceImpl.java | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyWorkApproveServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyWorkApproveServiceImpl.java index 8c768c7..467d97e 100644 --- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyWorkApproveServiceImpl.java +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyWorkApproveServiceImpl.java @@ -17,31 +17,36 @@ public class EmergencyWorkApproveServiceImpl extends ServiceImpl<EmergencyWorkApproveInfoRepository, EmergencyWorkApproveInfo> implements EmergencyWorkApproveInfoService { @Autowired - private EmergencyWorkApproveInfoRepository EmergencyWorkApproveInfoRepository; + private EmergencyWorkApproveInfoRepository emergencyWorkApproveInfoRepository; @Override public List<EmergencyWorkApproveInfoPageDO> selectWorkApproveList(Page<EmergencyWorkApproveInfoPageDO> page, EmergencyWorkApproveDBQuery EmergencyWorkApproveDBQuery) { - return EmergencyWorkApproveInfoRepository.selectWorkApproveList(page, EmergencyWorkApproveDBQuery); + return emergencyWorkApproveInfoRepository.selectWorkApproveList(page, EmergencyWorkApproveDBQuery); } @Override public void addWorkApprove(EmergencyWorkApproveInfo EmergencyWorkApproveInfo) { - EmergencyWorkApproveInfoRepository.addWorkApprove(EmergencyWorkApproveInfo); + emergencyWorkApproveInfoRepository.addWorkApprove(EmergencyWorkApproveInfo); } @Override public EmergencyWorkApproveInfoDetailDO selectWorkApproveById(Long id) { - return EmergencyWorkApproveInfoRepository.selectWorkApproveById(id); + return emergencyWorkApproveInfoRepository.selectWorkApproveById(id); } @Override public void updateWorkApprove(EmergencyWorkApproveInfo EmergencyWorkApproveInfo) { - EmergencyWorkApproveInfoRepository.updateWorkApprove(EmergencyWorkApproveInfo); + emergencyWorkApproveInfoRepository.updateWorkApprove(EmergencyWorkApproveInfo); } @Override public void deleteWorkApproveById(Long teamId) { - EmergencyWorkApproveInfoRepository.deleteWorkApproveById(teamId); + emergencyWorkApproveInfoRepository.deleteWorkApproveById(teamId); + } + + @Override + public List<EmergencyWorkApproveInfoDetailDO> selectWorkApproveByRelateTypeAndRelateId(Integer type, Long id) { + return emergencyWorkApproveInfoRepository.selectWorkApproveByRelateTypeAndRelateId(type,id); } -- Gitblit v1.9.2