From bf885e8a827d2f1665db56d484e43946948f1ac6 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 04 九月 2024 15:50:46 +0800 Subject: [PATCH] unitId bug修改 --- ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java | 45 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 41 insertions(+), 4 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java b/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java index a6e6d44..02d6b0c 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java @@ -1,11 +1,18 @@ package com.ycl.platform.service; -import com.ycl.platform.domain.entity.YwPoint; import com.baomidou.mybatisplus.extension.service.IService; +import com.ycl.platform.domain.entity.ReportAuditingRecord; +import com.ycl.platform.domain.entity.YwPoint; import com.ycl.platform.domain.form.BatchEditPointForm; -import com.ycl.system.Result; import com.ycl.platform.domain.form.YwPointForm; import com.ycl.platform.domain.query.YwPointQuery; +import com.ycl.platform.domain.vo.ReportAuditingRecordVO; +import com.ycl.system.Result; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.util.Date; import java.util.List; /** @@ -89,9 +96,39 @@ /** * 鎵归噺鍚屾鐘舵�� * - * @param pointIds 鐐逛綅id + * @param serialNumberList 璁惧缂栧彿 * @param recovery 鐘舵�� * @return 鏁伴噺 */ - boolean updateRecovery(List<Integer> pointIds, int recovery); + boolean updateRecovery(List<String> serialNumberList, int recovery); + + /** + * 棣栭〉鍒版湡棰勮 + * @return 鏁版嵁 + */ + List<YwPoint> home(); + + /** + * 瀵煎嚭鏁版嵁 + * + * @param query + * @param response + */ + void export(YwPointQuery query, HttpServletResponse response) throws IOException; + + /** + * 瀵煎叆鏁版嵁 + * + * @param file + * @param unitId 杩愮淮鍗曚綅id + * @return + */ + Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean needUpdateUnit) throws IOException; + + /** + * 鑾峰彇鎶ュ鏄惁瀹℃牳閫氳繃锛堟渶鏂颁竴鏉★級 + * @param reportType + * @return + */ + ReportAuditingRecordVO getReportResult(String serialNumber, String reportType); } -- Gitblit v1.8.0