From ab2b3291cb9e21885ed878d60f5afd6640d830f3 Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期一, 19 九月 2022 18:05:24 +0800 Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master --- incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentReportInfoService.java | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentReportInfoService.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentReportInfoService.java index dd5694b..1047886 100644 --- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentReportInfoService.java +++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentReportInfoService.java @@ -2,10 +2,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.gkhy.safePlatform.incidentManage.entity.AccidentReportInfo; -import com.gkhy.safePlatform.incidentManage.entity.AccidentReportInfoDetailDO; -import com.gkhy.safePlatform.incidentManage.entity.AccidentReportInfoPageDO; +import com.gkhy.safePlatform.incidentManage.entity.*; import com.gkhy.safePlatform.incidentManage.query.db.AccidentReportDBQuery; +import com.gkhy.safePlatform.incidentManage.query.db.AccidentReportCountDBQuery; import java.util.List; @@ -21,4 +20,11 @@ void updateAccidentReport(AccidentReportInfo AccidentReportInfo); void deleteAccidentReportById(Long teamId); + + List<AccidentReportCount> selectByTimeAndType(AccidentReportCountDBQuery dbQuery); + + List<AccidentReportCountRPC> getCountForRPCByDeptIdAndMonth(String startTime, String endTime, Long deptId); + + List<AccidentReportCountRPC> getCountForRPCByDeptIdAndDay(String startTime, String endTime, Long deptId); + } -- Gitblit v1.9.2