From 5a697e6fafbe3855336ca5fd7e1785de12840d16 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期六, 15 三月 2025 10:49:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/InsOrderPlanService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java
similarity index 86%
rename from cnas-require/src/main/java/com/ruoyi/require/service/InsOrderPlanService.java
rename to inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java
index a749b23..1971033 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/InsOrderPlanService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderPlanService.java
@@ -1,17 +1,13 @@
-package com.ruoyi.require.service;
+package com.ruoyi.inspect.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.inspect.dto.InsOrderPlanDTO;
-import com.ruoyi.inspect.dto.InsProductResultDTO;
-import com.ruoyi.inspect.dto.TasksShowDto;
-import com.ruoyi.inspect.dto.UnInsProductsDTO;
+import com.ruoyi.inspect.dto.*;
import com.ruoyi.inspect.pojo.InsOrderFile;
import com.ruoyi.inspect.pojo.InsProduct;
import com.ruoyi.inspect.vo.InsOrderPlanTaskSwitchVo;
import com.ruoyi.inspect.vo.InsOrderPlanVO;
import org.springframework.web.multipart.MultipartFile;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
@@ -23,9 +19,9 @@
*/
public interface InsOrderPlanService {
- void exportInsOrderPlanResult(Map<String, Object> data, HttpServletResponse response);
+ void exportInsOrderPlanResult(QueryResultDTO data, HttpServletResponse response);
- List<Map<String,Object>> getInsOrderPlanList(Map<String,Object> data);
+ List<Map<String,Object>> getInsOrderPlanList(QueryResultDTO queryResultDTO);
void exportCommissionFees(Map<String, Object> data,HttpServletResponse response);
--
Gitblit v1.9.3