根据签收日期查询

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/postOrderNumMapper.xml

@@ -236,6 +236,14 @@
                     AND sales_pay_time <![CDATA[<=]]> #{endDate}
                 </if>
             </if>
+            <if test="orderDateType != null and orderDateType == 5">
+                <if test="startDate != null and startDate != ''">
+                    AND sales_sign_time <![CDATA[>=]]> #{startDate}
+                </if>
+                <if test="endDate != null and endDate != ''">
+                    AND sales_sign_time <![CDATA[<=]]> #{endDate}
+                </if>
+            </if>
             <if test="dealerId != null">
                 AND  sales_store_id IN (
                 select
@@ -394,6 +402,14 @@
                     AND sales_pay_time <![CDATA[<=]]> #{endDate}
                 </if>
             </if>
+            <if test="orderDateType != null and orderDateType == 5">
+                <if test="startDate != null and startDate != ''">
+                    AND sales_sign_time <![CDATA[>=]]> #{startDate}
+                </if>
+                <if test="endDate != null and endDate != ''">
+                    AND sales_sign_time <![CDATA[<=]]> #{endDate}
+                </if>
+            </if>
             <if test="orderIscostTotal != null and orderIscostTotal == 1">
                 AND dco.item_id is not null
             </if>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -1624,7 +1624,7 @@ public class AwaitSendController {
             temporarySalesOrderList = postOrderNumService.listSalesOrderAndItem(so);
         }
         // 判断数据
-        if(temporarySalesOrderList == null || temporarySalesOrderList.isEmpty() || temporarySalesOrderList.size() > 20000){
+        if(temporarySalesOrderList == null || temporarySalesOrderList.isEmpty() || temporarySalesOrderList.size() > 60000){
             throw new RuntimeException("下载出错，下载数量过大 或者 下载数据为空");
         }
         // 准备model
@@ -1632,6 +1632,7 @@ public class AwaitSendController {
         model.put("fileName", "订单列表");
         // 标题
         List<String> titles = new ArrayList<String>(26);
+        titles.add("订单签收日期");
         titles.add("订单创建日期");
         titles.add("订单支付日期");
         titles.add("订单编号");
@@ -1668,6 +1669,7 @@ public class AwaitSendController {
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");
         temporarySalesOrderList.forEach((salesOrder -> {
             List<Object> row = new ArrayList<Object>();
+            row.add(salesOrder.getSalesSignTime() == null ? null:formatter.format(salesOrder.getSalesSignTime()));
             row.add(salesOrder.getSalesCreateTime() == null ? null:formatter.format(salesOrder.getSalesCreateTime()));
             row.add(salesOrder.getSalesPayTime() == null ? null:formatter.format(salesOrder.getSalesPayTime()));
             row.add(salesOrder.getSalesOrderId());