From 02f3b2a577143724b09a70cd13cd3e9256f5fc21 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 12 Mar 2024 18:00:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/taskPlaceSelfCheck/service/ITaskPlaceSelfCheckService.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/taskPlaceSelfCheck/service/ITaskPlaceSelfCheckService.java b/src/main/java/org/springblade/modules/taskPlaceSelfCheck/service/ITaskPlaceSelfCheckService.java
index 2dde943..571e5fb 100644
--- a/src/main/java/org/springblade/modules/taskPlaceSelfCheck/service/ITaskPlaceSelfCheckService.java
+++ b/src/main/java/org/springblade/modules/taskPlaceSelfCheck/service/ITaskPlaceSelfCheckService.java
@@ -19,6 +19,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.modules.taskPlaceSelfCheck.dto.TaskPlaceSelfCheckDTO;
 import org.springblade.modules.taskPlaceSelfCheck.entity.TaskPlaceSelfCheckEntity;
+import org.springblade.modules.taskPlaceSelfCheck.excel.TaskPlaceSelfCheckExcel;
 import org.springblade.modules.taskPlaceSelfCheck.vo.TaskPlaceSelfCheckVO;
 import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -47,7 +48,7 @@
 	 * @param id 消防自查记任务表ID
 	 * @return 消防自查记任务表
 	 */
-	public TaskPlaceSelfCheckDTO selectTaskPlaceSelfCheckById(Long id);
+	public TaskPlaceSelfCheckDTO selectTaskPlaceSelfCheckById(TaskPlaceSelfCheckEntity taskPlaceSelfCheck);
 
 	/**
 	 * 查询消防自查记任务表列表
@@ -59,4 +60,15 @@
 
 
 	Boolean savePlace(TaskPlaceSelfCheckVO taskPlaceSelfCheck) throws Exception;
+
+	Boolean updateTaskPlaceSelfCheck(TaskPlaceSelfCheckVO taskPlaceSelfCheck) throws Exception;
+
+	/**
+	 * 导出消防自查信息
+	 * @param taskPlaceSelfCheck
+	 * @return
+	 */
+	List<TaskPlaceSelfCheckExcel> exportTaskPlaceSelfCheck(TaskPlaceSelfCheckVO taskPlaceSelfCheck);
+
+    Integer getCount(String neiCode, int i);
 }

--
Gitblit v1.9.3