修改

src/main/java/com/supplier/model/Supplier.java

@@ -75,4 +75,12 @@ public class Supplier implements Serializable {
      * 昵称
      */
     private String name;
+    /**
+     * 报价单次数
+     */
+    private String offerNum;
+    /**
+     * 余额
+     */
+    private String balanceOf;
 }

src/main/java/com/supplier/model/SupplierRoute.java

@@ -94,4 +94,8 @@ public class SupplierRoute implements Serializable {
      * 修改日期
      */
     private String updateDate;
+    /**
+     * 地点标题
+     */
+    private String titleDayName;
 }

src/main/java/com/supplier/service/impl/PrivateOrderServiceImpl.java

@@ -45,7 +45,7 @@ public class PrivateOrderServiceImpl implements PrivateOrderService {
 
     @Override
     public List<PrivateOrder> getPrivateOrderZeor(PrivateOrder privateOrder) {
-        privateOrder.setPage((privateOrder.getPage() - 1) * 10);
+        privateOrder.setPage((privateOrder.getPage() - 1) * privateOrder.getLimit());
         return privateOrderMapper.getPrivateOrderZeor(privateOrder);
     }
 

src/main/resources/config/mapping/ReleaseMapper.xml

@@ -4,8 +4,8 @@
 <mapper namespace="com.supplier.mapper.ReleaseMapper">
     <!-- 供应商发布路线 -->
     <insert id="addReleaseVal" parameterType="SupplierRoute">
-        insert into bus_supplier_route(code,origin,destination,start_time,end_time,look_num,title_img,offer_name,price_all,people_num,uuid,jdrq,update_date)
-        values(#{code},#{origin},#{destination},#{startTime},#{endTime},0,#{titleImg},#{offerName},#{priceAll},#{peopleNum},#{uuid},format(SYSDATETIME(),'yyyy-MM-dd hh:mm:ss'),format(SYSDATETIME(),'yyyy-MM-dd hh:mm:ss'))
+        insert into bus_supplier_route(code,origin,destination,start_time,end_time,look_num,title_img,offer_name,price_all,people_num,uuid,jdrq,update_date,title_day_name)
+        values(#{code},#{origin},#{destination},#{startTime},#{endTime},0,#{titleImg},#{offerName},#{priceAll},#{peopleNum},#{uuid},format(SYSDATETIME(),'yyyy-MM-dd hh:mm:ss'),format(SYSDATETIME(),'yyyy-MM-dd hh:mm:ss'),#{titleDayName})
     </insert>
     <!-- 查询路线发布 -->
     <select id="getRelease" parameterType="SupplierRoute" resultType="SupplierRoute">

src/main/resources/config/mapping/privateOrderMapper.xml

@@ -17,7 +17,7 @@
         <if test="destination != null and destination !=''">
             and destination = #{destination}
         </if>
-        and b.id not in (select top ${page} id  from bus_travel ) order by b.id
+        and b.id not in (select top ${page} id from bus_private_ordering ) order by b.id
     </select>
     <!-- 查询私人订制特殊 -->
     <select id="getPrivateOrderZeor" resultType="PrivateOrder">
@@ -26,6 +26,8 @@
         FROM
         bus_private_ordering AS b
         JOIN ( SELECT code,uuid FROM bus_private_ordering WHERE uuid NOT IN ( SELECT demand_uuid FROM bus_private_ordering_type WHERE code = #{code} AND order_type != 0 ) ) AS c ON b.uuid = c.uuid
+        JOIN ( SELECT code,uuid FROM bus_private_ordering WHERE uuid NOT IN ( SELECT demand_uuid FROM bus_private_ordering_type WHERE order_type = 9 ) ) AS a ON b.uuid = a.uuid
+        JOIN ( SELECT code,uuid FROM bus_private_ordering WHERE uuid NOT IN ( SELECT demand_uuid FROM bus_private_ordering_type WHERE order_type = 10 ) ) AS d ON b.uuid = d.uuid
         WHERE
         b.uuid NOT IN (SELECT ordering_uuid FROM bus_ignore_supplier WHERE code = #{code})
         <if test="startTime != null and startTime !=''">
@@ -34,7 +36,7 @@
         <if test="destination != null and destination !=''">
             and b.destination = #{destination}
         </if>
-        and b.id not in (select top ${page} id  from bus_travel ) order by b.id
+        and b.id not in (select top ${page} id  from bus_private_ordering ) order by b.id
     </select>
     <!-- 查询总条数 -->
     <select id="getPrivateOrderCount" resultType="int">
@@ -59,6 +61,8 @@
         FROM
         bus_private_ordering AS b
         JOIN ( SELECT code,uuid FROM bus_private_ordering WHERE uuid NOT IN ( SELECT demand_uuid FROM bus_private_ordering_type WHERE code = #{code} AND order_type != 0 ) ) AS c ON b.uuid = c.uuid
+        JOIN ( SELECT code,uuid FROM bus_private_ordering WHERE uuid NOT IN ( SELECT demand_uuid FROM bus_private_ordering_type WHERE order_type = 9 ) ) AS a ON b.uuid = a.uuid
+        JOIN ( SELECT code,uuid FROM bus_private_ordering WHERE uuid NOT IN ( SELECT demand_uuid FROM bus_private_ordering_type WHERE order_type = 10 ) ) AS d ON b.uuid = d.uuid
         WHERE
         b.uuid NOT IN (SELECT ordering_uuid FROM bus_ignore_supplier WHERE code = #{code})
         <if test="startTime != null and startTime !=''">

src/main/resources/static/js/demandForSingle/index/function.js

@@ -82,6 +82,8 @@ function getQuotation(page, limit, startTime, endTime){
                     , curr: page
                     , jump: function (obj,first) {
                         if (!first) {
+                            console.log(obj.curr)
+                            console.log(obj.limit)
                             getQuotation(obj.curr,obj.limit, startTime, endTime);
                         }
                     }

src/main/resources/static/js/demandForSingle/index/index.js

@@ -15,7 +15,7 @@ layui.use(["layer", "form", "laydate", 'laypage'], function(){
     $(".query_button").on("click", () => {
         startTime = $("input[name=startTime]").val(); //开始日期
         endTime = $("input[name=endTime]").val(); //结束日期
-        getQuotation(0, 7, startTime, endTime);//查询报价单数据渲染
+        getQuotation(1, 7, startTime, endTime);//查询报价单数据渲染
     });
 
     //头部重置
@@ -24,7 +24,7 @@ layui.use(["layer", "form", "laydate", 'laypage'], function(){
         $("input[name=endTime]").val(""); //结束日期
         startTime = null;
         endTime = null;
-        getQuotation(0, 7, startTime, endTime);//查询报价单数据渲染
+        getQuotation(1, 7, startTime, endTime);//查询报价单数据渲染
     });
 
     getQuotation(1, 7, startTime, endTime);//查询报价单数据渲染

src/main/resources/static/js/release/index/function.js

@@ -283,7 +283,8 @@ function submitAdd(){
             "endTime": arryValue.endTime,
             "origin": arryValue.origin,
             "destination": arryValue.destination,
-            "peopleNum": arryValue.peopleNum
+            "peopleNum": arryValue.peopleNum,
+            "titleDayName": arryValue.titleDayName.substr(0, arryValue.titleDayName - 1)
         }),
         headers: {"token": token},
         contentType: "application/json",
@@ -638,6 +639,7 @@ function theValues(){
     var peopleNum = $("input[name=peopleNum]").val();//人数
     var origin = $("input[name=origin]").val();//起始地
     var destination = $("input[name=destination]").val();//目的地
+    var titleDayName = "";//地点名称
 
     map.priceAll = priceAll;
     map.titleName = titleName;
@@ -684,6 +686,7 @@ function theValues(){
                 }
 
                 var name = $(element).find(".title_name_spot input").val();
+                titleDayName = titleDayName + "," + name
                 var content = $(element).find(".editor-content textarea").val();
                 releasePlay.push({"dayNum": dayNum, "imgUrl": (imgUrl == "undefined" ? null : imgUrl), "videoUrl": (videoUrl == "undefined" ? null : videoUrl), "name": name, "content": content, "typeVal": "0"});
             });
@@ -738,6 +741,7 @@ function theValues(){
     var releasePlayString = JSON.stringify(releasePlay);
     map.releaseDayString = releaseDayString;
     map.releasePlayString = releasePlayString;
+    map.titleDayName = titleDayName;//游玩信息
     return map;
 }
 //点击其他