From c9529bd19a8d61666b71824dd751682c1e9dc288 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 15 八月 2022 10:39:31 +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 |    5 +++++
 1 files changed, 5 insertions(+), 0 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..cd7a270 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,12 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gkhy.safePlatform.incidentManage.entity.AccidentReportCount;
 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.query.db.AccidentReportDBQuery;
+import com.gkhy.safePlatform.incidentManage.query.db.AccidentReportRPCDBQuery;
 
 import java.util.List;
 
@@ -21,4 +23,7 @@
     void updateAccidentReport(AccidentReportInfo AccidentReportInfo);
 
     void deleteAccidentReportById(Long teamId);
+
+    List<AccidentReportCount> selectByTimeAndType(AccidentReportRPCDBQuery dbQuery);
+
 }

--
Gitblit v1.9.2