|
|
@ -37,20 +37,20 @@ namespace SettleAccount.Job.Services.Report |
|
|
|
{ |
|
|
|
var _filename = exportName.FirstOrDefault(); |
|
|
|
var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value; |
|
|
|
var begin = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value; |
|
|
|
var begin = p_list.Where(p => p.Name == "BegingTime").FirstOrDefault().Value; |
|
|
|
var end = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value; |
|
|
|
var materialGroup = p_list.Where(p => p.Name == "MaterialGroup").FirstOrDefault().Value; |
|
|
|
var sapCode = p_list.Where(p => p.Name == "SapCode").FirstOrDefault().Value; |
|
|
|
var sapCode = p_list.Where(p => p.Name == "SAPCode").FirstOrDefault().Value; |
|
|
|
var _ls = _dapper.GetKanbanReportList(version, begin,end); |
|
|
|
// var _lst = _dapper.GetNoKanbanReportList(version, begin, end);
|
|
|
|
if (!string.IsNullOrEmpty(materialGroup)) |
|
|
|
{ |
|
|
|
var _groupList = materialGroup.Split(new char[] { ',' }).Distinct().ToList(); |
|
|
|
if (_groupList.Count() > 0) |
|
|
|
{ |
|
|
|
_ls = _ls.Where(p => _groupList.Contains(p.MaterialGroup)).ToList(); |
|
|
|
} |
|
|
|
} |
|
|
|
//if (!string.IsNullOrEmpty(materialGroup))
|
|
|
|
//{
|
|
|
|
// var _groupList = materialGroup.Split(new char[] { ',' }).Distinct().ToList();
|
|
|
|
// if (_groupList.Count() > 0)
|
|
|
|
// {
|
|
|
|
// _ls = _ls.Where(p => _groupList.Contains(p.MaterialGroup)).ToList();
|
|
|
|
// }
|
|
|
|
//}
|
|
|
|
//if (!string.IsNullOrEmpty(materialCode))
|
|
|
|
//{
|
|
|
|
// var _groupList = materialCode.Split(new char[] { '\n' }).Distinct().ToList();
|
|
|
|