Bladeren bron

修改需求

zhs 3 jaren geleden
bovenliggende
commit
dce8f9a54c

+ 8 - 0
src/main/java/com/travel/model/Release.java

@@ -137,4 +137,12 @@ public class Release implements Serializable {
      * 交通信息文件
      */
     private String trafficFile;
+    /**
+     * 条数
+     */
+    private int limit;
+    /**
+     * 页数
+     */
+    private int page;
 }

+ 4 - 1
src/main/resources/config/mapping/PrivateOrderMapper.xml

@@ -184,6 +184,7 @@
     <!-- 查询热门报价单 -->
     <select id="getReleaseHot" resultType="Release">
         SELECT
+            TOP ${limit}
             a.*,
             b.origin,
             b.destination,
@@ -206,10 +207,12 @@
             LEFT JOIN ( SELECT order_type as orderType,demand_uuid,code FROM bus_private_ordering_type WHERE order_type != '0' GROUP BY demand_uuid,order_type,code ) h ON a.demand_uuid = h.demand_uuid and a.code = h.code
             LEFT JOIN sys_supplier e ON a.code = e.code
         <trim prefix="WHERE" prefixOverrides="and | or">
+            a.id not in (select top ${page} id from bus_supplier_release)
             <if test="uuid != null and uuid != ''">
-                a.uuid = #{uuid}
+                and a.uuid = #{uuid}
             </if>
         </trim>
+        order by a.id desc
     </select>
     <!-- 查询供应商路线每天信息 -->
     <select id="getSupplierReleaseDay" resultType="SupplierReleaseDay">

+ 4 - 4
src/main/resources/config/mapping/ReleaseTravelMapper.xml

@@ -17,10 +17,10 @@
             top ${limit} a.*,b.countNum,c.flag,d.commCount,f.name,f.headpir
         from
             bus_travel AS a
-        LEFT JOIN ( SELECT COUNT ( * ) AS countNum, travel_uuid FROM sys_travel_give GROUP BY travel_uuid ) b ON a.uuid = b.travel_uuid
-        LEFT JOIN ( SELECT COUNT ( * ) AS flag, travel_uuid FROM sys_travel_give WHERE code = #{code} GROUP BY travel_uuid ) c ON a.uuid = c.travel_uuid
-        LEFT JOIN ( SELECT COUNT ( * ) AS commCount, travel_uuid FROM bus_travel_comments GROUP BY travel_uuid ) d ON a.uuid = d.travel_uuid
-        LEFT JOIN (SELECT headpir,name,code from sys_users) f on f.code = a.code
+            LEFT JOIN ( SELECT COUNT ( * ) AS countNum, travel_uuid FROM sys_travel_give GROUP BY travel_uuid ) b ON a.uuid = b.travel_uuid
+            LEFT JOIN ( SELECT COUNT ( * ) AS flag, travel_uuid FROM sys_travel_give WHERE code = #{code} GROUP BY travel_uuid ) c ON a.uuid = c.travel_uuid
+            LEFT JOIN ( SELECT COUNT ( * ) AS commCount, travel_uuid FROM bus_travel_comments GROUP BY travel_uuid ) d ON a.uuid = d.travel_uuid
+            LEFT JOIN (SELECT headpir,name,code from sys_users) f on f.code = a.code
         <trim prefix="WHERE" prefixOverrides="and | or">
             <if test="uuid != null and uuid != ''">
                 and a.uuid = #{uuid}