# 更新

data-common/src/main/java/com/bailuntec/mapper/DcAutoSalesForecastStageConfigMapper.xml

@@ -28,17 +28,17 @@
             <if test="avgOrderCount30!=null ">
                 and (t5.orders_avg_min = 0 or t5.orders_avg_min &lt;= #{avgOrderCount30})
                 and (t5.orders_avg_max = 0 or t5.orders_avg_max &gt;= #{avgOrderCount30})
-                and t5.orders_avg_sampling_days = 30
+                and (t5.orders_avg_max = 0 or t5.orders_avg_sampling_days = 30)
             </if>
             <if test="avgOrderCount14!=null ">
                 and (t5.orders_avg_min = 0 or t5.orders_avg_min &lt;= #{avgOrderCount14})
                 and (t5.orders_avg_max = 0 or t5.orders_avg_max &gt;= #{avgOrderCount14})
-                and t5.orders_avg_sampling_days = 14
+                and (t5.orders_avg_max = 0 or t5.orders_avg_sampling_days = 14)
             </if>
             <if test="avgOrderCount7!=null ">
                 and (t5.orders_avg_min = 0 or t5.orders_avg_min &lt;= #{avgOrderCount7})
                 and (t5.orders_avg_max = 0 or t5.orders_avg_max &gt;= #{avgOrderCount7})
-                and t5.orders_avg_sampling_days = 7
+                and (t5.orders_avg_max = 0 or t5.orders_avg_sampling_days = 7)
             </if>
                  LEFT JOIN dc_auto_sales_forecast_stage_config t7 on t7.config_id = t5.id
             and (IF(t5.screen_type = 1,

data-show/show-auto-turnover/src/test/java/AutoTurnoverTest.java

@@ -258,8 +258,8 @@ public class AutoTurnoverTest {
     public void testXX2() {
         DcBaseStock dcBaseStock = SessionUtil.getSession().getMapper(DcBaseStockMapper.class)
                 .selectOneByExample(DcBaseStockExample.newAndCreateCriteria()
-                        .andBailunSkuEqualTo("217632401")
-                        .andWarehouseCodeEqualTo("MMDUSFBA")
+                        .andBailunSkuEqualTo("N-G1617")
+                        .andWarehouseCodeEqualTo("GB4PXBL")
                         .example());
         try {
             AutoTurnoverJob autoTurnoverJob = new AutoTurnoverJob();