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/CalculateReportService.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/CalculateReportService.java b/ycl-server/src/main/java/com/ycl/platform/service/CalculateReportService.java
index 7c0b835..b0a3bc0 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/CalculateReportService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/CalculateReportService.java
@@ -2,9 +2,12 @@
import com.ycl.platform.domain.entity.CalculateReport;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.platform.domain.form.CalculateReportBackfillForm;
import com.ycl.system.Result;
import com.ycl.platform.domain.form.CalculateReportForm;
import com.ycl.platform.domain.query.CalculateReportQuery;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.util.List;
/**
@@ -34,14 +37,14 @@
* @param ids
* @return
*/
- Result remove(List<String> ids);
+ Result remove(List<Long> ids);
/**
* id鍒犻櫎
* @param id
* @return
*/
- Result removeById(String id);
+ Result removeById(Long id);
/**
* 鍒嗛〉鏌ヨ
@@ -52,14 +55,42 @@
/**
* 鏍规嵁id鏌ユ壘
- * @param id
+ * @param
* @return
*/
- Result detail(String id);
+ Result detail(CalculateReportQuery query);
/**
* 鍒楄〃
* @return
*/
Result all();
+
+ /**
+ * 鍥炲～鎵ｆ閲戦
+ *
+ * @param form
+ * @return
+ */
+ Result backfill(CalculateReportBackfillForm form);
+
+ /**
+ * 淇敼鍙戝竷鐘舵��
+ *
+ * @param
+ * @return
+ */
+ Result updatePublishStatus(Integer contractId,Integer whichYear);
+ /**
+ * 淇敼鍙戝竷鐘舵��
+ *
+ * @param
+ * @return
+ */
+ Result updatePublishStatusById(Integer id,String status);
+ /**
+ * 瀵煎嚭
+ * @param response 鍝嶅簲
+ */
+ void export(Integer whichYear,Integer whichMonth,Integer contractId, HttpServletResponse response);
}
--
Gitblit v1.8.0