From 9ca0dc6e7833715b875cc9b6b91d5c497b2bae8b Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期三, 30 八月 2023 09:05:45 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem into zf
---
src/main/java/com/gk/hotwork/Service/SafetySelfInspectionService.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Service/SafetySelfInspectionService.java b/src/main/java/com/gk/hotwork/Service/SafetySelfInspectionService.java
index ff2b012..de3f23d 100644
--- a/src/main/java/com/gk/hotwork/Service/SafetySelfInspectionService.java
+++ b/src/main/java/com/gk/hotwork/Service/SafetySelfInspectionService.java
@@ -3,10 +3,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.gk.hotwork.Domain.AttachmentInfo;
+import com.gk.hotwork.Domain.Do.CompanyStatisticInspectionDO;
import com.gk.hotwork.Domain.SafetySelfInspection;
import com.gk.hotwork.Domain.SafetySelfInspectionItem;
import com.gk.hotwork.Domain.UserInfo;
+import com.gk.hotwork.Domain.dto.resp.SafetySelfInspectionRespDTO;
+import java.util.Date;
+import java.util.List;
import java.util.Map;
public interface SafetySelfInspectionService extends IService<SafetySelfInspection> {
@@ -16,12 +21,16 @@
*/
IPage<SafetySelfInspection> selectPage(Page<SafetySelfInspection> page, Map<String, Object> filter, UserInfo user);
-
+ IPage<SafetySelfInspection> selectSupervisePage(Page<SafetySelfInspection> page, Map<String, Object> filter, UserInfo user);
/**
* @Description: 新增
*/
void addOne(SafetySelfInspection param, UserInfo user);
+ /**
+ * 新增监管检查
+ */
+ void addSupervise(SafetySelfInspection param, UserInfo user);
/**
* @Description: 修改
*/
@@ -33,11 +42,22 @@
*/
void delOne(Long id, UserInfo user);
- SafetySelfInspection infoOne(Long id,String unqualified, UserInfo user);
+ SafetySelfInspectionRespDTO infoOne(Long id, String unqualified, UserInfo user);
SafetySelfInspectionItem itemInfoOne(Long id, UserInfo user);
void modItemInfo(SafetySelfInspectionItem param, UserInfo user);
+
void finish(Long id, UserInfo user);
+
+
+
+ void addItemExpert(List<SafetySelfInspectionItem> itemList, UserInfo user);
+
+ void addCheckAttachment(List<AttachmentInfo> attachmentList, UserInfo user);
+
+ Date selectLastTimeByCompanyId(Long id,Date startTime,Date endTime);
+
+ CompanyStatisticInspectionDO companyStatisticInspection(Map<String,Object> params);
}
--
Gitblit v1.9.2