From e2edaf30f4bf2213fe55c9817980001a1ea23e9f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 19 二月 2025 09:26:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ycl-server/src/main/java/com/ycl/platform/service/ReportService.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 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 752cfee..02eef8c 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);
/**
* 淇敼
@@ -75,8 +91,9 @@
* 鑾峰彇瀹℃牳璁板綍
*
* @return
+ * @param id
*/
- Result examineRecord();
+ Result auditingRecord(Integer id);
/**
* 瀹℃牳鎶ュ
@@ -84,4 +101,20 @@
* @return
*/
Result auditing(ReportAuditingForm form);
+
+ /**
+ * 鑾峰彇鍚屼竴鎵规鐨勬姤澶�
+ *
+ * @param pid 鎵规鍙�
+ * @return
+ */
+ Result getTogether(String pid);
+
+ /**
+ * 鍥芥爣鐮佹煡鎶ュ璁板綍
+ *
+ * @param gb
+ * @return
+ */
+ Result getListByGb(String gb);
}
--
Gitblit v1.8.0