From 7d0209210d2d9cbef642bf159062528ff8e22c44 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: Mon, 24 Jul 2023 12:03:12 +0800
Subject: [PATCH] Merge branch 'zf' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem
---
src/main/java/com/gk/hotwork/Service/SafetySelfInspectionService.java | 15 +++++++++++++--
1 files changed, 13 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..9522b48 100644
--- a/src/main/java/com/gk/hotwork/Service/SafetySelfInspectionService.java
+++ b/src/main/java/com/gk/hotwork/Service/SafetySelfInspectionService.java
@@ -6,7 +6,9 @@
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.List;
import java.util.Map;
public interface SafetySelfInspectionService extends IService<SafetySelfInspection> {
@@ -16,12 +18,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 +39,16 @@
*/
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);
}
--
Gitblit v1.9.2