From 652fca264c2468782a2d5a4fbe21a13df448b91a Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期一, 22 八月 2022 15:50:39 +0800 Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang --- emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java index 680e29c..1094759 100644 --- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java @@ -5,6 +5,8 @@ import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfo; import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoDetailDO; import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoPageDO; +import com.gkhy.safePlatform.emergency.enums.ApproveStatus; +import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyPlanPageRespDTO; import com.gkhy.safePlatform.emergency.query.db.EmergencyWorkApproveDBQuery; import java.util.List; @@ -21,4 +23,6 @@ void updateWorkApprove(EmergencyWorkApproveInfo EmergencyWorkApproveInfo); void deleteWorkApproveById(Long teamId); + + List<EmergencyWorkApproveInfoDetailDO> selectWorkApproveByRelateTypeAndRelateId(Integer type, Long id); } -- Gitblit v1.9.2