From f2f7a488d411ad5085f5cc9601b648790584334f Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 20 Jul 2024 12:25:31 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/emis/domain/EmisWaybill.java   | 20 +++++++++----------
 .../resources/mapper/EmisWaybillMapper.xml    |  4 +++-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
index 3593da91d..586a5445a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
@@ -60,7 +60,7 @@ public class EmisWaybill extends BaseEntity
     /* 订单类型 0-预报订单 1-正式订单 */
     private String orderType;
     /* 下单时间 - 取客户当地时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date orderDate;
     /* 客户ID */
     private Long userId;
@@ -168,7 +168,7 @@ public class EmisWaybill extends BaseEntity
     @TableField
     private String customsEclaration;
     /* 预计到达时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     @TableField
     private Date estimateDate;
     /* 包装类型 */
@@ -181,11 +181,11 @@ public class EmisWaybill extends BaseEntity
     @TableField
     private String pickupMethod;
     /* 预计上门取件开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     @TableField
     private Date pickStartDate;
     /* 预计上门取件结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     @TableField
     private Date pickFinishDate;
     /* 取货失败原因 */
@@ -315,7 +315,7 @@ public class EmisWaybill extends BaseEntity
     @TableField
     private String transferBillcode;
     /* 转单时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date dispFdDate;
     /* 转单原因 */
     private String dispFdReason;
@@ -328,7 +328,7 @@ public class EmisWaybill extends BaseEntity
     /* 登记站点代码 */
     private String registerSiteCode;
     /* 登记时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date registerDate;
     /* 登记人编号 */
     private String registerManCode;
@@ -339,7 +339,7 @@ public class EmisWaybill extends BaseEntity
     /* 发件财务中心代码 */
     private String sendCenterCode;
     /* 发货时间 - 取本地时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date sendDate;
     /* 派件人代码 */
     private String dispatchManCode;
@@ -348,7 +348,7 @@ public class EmisWaybill extends BaseEntity
     /* 派件网点代码 */
     private String dispatchSiteCode;
     /* 生成账单时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date produceBillDate;
     /* 生成账单站点代码 */
     private String produceBillSiteCode;
@@ -413,7 +413,7 @@ public class EmisWaybill extends BaseEntity
     private String signSiteCode;
     /* sign_date */
     @TableField
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date signDate;
 
     /* 时区偏差 */
@@ -421,7 +421,7 @@ public class EmisWaybill extends BaseEntity
     /* 付款状态 字典:emis_payment_status */
     private String paymentStatus;
     /* 付款时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date paymentDate;
     /* 付款备注 */
     private String paymentRemark;
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 97509da00..b8f42d74c 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1468,7 +1468,9 @@
         <include refid="selectEmisWaybillVo"/>
         <where>
             a.del_flag='0' and order_status !='0'
-            <if test="billCode != null  and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  </if>
+            <if test="billCode != null  and billCode != ''"> and ( FIND_IN_SET( a.`bill_code`,#{billCode}) or  a.bill_code like concat('%', #{billCode}, '%') )  </if>
+            <if test="dispatchUnderlingSiteCode != null  and dispatchUnderlingSiteCode != ''"> and a.dispatch_underling_site_code=#{dispatchUnderlingSiteCode}</if>
+            <if test="sendSiteCode != null  and sendSiteCode != ''"> and a.send_site_code= #{sendSiteCode}</if>
 
             <if test="params.beginDate != null and params.beginDate != ''">
                 and a.send_date <![CDATA[ >= ]]>  #{params.beginDate}