From c8df02a7b07086e17bacda6cdc015d76ac1f82fe Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 17:16:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/ReportService.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 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 bf4e0fc..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,11 +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.vo.ReportVO;
-import com.ycl.system.Result;
+import com.ycl.platform.domain.entity.Report;
+import com.ycl.platform.domain.form.ReportAuditingForm;
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;
/**
@@ -22,6 +25,20 @@
* @return
*/
Result add(ReportForm form);
+
+
+ /**
+ * 瀵煎叆妯℃澘
+ * @param response 缁撴灉
+ */
+ void importTemplate(HttpServletResponse response);
+
+ /**
+ * 瀵煎叆
+ * @param form 鏁版嵁
+ * @return 缁撴灉
+ */
+ Result importData(ReportForm form);
/**
* 淇敼
@@ -69,4 +86,27 @@
* @return
*/
List<ReportVO> export(ReportQuery query);
+
+ /**
+ * 鑾峰彇瀹℃牳璁板綍
+ *
+ * @return
+ * @param id
+ */
+ Result auditingRecord(Integer id);
+
+ /**
+ * 瀹℃牳鎶ュ
+ * @param form
+ * @return
+ */
+ Result auditing(ReportAuditingForm form);
+
+ /**
+ * 鑾峰彇鍚屼竴鎵规鐨勬姤澶�
+ *
+ * @param pid 鎵规鍙�
+ * @return
+ */
+ Result getTogether(String pid);
}
--
Gitblit v1.8.0