历史订单导出修改

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderExportResult.java

@@ -21,6 +21,11 @@ public class OrderExportResult {
      */
     private Integer sort;
 
+    /**
+     * 订单号
+     */
+    private String sn;
+
     /**
      * 清运时间（日期）
      */

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java

@@ -1804,7 +1804,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
                 .eq(null != searchParam.getTransCompanyId(), "a.trans_company_id", searchParam.getTransCompanyId())
                 .eq("a.deleted", 0)
                 .eq(StrUtil.isNotBlank(area), "h.area", area)
-                .eq("og.origin_goods_id", goodsId)
+                .eq(goodsId != null, "og.origin_goods_id", goodsId)
                 .like(StrUtil.isNotBlank(sn), "a.sn", sn)
                 .like(StrUtil.isNotBlank(nickname), "a.contacts", nickname)
                 .like(StrUtil.isNotBlank(companyName), "j.company_name", companyName)
@@ -1826,6 +1826,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         for (OrderExportResult result : list) {
             Map<String, Object> map = new LinkedHashMap<>();
             map.put("序号", i);
+            map.put("订单号", result.getSn());
             map.put("日期", result.getTransTime());
             map.put("中转站", result.getStationName());
             map.put("运输公司", result.getTransCompanyName());

njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -214,6 +214,7 @@
 
     <resultMap id="OrderExportResultMap" type="com.njzscloud.supervisory.order.pojo.result.OrderExportResult">
         <result property="id" column="id"/>
+        <result property="sn" column="sn"/>
         <result property="transTime" column="trans_time"/>
         <result property="stationName" column="station_name"/>
         <result property="transCompanyName" column="trans_company_name"/>
@@ -248,6 +249,7 @@
     <select id="exportList" resultMap="OrderExportResultMap">
         SELECT
         a.id,
+        a.sn,
         DATE_FORMAT( a.trans_time, '%Y-%m-%d' ) AS trans_time,
         b.station_name,
         g.company_name AS trans_company_name,