21345
This commit is contained in:
parent
f36cc40f71
commit
959ecc8480
@ -817,14 +817,13 @@ namespace APT.SC.WebApi.Controllers.Api.BI
|
||||
{
|
||||
string strConn = OPTenantDBConnService.GetConnByORGID(filter.OrgId.Value);
|
||||
DataSet ds = DBHelper.ExecProcedure(strConn, "proc_HomeSubHiddenManage", dic, HttpContext.Request.Path);
|
||||
double percent = 0;
|
||||
if (ds != null && ds.Tables != null && ds.Tables.Count > 0)
|
||||
{
|
||||
List<dynamic> listHiddenOrder = new List<dynamic>();
|
||||
List<dynamic> hiddenRanking = new List<dynamic>();
|
||||
int NUM = 1;
|
||||
foreach (DataRow item in ds.Tables[0].Rows)
|
||||
{
|
||||
listHiddenOrder.Add(new
|
||||
hiddenRanking.Add(new
|
||||
{
|
||||
NUM = NUM,
|
||||
hiddenName = item[0],
|
||||
@ -832,28 +831,28 @@ namespace APT.SC.WebApi.Controllers.Api.BI
|
||||
});
|
||||
NUM++;
|
||||
}
|
||||
listResult.listHiddenOrder = listHiddenOrder;
|
||||
listResult.hiddenRanking = hiddenRanking;
|
||||
if (string.IsNullOrEmpty(ORGID))
|
||||
{
|
||||
//全部搜索 3张表
|
||||
List<dynamic> listHidden = new List<dynamic>();
|
||||
List<dynamic> hiddenList = new List<dynamic>();
|
||||
DataTable dt = ds.Tables[1];
|
||||
foreach (DataRow item in dt.Rows)
|
||||
{
|
||||
listHidden.Add(new
|
||||
hiddenList.Add(new
|
||||
{
|
||||
companyName = item["companyName"],
|
||||
generalCount = item["generalCount"],
|
||||
majorCount = item["majorCount"],
|
||||
});
|
||||
}
|
||||
listResult.listHidden = listHidden;
|
||||
listResult.hiddenList = hiddenList;
|
||||
|
||||
List<dynamic> listHiddenDoneMonth = new List<dynamic>();
|
||||
List<dynamic> hiddenRectifyList = new List<dynamic>();
|
||||
dt = ds.Tables[2];
|
||||
foreach (DataRow item in dt.Rows)
|
||||
{
|
||||
listHiddenDoneMonth.Add(new
|
||||
hiddenRectifyList.Add(new
|
||||
{
|
||||
companyName = item["companyName"],
|
||||
generalCount = item["generalCount"],
|
||||
@ -862,7 +861,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
|
||||
generalCountNo = item["generalCountNo"],
|
||||
});
|
||||
}
|
||||
listResult.listHiddenDoneMonth = listHiddenDoneMonth;
|
||||
listResult.hiddenRectifyList = hiddenRectifyList;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -880,14 +879,14 @@ namespace APT.SC.WebApi.Controllers.Api.BI
|
||||
/// <summary>
|
||||
/// 隐患数量统计
|
||||
/// </summary>
|
||||
public List<dynamic> listHidden { get; set; }
|
||||
public List<dynamic> hiddenList { get; set; }
|
||||
/// <summary>
|
||||
/// 月度隐患处理统计
|
||||
/// </summary>
|
||||
public List<dynamic> listHiddenDoneMonth { get; set; }
|
||||
public List<dynamic> hiddenRectifyList { get; set; }
|
||||
/// <summary>
|
||||
/// 隐患排序
|
||||
/// </summary>
|
||||
public List<dynamic> listHiddenOrder { get; set; }
|
||||
public List<dynamic> hiddenRanking { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user