From df10f636471fc8150eb0fefeb4f4b439ddf72a78 Mon Sep 17 00:00:00 2001
From: jiask <1069621233@qq.com>
Date: Thu, 7 Aug 2025 17:17:04 +0800
Subject: [PATCH] =?UTF-8?q?jsk=20=20=E9=82=80=E8=AF=B7=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E5=8F=8A=E5=B7=B2=E6=8A=A5=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E9=97=AE=E9=A2=98=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ims/InquiryMapper.xml          | 5 +++--
 .../src/main/resources/mapper/ims/QuoteMapper.xml            | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InquiryMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InquiryMapper.xml
index c1cf101..c042daa 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InquiryMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InquiryMapper.xml
@@ -108,12 +108,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectInquiryList" parameterType="com.bonus.canteen.core.ims.domain.Inquiry" resultMap="InquiryResult">
+        select * from (
         select aa.inquiry_id, aa.area_id, aa.inquiry_code, aa.title, aa.start_time, aa.end_time, aa.status, aa.bid_time,
         aa.request_arrival_time, aa.inquiry_notes, aa.phone, aa.link_man, aa.address, aa.bid_total_price, aa.supplier_id,
         bb.area_name as area, aa.create_by, aa.create_time, aa.update_by, aa.update_time,case when cc.bid_status=3 then dd.supplier_name else '' end as supplier_name,
         GROUP_CONCAT(cc.inquiry_supplier_id ) as supplier_ids,
         GROUP_CONCAT(dd.supplier_name ) as supplier_names,
-        sum(case when cc.bid_status=2 then 1 else 0 end) as inquirySupplierNum,
+        sum(case when cc.inquiry_supplier_id is not null then 1 else 0 end) as inquirySupplierNum,
         sum(case when cc.bid_status=1 then 1 else 0 end) as supplierNum
         from ims_inquiry aa
         left join basic_area bb on aa.area_id=bb.area_id
@@ -135,9 +136,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderStatus != null  and orderStatus != '' and orderStatus == '2'"> and aa.status != 1</if>
             <if test="startTime != null "> and aa.start_time >= #{startTime} </if>
             <if test="endTime != null "> and #{endTime}>=aa.start_time </if>
-
         </where>
         group by aa.inquiry_id
+        ) aa order by create_time desc
     </select>
     
     <select id="selectInquiryByInquiryId" parameterType="Long" resultMap="InquiryResult">
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/QuoteMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/QuoteMapper.xml
index 4625f98..595b3fe 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/QuoteMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/QuoteMapper.xml
@@ -204,6 +204,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="selectInquiryList" parameterType="com.bonus.canteen.core.ims.domain.Inquiry" resultMap="InquiryResult">
+        select * from (
         select aa.inquiry_id, aa.area_id, aa.inquiry_code, aa.title, aa.start_time, aa.end_time, aa.status, aa.bid_time,
         aa.request_arrival_time, aa.inquiry_notes, aa.phone, aa.link_man, aa.address, aa.bid_total_price, aa.supplier_id,
         bb.area_name as area, aa.create_by, aa.create_time, aa.update_by, aa.update_time
@@ -229,5 +230,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         </where>
         group by aa.inquiry_id
+        ) aa order by create_time desc
     </select>
 </mapper>
\ No newline at end of file