From 81ba6f3ea498c43010f47c7ed6d6c0f121bb1f09 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 14:38:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/platform/service/ReportService.java |   25 +++++++++++++++++++++----
 1 files changed, 21 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..791a32f 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);
 
     /**
      * 瀹℃牳鎶ュ

--
Gitblit v1.8.0