This commit is contained in:
parent
17ce16a567
commit
de430627fa
|
|
@ -143,6 +143,19 @@ namespace FineUIPro.Web
|
||||||
{
|
{
|
||||||
string returnDbHtml = "";
|
string returnDbHtml = "";
|
||||||
var getDataList = Funs.DB.Sp_WorkBench_GetToDoItems(userId, sType).ToList();
|
var getDataList = Funs.DB.Sp_WorkBench_GetToDoItems(userId, sType).ToList();
|
||||||
|
//调人力预警接口
|
||||||
|
if (sType != "2")
|
||||||
|
{
|
||||||
|
var sgList = SGManPowerService.CheckAndSendPersonWarning(userId);
|
||||||
|
if (sgList != null)
|
||||||
|
{
|
||||||
|
foreach (var item in sgList)
|
||||||
|
{
|
||||||
|
getDataList.Add(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//把getDataList和sgList的数据合并
|
||||||
foreach (var item in getDataList)
|
foreach (var item in getDataList)
|
||||||
{
|
{
|
||||||
returnDbHtml += "<div class=\"z-item\" style=\"cursor:pointer\" onclick=\"returnWindows('" + item.PCUrl + "')\"><p class=\"z-val\"><span>" + item.ProjectCode + " " + "</span><span>" + item.MenuName + " " + item.Content + "</span></p><p class=\"z-data\">" + item.DataTime.ToString().Replace('/', '-').Split(' ')[0] + "</p></div>";
|
returnDbHtml += "<div class=\"z-item\" style=\"cursor:pointer\" onclick=\"returnWindows('" + item.PCUrl + "')\"><p class=\"z-val\"><span>" + item.ProjectCode + " " + "</span><span>" + item.MenuName + " " + item.Content + "</span></p><p class=\"z-data\">" + item.DataTime.ToString().Replace('/', '-').Split(' ')[0] + "</p></div>";
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue