From bbac15dbac50fc462993b000c766ecd7ba398d39 Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Thu, 8 Aug 2024 11:23:34 +0800
Subject: [PATCH] '123'

---
 .../java/com/ruoyi/web/controller/quot/QuotController.java | 2 +-
 .../src/main/java/com/ruoyi/quot/mapper/QuotMapper.java    | 7 ++-----
 .../src/main/java/com/ruoyi/quot/service/IQuotService.java | 3 ++-
 .../java/com/ruoyi/quot/service/impl/QuotServiceImpl.java  | 7 ++-----
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
index 1ed004f..f0573f2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
@@ -1050,7 +1050,7 @@ public class QuotController extends BaseController
     @GetMapping("/listStatisticsQuotQuot")
     public TableDataInfo listStatisticsQuotQuot(Quot quot)
     {
-        List<Quot> list = quotService.selectStatisticsQuotList(quot);
+        List<QuotSecDiff> list = quotService.selectStatisticsQuotList(quot);
         return getDataTable(list);
     }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java b/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java
index f206240..0bafb0e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java
@@ -1,9 +1,6 @@
 package com.ruoyi.quot.mapper;
 
-import com.ruoyi.quot.domain.Quot;
-import com.ruoyi.quot.domain.QuotMaterial;
-import com.ruoyi.quot.domain.QuotZb;
-import com.ruoyi.quot.domain.SysOaQuot;
+import com.ruoyi.quot.domain.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -174,7 +171,7 @@ public interface QuotMapper
      * @param quot
      * @return
      */
-    List<Quot> selectStatisticsQuotList(Quot quot);
+    List<QuotSecDiff> selectStatisticsQuotList(Quot quot);
 
     /**
      * 统计有效报价单模块-明细进单占比
diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java b/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java
index b7f6c78..3c46988 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java
@@ -1,6 +1,7 @@
 package com.ruoyi.quot.service;
 
 import com.ruoyi.quot.domain.Quot;
+import com.ruoyi.quot.domain.QuotSecDiff;
 import com.ruoyi.quot.domain.QuotZb;
 import com.ruoyi.quot.domain.SysOaQuot;
 
@@ -155,7 +156,7 @@ public interface IQuotService
      * @param quot
      * @return
      */
-    List<Quot> selectStatisticsQuotList(Quot quot);
+    List<QuotSecDiff> selectStatisticsQuotList(Quot quot);
 
     /**
      * 统计有效报价单模块-明细进单占比
diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java
index ac236bf..37639d0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java
@@ -6,10 +6,7 @@ import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.uuid.UUID;
-import com.ruoyi.quot.domain.Quot;
-import com.ruoyi.quot.domain.QuotMaterial;
-import com.ruoyi.quot.domain.QuotZb;
-import com.ruoyi.quot.domain.SysOaQuot;
+import com.ruoyi.quot.domain.*;
 import com.ruoyi.quot.mapper.QuotMapper;
 import com.ruoyi.quot.service.IQuotService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -294,7 +291,7 @@ public class QuotServiceImpl implements IQuotService
      * @return
      */
     @Override
-    public List<Quot> selectStatisticsQuotList(Quot quot) {
+    public List<QuotSecDiff> selectStatisticsQuotList(Quot quot) {
         return quotMapper.selectStatisticsQuotList(quot);
     }