修改

src/main/java/com/supplier/controller/PrivateOrderController.java

@@ -63,6 +63,37 @@ public class PrivateOrderController {
         return map;
     }
 
+    /**
+     * 查询私人订制小程序
+     * @param privateOrder 参数
+     * @return 返回结果
+     */
+    @GetMapping("getPrivateOrderSmall")
+    public Map<String, Object> getPrivateOrderSmall(PrivateOrder privateOrder, HttpServletRequest request){
+        Map<String, Object> map = new HashMap<>();
+        try {
+            //小程序get请求参数需解码
+            if(null != privateOrder.getDestination()){
+                privateOrder.setDestination(URLDecoder.decode(privateOrder.getDestination()));
+            }
+            //获取供应商code
+            Map<String, Object> userMap = ParsingToken.tokenParsing(request);
+            privateOrder.setCode((String) userMap.get("code"));
+
+            int count = privateOrderService.getPrivateOrderCount(privateOrder);
+            List<PrivateOrder> list = privateOrderService.getPrivateOrderSmall(privateOrder);
+
+            map.put("count", count);
+            map.put("data", list);
+            map.put("msg", "200");
+        }catch (Exception e){
+            map.put("msg", "500");
+            e.printStackTrace();
+        }
+        return map;
+    }
+
+
     /**
      * 忽略
      * @param ignore 参数

src/main/java/com/supplier/mapper/PrivateOrderMapper.java

@@ -26,4 +26,6 @@ public interface PrivateOrderMapper {
     int getPrivateOrderCountTwo(PrivateOrder privateOrder);
 
     int getDemandCount(String uuid);
+
+    List<PrivateOrder> getPrivateOrderSmall(PrivateOrder privateOrder);
 }

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

@@ -126,4 +126,12 @@ public class PrivateOrder implements Serializable {
      * 用户名称
      */
     private String orderName;
+    /**
+     * 排序方式
+     */
+    private String orderBy;
+    /**
+     * 订单对应的游记编号
+     */
+    private String myOrderingTravelUuid;
 }

src/main/java/com/supplier/service/PrivateOrderService.java

@@ -25,4 +25,6 @@ public interface PrivateOrderService {
     int getPrivateOrderCountTwo(PrivateOrder privateOrder);
 
     int getDemandCount(String uuid);
+
+    List<PrivateOrder> getPrivateOrderSmall(PrivateOrder privateOrder);
 }

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

@@ -68,4 +68,10 @@ public class PrivateOrderServiceImpl implements PrivateOrderService {
     public int getDemandCount(String uuid) {
         return privateOrderMapper.getDemandCount(uuid);
     }
+
+    @Override
+    public List<PrivateOrder> getPrivateOrderSmall(PrivateOrder privateOrder) {
+        privateOrder.setPage((privateOrder.getPage() - 1) * privateOrder.getLimit());
+        return privateOrderMapper.getPrivateOrderSmall(privateOrder);
+    }
 }

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

@@ -34,6 +34,38 @@
                 )
             order by b.id desc
     </select>
+    <!-- 查询私人订制小程序 -->
+    <select id="getPrivateOrderSmall" resultType="PrivateOrder">
+        SELECT
+            top ${limit} b.*,${orderType} as orderType,e.headpir,e.name as orderName
+        FROM
+            bus_private_ordering AS b
+            JOIN ( SELECT code,demand_uuid FROM bus_private_ordering_type WHERE code = #{code} and order_type = #{orderType}) as c on b.uuid = c.demand_uuid
+            LEFT JOIN sys_users as e on b.code = e.code
+        WHERE
+            uuid NOT IN (SELECT ordering_uuid FROM bus_ignore_supplier WHERE code = #{code})
+            <if test="startTime != null and startTime !=''">
+                and CONVERT (datetime, start_time) <![CDATA[ >= ]]> #{startTime} and CONVERT(datetime, end_time) <![CDATA[ <= ]]> #{endTime}
+            </if>
+            <if test="destination != null and destination !=''">
+                and destination like concat('%', #{destination}, '%')
+            </if>
+            and b.id not in
+            (
+            select top ${page} b.id from bus_private_ordering as b
+            JOIN ( SELECT code,demand_uuid FROM bus_private_ordering_type WHERE code = #{code} and order_type = #{orderType}) as c on b.uuid = c.demand_uuid
+            WHERE
+            uuid NOT IN (SELECT ordering_uuid FROM bus_ignore_supplier WHERE code = #{code})
+            <if test="startTime != null and startTime !=''">
+                and CONVERT (datetime, start_time) <![CDATA[ >= ]]> #{startTime} and CONVERT(datetime, end_time) <![CDATA[ <= ]]> #{endTime}
+            </if>
+            <if test="destination != null and destination !=''">
+                and destination like concat('%', #{destination}, '%')
+            </if>
+            order by ${orderBy}
+            )
+        order by ${orderBy}
+    </select>
     <!-- 查询私人订制 -->
     <select id="getPrivateOrderTwo" resultType="PrivateOrder">
         SELECT

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

@@ -68,7 +68,8 @@ layui.use(["layer", "form", "laydate", "upload"], function(){
         ,url: 'https://www.tuyatrip.com/api/upload/uploadFile' //上传接口
         ,method: 'post'  //可选项。HTTP类型，默认post
         ,accept: 'file'
-        ,acceptMime: 'pdf'
+        ,acceptMime: 'file/pdf'
+        ,exts: "pdf"
         ,headers: {token: token}
         ,before: function (){
             layer.load(2);