1.修改查看已签署PDF历史文件的筛选条件（目前通过运单号和经销商ID）

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/EsignController.java

@@ -111,7 +111,8 @@ public class EsignController extends ApiBaseController {
 
 
         String businessScene = "订单签收";
-        String fileName = orderId+"_签收订单.pdf";
+        //String fileName = orderId+"_签收订单.pdf";
+        String fileName = tmsShipNumber+"_签收订单.pdf";
         /*根据userId查询个人注册后accountId*/
         String signerAccountId = "";
         try {
@@ -213,7 +214,8 @@ public class EsignController extends ApiBaseController {
         String orderId = obj.getString("orderId");
         String deliveryNumber = obj.getString("deliveryNumber");
         String shipmentNumber = obj.getString("shipmentNumber");
-        OrderFile orderFile = orderFileService.selectOrderFileByParam(orderId,deliveryNumber,shipmentNumber);
+        String customersCode = obj.getString("customersCode");
+        OrderFile orderFile = orderFileService.selectOrderFileByParam(orderId,deliveryNumber,shipmentNumber,customersCode);
         if(orderFile != null){
             return AjaxResult.success().putKV("url",serverConfig.getUrl()+orderFile.getFileUrl());
         }else{

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/mapper/OrderFileMapper.java

@@ -70,5 +70,8 @@ public interface OrderFileMapper
 
     int updateOrderFileByFlowId(OrderFile orderFile);
 
-    public OrderFile selectOrderFileByParam(@Param("orderId")String orderId, @Param("deliveryNumber")String deliveryNumber, @Param("shipmentNumber")String shipmentNumber);
+    public OrderFile selectOrderFileByParam(@Param("orderId")String orderId,
+                                            @Param("deliveryNumber")String deliveryNumber,
+                                            @Param("shipmentNumber")String shipmentNumber,
+                                            @Param("customersCode") String customersCode);
 }

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/service/IOrderFileService.java

@@ -70,5 +70,5 @@ public interface IOrderFileService
 
     public int updateOrderFileByFlowId(OrderFile orderFile);
 
-    OrderFile selectOrderFileByParam(String orderId, String deliveryNumber, String shipmentNumber);
+    OrderFile selectOrderFileByParam(String orderId, String deliveryNumber, String shipmentNumber,String customersCode);
 }

suishenbang-wxportal/suishenbang-wxportal-common/src/main/resources/mapper/wxportal/OrderFileMapper.xml

@@ -68,11 +68,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectOrderFileByParam" resultMap="OrderFileResult">
         <include refid="selectOrderFileVo"/>
-        where order_id = #{orderId}
-            and delivery_number = #{deliveryNumber}
-            and shipment_number = #{shipmentNumber}
+        where /*order_id = #{orderId}
+            and delivery_number = #{deliveryNumber}*/
+            shipment_number = #{shipmentNumber}
+            and customers_code = #{customersCode}
             and file_url is not null
-            group by order_id,delivery_number,shipment_number
+            /*group by order_id,delivery_number,shipment_number*/
+            ORDER BY create_time desc
+            limit 1
     </select>
 
     <insert id="insertOrderFile" parameterType="OrderFile">