客户修改

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

@@ -140,18 +140,18 @@
         LEFT JOIN tb_rst_sales_order_item soi ON t.sales_id = soi.item_order_id
         LEFT JOIN tb_rst_dm_claim_order dco on soi.item_id=dco.item_id
         <where>
-            <if test="isCustmerAddOrder !=null and isCustmerAddOrder == 2">
-                AND sales_batch_id != 'KS00000000000001'
-            </if>
-            <if test="salesIsDownload !=null and salesIsDownload !=''">
-                AND sales_is_download = #{salesIsDownload}
-            </if>
             <if test="salesShippingStatus !=null">
                 AND sales_shipping_status = #{salesShippingStatus}
             </if>
             <if test="salesStatus !=null">
                 AND sales_status = #{salesStatus}
             </if>
+            <if test="isCustmerAddOrder !=null and isCustmerAddOrder == 2">
+                AND sales_batch_id != 'KS00000000000001'
+            </if>
+            <if test="salesIsDownload !=null and salesIsDownload !=''">
+                AND sales_is_download = #{salesIsDownload}
+            </if>
             <if test="salesOrderStatus !=null">
                 AND sales_order_status = #{salesOrderStatus}
             </if>
@@ -244,6 +244,12 @@
             <if test="orderIscostTotal != null and orderIscostTotal == 2">
                 AND dco.item_id is null
             </if>
+            <if test="isSelectCustomer == 1">
+                AND sales_customer_id is NOT null
+            </if>
+            <if test="isSelectCustomer == 2">
+                AND sales_customer_id is null
+            </if>
         </where>
     </select>
 
@@ -277,18 +283,18 @@
         LEFT JOIN tb_rst_sys_admin sa ON t.sales_admin_id = sa.admin_id
         LEFT JOIN tb_rst_dm_claim_order dco on soi.item_id=dco.item_id
         <where>
-            <if test="isCustmerAddOrder !=null and isCustmerAddOrder == 2">
-                AND sales_batch_id != 'KS00000000000001'
-            </if>
-            <if test="salesIsDownload !=null and salesIsDownload !=''">
-                AND sales_is_download = #{salesIsDownload}
-            </if>
             <if test="salesShippingStatus !=null">
                 AND sales_shipping_status = #{salesShippingStatus}
             </if>
             <if test="salesStatus !=null">
                 AND sales_status = #{salesStatus}
             </if>
+            <if test="isCustmerAddOrder !=null and isCustmerAddOrder == 2">
+                AND sales_batch_id != 'KS00000000000001'
+            </if>
+            <if test="salesIsDownload !=null and salesIsDownload !=''">
+                AND sales_is_download = #{salesIsDownload}
+            </if>
             <if test="salesOrderStatus !=null">
                 AND sales_order_status = #{salesOrderStatus}
             </if>
@@ -381,6 +387,12 @@
             <if test="orderIscostTotal != null and orderIscostTotal == 2">
                 AND dco.item_id is null
             </if>
+            <if test="isSelectCustomer == 1">
+                AND sales_customer_id is NOT null
+            </if>
+            <if test="isSelectCustomer == 2">
+                AND sales_customer_id is null
+            </if>
         </where>
         ORDER BY t.sales_id DESC
     </select>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/dm/DmDealerController.java

@@ -725,6 +725,8 @@ public class DmDealerController {
     @RequiresPermissions("dm:order_statistic:list")
     public ResponseJson dmDownloadOrderVal(HttpServletRequest request,SalesOrder so) throws Exception {
         ResponseJson rj = ResponseJson.getFAILURE();
+        so.setIsCustmerAddOrder(2);
+        so.setIsSelectCustomer(2);
         Integer num = postOrderNumService.listSalesOrderAndItemNum(so);
         if(num > 20000){
             rj.setResultMsg("下载订单超过20000条，请精确查询条件");
@@ -743,6 +745,7 @@ public class DmDealerController {
     @RequiresPermissions("dm:order_statistic:list")
     public ModelAndView dmDownloadOrder(HttpServletRequest request,SalesOrder so) throws Exception {
         so.setIsCustmerAddOrder(2);
+        so.setIsSelectCustomer(2);
         List<SalesOrder> temporarySalesOrderList = postOrderNumService.listSalesOrderAndItem(so);
 
         if(temporarySalesOrderList.size() > 20000){