From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/ReportService.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ReportService.java b/ycl-server/src/main/java/com/ycl/platform/service/ReportService.java
index c8f3bba..bcea92c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/ReportService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ReportService.java
@@ -1,12 +1,14 @@
package com.ycl.platform.service;
-import com.ycl.platform.domain.entity.Report;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.platform.domain.entity.Report;
import com.ycl.platform.domain.form.ReportAuditingForm;
-import com.ycl.platform.domain.vo.ReportVO;
-import com.ycl.system.Result;
import com.ycl.platform.domain.form.ReportForm;
import com.ycl.platform.domain.query.ReportQuery;
+import com.ycl.platform.domain.vo.ReportVO;
+import com.ycl.system.Result;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.util.List;
/**
@@ -23,6 +25,20 @@
* @return
*/
Result add(ReportForm form);
+
+
+ /**
+ * 瀵煎叆妯℃澘
+ * @param response 缁撴灉
+ */
+ void importTemplate(HttpServletResponse response);
+
+ /**
+ * 瀵煎叆
+ * @param form 鏁版嵁
+ * @return 缁撴灉
+ */
+ Result importData(ReportForm form);
/**
* 淇敼
@@ -85,4 +101,12 @@
* @return
*/
Result auditing(ReportAuditingForm form);
+
+ /**
+ * 鑾峰彇鍚屼竴鎵规鐨勬姤澶�
+ *
+ * @param pid 鎵规鍙�
+ * @return
+ */
+ Result getTogether(String pid);
}
--
Gitblit v1.8.0