浏览代码

优化订单列表展示

xian 4 年之前
父节点
当前提交
bc5a58e69a

+ 9 - 0
watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -150,11 +150,20 @@ public class SalesOrder implements Serializable {
     private Integer trackingAdminId;        //跟踪信息 操作人id
     private Integer feeCharges;             //维修收费
     private Date salesSignTime;             // 签收时间
+    private Integer salesIsErrorSign;            // 是否签收,1:异常签收
 
     private List<SalesOrderItem> salesOrderItemList = new ArrayList<SalesOrderItem>();
     private List<SalesOrderItem> suSalesOrderItemList = new ArrayList<SalesOrderItem>();
     private List<ComplaintDetectInfo> complaintDetectInfoList;
 
+    public Integer getSalesIsErrorSign() {
+        return salesIsErrorSign;
+    }
+
+    public void setSalesIsErrorSign(Integer salesIsErrorSign) {
+        this.salesIsErrorSign = salesIsErrorSign;
+    }
+
     public Date getSalesSignTime() {
         return salesSignTime;
     }

+ 3 - 0
watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -393,6 +393,9 @@
                 <if test="statisticalType != null  and statisticalType == 8">
                     AND sales_status != 3 and sales_deliver = 2 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL AND order_case_date IS NULL AND TIMESTAMPDIFF(HOUR,sales_deliver_time,NOW()) &gt;= 24
                 </if>
+                <if test="salesIsErrorSign != null  and salesIsErrorSign == 1">
+                    sales_status != 3 and sales_deliver = 2 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL AND order_case_date IS NOT NULL AND sales_send_time != order_case_date AND sales_sign_time is NULL AND sales_create_time >= '2020.05.01' AND TIMESTAMPDIFF(HOUR,order_case_date,NOW()) >= 168
+                </if>
             </where>
             GROUP BY
             soi.sales_id

文件差异内容过多而无法显示
+ 11 - 6
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl