Commit 8c4b0944 by 泽锋 李

fix

parent cb5f34ea
...@@ -11,7 +11,7 @@ using System.Threading.Tasks; ...@@ -11,7 +11,7 @@ using System.Threading.Tasks;
namespace AutoTurnOver.DB namespace AutoTurnOver.DB
{ {
public class api_dao : connectionHelper public class api_dao : connectionHelper
{ {
/// <summary> /// <summary>
/// 获取缺货数据 /// 获取缺货数据
...@@ -27,7 +27,7 @@ namespace AutoTurnOver.DB ...@@ -27,7 +27,7 @@ namespace AutoTurnOver.DB
if (search.btime != null) if (search.btime != null)
{ {
sql += " and t1.gmt_out_stock_modified>=@btime "; sql += " and t1.gmt_out_stock_modified>=@btime ";
parameters.Add("btime",search.btime); parameters.Add("btime", search.btime);
} }
if (search.etime != null) if (search.etime != null)
{ {
...@@ -61,7 +61,7 @@ namespace AutoTurnOver.DB ...@@ -61,7 +61,7 @@ namespace AutoTurnOver.DB
sql += " and t1.gmt_modified <=@etime "; sql += " and t1.gmt_modified <=@etime ";
parameters.Add("etime", search.etime); parameters.Add("etime", search.etime);
} }
return await _connection.QueryAsync<dc_base_oms_sku_full_dto>(sql+ $" limit {(search.page - 1) * search.rows},{search.rows} ", parameters); return await _connection.QueryAsync<dc_base_oms_sku_full_dto>(sql + $" limit {(search.page - 1) * search.rows},{search.rows} ", parameters);
} }
// <summary> // <summary>
...@@ -71,18 +71,29 @@ namespace AutoTurnOver.DB ...@@ -71,18 +71,29 @@ namespace AutoTurnOver.DB
/// <returns></returns> /// <returns></returns>
public static Page<api_sku_sales_volume_dto> GetSkuSalesVolume(api_sku_sales_volume_search_dto search) public static Page<api_sku_sales_volume_dto> GetSkuSalesVolume(api_sku_sales_volume_search_dto search)
{ {
string sql = @" select t1.bailun_sku,t1.warehouse_code,t1.history_sevenday_sales,t2.oneday_sales from dc_auto_turnover as t1 string sql = @" select t1.bailun_sku,t1.warehouse_code,t1.history_sevenday_sales,t2.oneday_sales
from dc_auto_turnover as t1
left join dc_auto_sales as t2 on t1.bailun_sku = t2.bailun_sku and t1.warehouse_code =t2.warehouse_code where 1=1"; left join dc_auto_sales as t2 on t1.bailun_sku = t2.bailun_sku and t1.warehouse_code =t2.warehouse_code where 1=1";
string count_sql = " select count(1) from dc_auto_turnover as t1 where 1=1 ";
DynamicParameters parameters = new DynamicParameters(); DynamicParameters parameters = new DynamicParameters();
if (search != null) if (search != null)
{ {
if (search.bailun_sku_list != null && search.bailun_sku_list.Count >= 1) if (search.bailun_sku_list != null && search.bailun_sku_list.Count >= 1)
{ {
sql += " and t1.bailun_sku in @bailun_skus "; sql += " and t1.bailun_sku in @bailun_skus ";
count_sql += " and t1.bailun_sku in @bailun_skus ";
parameters.Add("bailun_skus", search.bailun_sku_list); parameters.Add("bailun_skus", search.bailun_sku_list);
} }
} }
return _connection.Page<api_sku_sales_volume_dto>(sql, search, parameters); var items = _connection.Query<api_sku_sales_volume_dto>(sql, parameters).ToList();
var totalItems = _connection.QuerySingleOrDefault<int?>(count_sql, parameters) ?? 0;
Page<api_sku_sales_volume_dto> page_data = new Page<api_sku_sales_volume_dto>
{
Items = items,
TotalItems = totalItems,
TotalPages = (long)Math.Ceiling(totalItems * 1.0 / search.rows)
};
return page_data;
} }
/// <summary> /// <summary>
...@@ -98,7 +109,7 @@ left join dc_auto_sales as t2 on t1.bailun_sku = t2.bailun_sku and t1.warehouse_ ...@@ -98,7 +109,7 @@ left join dc_auto_sales as t2 on t1.bailun_sku = t2.bailun_sku and t1.warehouse_
DynamicParameters parameters = new DynamicParameters(); DynamicParameters parameters = new DynamicParameters();
if (search != null) if (search != null)
{ {
if (!string.IsNullOrWhiteSpace( search.bailun_sku)) if (!string.IsNullOrWhiteSpace(search.bailun_sku))
{ {
sql += " and t1.bailun_sku = @bailun_sku "; sql += " and t1.bailun_sku = @bailun_sku ";
parameters.Add("bailun_sku", search.bailun_sku); parameters.Add("bailun_sku", search.bailun_sku);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment