wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:74cbe47cdfe0960e1c0c93b75a45bca7328919f6
Branches Tags
wyw:master
..
compare: wyw:d4d0a0347463aecd42ccf1370be808ebd276f345
Branches Tags
wyw:master

No commits in common. "74cbe47cdfe0960e1c0c93b75a45bca7328919f6" and "d4d0a0347463aecd42ccf1370be808ebd276f345" have entirely different histories.
74cbe47cdf ... d4d0a03474

2 changed files with 51 additions and 53 deletions
Show Stats Expand all files Collapse all files

6
APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHeadSEController.cs
View File

@ -182,9 +182,9 @@ namespace APT.SC.WebApi.Controllers.Api.BI
} }
DataTable dtAnn = dsHead.Tables[1]; DataTable dtAnn = dsHead.Tables[1];
result.listAnnourcement = new List<T_PF_ANNOURCEMENT>();
if (dtAnn != null && dtAnn.Rows.Count > 0) if (dtAnn != null && dtAnn.Rows.Count > 0)
{ {
result.listAnnourcement = new List<T_PF_ANNOURCEMENT>();
foreach (DataRow item in dtAnn.Rows) foreach (DataRow item in dtAnn.Rows)
{ {
try try
@ -203,9 +203,9 @@ namespace APT.SC.WebApi.Controllers.Api.BI
DataTable dtVMSet = dsHead.Tables[3]; DataTable dtVMSet = dsHead.Tables[3];
result.playSet = new T_PF_BIPLAY_SET();
if (dtVMSet != null && dtVMSet.Rows.Count > 0) if (dtVMSet != null && dtVMSet.Rows.Count > 0)
{ {
result.playSet = new T_PF_BIPLAY_SET();
string colVal = string.Empty; string colVal = string.Empty;
try try
{ {
@ -235,9 +235,9 @@ namespace APT.SC.WebApi.Controllers.Api.BI
//播放信息 //播放信息
DataTable dtVM = dsHead.Tables[2]; DataTable dtVM = dsHead.Tables[2];
result.listVideoImg = new List<dynamic>();
if (dtVM != null && dtVM.Rows.Count > 0) if (dtVM != null && dtVM.Rows.Count > 0)
{ {
result.listVideoImg = new List<dynamic>();
FILETYPEEnum TYPE = (FILETYPEEnum)int.Parse(dtVM.Rows[0][0].ToString()); FILETYPEEnum TYPE = (FILETYPEEnum)int.Parse(dtVM.Rows[0][0].ToString());
string TITLE = dtVM.Rows[0][1].ToString(); string TITLE = dtVM.Rows[0][1].ToString();

38
APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs
View File

@ -767,7 +767,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
//Parameter3 传入 ORGID 如果有 //Parameter3 传入 ORGID 如果有
Dictionary<string, object> dic = new Dictionary<string, object>(); Dictionary<string, object> dic = new Dictionary<string, object>();
DateTime dtSecrch = DateTime.Now; DateTime dtSecrch = DateTime.Now;
//string ORGID = ""; string ORGID = "";
if (!string.IsNullOrEmpty(filter.Parameter2)) if (!string.IsNullOrEmpty(filter.Parameter2))
{ {
try try
@ -779,21 +779,21 @@ namespace APT.SC.WebApi.Controllers.Api.BI
dtSecrch = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-01 00:00:00")); dtSecrch = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-01 00:00:00"));
} }
} }
//if (!string.IsNullOrEmpty(filter.Parameter3)) if (!string.IsNullOrEmpty(filter.Parameter3))
//{ {
// try try
// { {
// ORGID = (new Guid(filter.Parameter3)).ToString(); ORGID = (new Guid(filter.Parameter3)).ToString();
// } }
// catch catch
// { {
// ORGID = ""; ORGID = "";
// } }
//} }
dic.Add("@dtMonthMin", dtSecrch.ToString("yyyy-MM-dd 00:00:00")); dic.Add("@dtMonthMin", dtSecrch.ToString("yyyy-MM-dd 00:00:00"));
dic.Add("@dtMonthMax", dtSecrch.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd HH:mm:ss")); dic.Add("@dtMonthMax", dtSecrch.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd HH:mm:ss"));
//dic.Add("@OrgId", ORGID.ToString()); dic.Add("@OrgId", ORGID.ToString());
if (!string.IsNullOrEmpty(filter.Parameter1)) if (!string.IsNullOrEmpty(filter.Parameter1))
{ {
@ -830,16 +830,14 @@ namespace APT.SC.WebApi.Controllers.Api.BI
hiddenRanking.Add(new hiddenRanking.Add(new
{ {
NUM = NUM, NUM = NUM,
companyName= item["companyName"], hiddenName = item[0],
ORG_ID = item["ORG_ID"], qty = item[1],
hiddenName = item["DESCREPTION"],
qty = item["dc"],
}); });
NUM++; NUM++;
} }
listResult.hiddenRanking = hiddenRanking; listResult.hiddenRanking = hiddenRanking;
//if (string.IsNullOrEmpty(ORGID)) if (string.IsNullOrEmpty(ORGID))
//{ {
//全部搜索 3张表 //全部搜索 3张表
List<dynamic> hiddenList = new List<dynamic>(); List<dynamic> hiddenList = new List<dynamic>();
DataTable dt = ds.Tables[1]; DataTable dt = ds.Tables[1];
@ -868,7 +866,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
}); });
} }
listResult.hiddenRectifyList = hiddenRectifyList; listResult.hiddenRectifyList = hiddenRectifyList;
//} }
} }
} }
catch { } catch { }