diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs index a5d0d3cb2..5ec972add 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs @@ -398,18 +398,18 @@ namespace Learun.Application.Web.Controllers ViewBag.FlowList = JsonConvert.SerializeObject(flowList); //校园一卡通余额 ViewBag.StuSaveRecordTotalNum = 0; - var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE); - if (stuSaveRecordList.Any()) - { - ViewBag.StuSaveRecordTotalNum = stuSaveRecordList.FirstOrDefault().ODDFARE; - } + //var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE); + //if (stuSaveRecordList.Any()) + //{ + // ViewBag.StuSaveRecordTotalNum = stuSaveRecordList.FirstOrDefault().ODDFARE; + //} //红湖付款码余额 ViewBag.StuConsumptionTotalNum = 0; - var stuConsumptionList = stuConsumptionIBLL.GetListByAccount(userInfo.account); - if (stuConsumptionList.Any()) - { - ViewBag.StuConsumptionTotalNum = stuConsumptionList.Select(x => x.OPFARE.ToDecimal()).Sum(); - } + //var stuConsumptionList = stuConsumptionIBLL.GetListByAccount(userInfo.account); + //if (stuConsumptionList.Any()) + //{ + // ViewBag.StuConsumptionTotalNum = stuConsumptionList.Select(x => x.OPFARE.ToDecimal()).Sum(); + //} //常用链接 var userfunctionlist = perm_FunctionIBLL.GetListByUserId(userInfo.userId); var ff = userfunctionlist.GroupBy(x => x.FTName).Select(x => new Perm_FunctionEntity() @@ -1401,18 +1401,19 @@ namespace Learun.Application.Web.Controllers ViewBag.FlowList = JsonConvert.SerializeObject(flowList); //校园一卡通余额 ViewBag.StuSaveRecordTotalNum = 0; - var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE); - if (stuSaveRecordList.Any()) - { - ViewBag.StuSaveRecordTotalNum = stuSaveRecordList.FirstOrDefault().ODDFARE; - } + + //var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE); + //if (stuSaveRecordList.Any()) + //{ + // ViewBag.StuSaveRecordTotalNum = stuSaveRecordList.FirstOrDefault().ODDFARE; + //} //红湖付款码余额 ViewBag.StuConsumptionTotalNum = 0; - var stuConsumptionList = stuConsumptionIBLL.GetListByAccount(userInfo.account); - if (stuConsumptionList.Any()) - { - ViewBag.StuConsumptionTotalNum = stuConsumptionList.Select(x => x.OPFARE.ToDecimal()).Sum(); - } + //var stuConsumptionList = stuConsumptionIBLL.GetListByAccount(userInfo.account); + //if (stuConsumptionList.Any()) + //{ + // ViewBag.StuConsumptionTotalNum = stuConsumptionList.Select(x => x.OPFARE.ToDecimal()).Sum(); + //} //常用链接 var userfunctionlist = perm_FunctionIBLL.GetListByUserId(userInfo.userId); var ff = userfunctionlist.GroupBy(x => x.FTName).Select(x => new Perm_FunctionEntity() @@ -1734,18 +1735,18 @@ namespace Learun.Application.Web.Controllers ViewBag.FlowList = JsonConvert.SerializeObject(flowList); //校园一卡通余额 ViewBag.StuSaveRecordTotalNum = 0; - var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE); - if (stuSaveRecordList.Any()) - { - ViewBag.StuSaveRecordTotalNum = stuSaveRecordList.FirstOrDefault().ODDFARE; - } + //var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE); + //if (stuSaveRecordList.Any()) + //{ + // ViewBag.StuSaveRecordTotalNum = stuSaveRecordList.FirstOrDefault().ODDFARE; + //} //红湖付款码余额 ViewBag.StuConsumptionTotalNum = 0; - var stuConsumptionList = stuConsumptionIBLL.GetListByAccount(userInfo.account); - if (stuConsumptionList.Any()) - { - ViewBag.StuConsumptionTotalNum = stuConsumptionList.Select(x => x.OPFARE.ToDecimal()).Sum(); - } + //var stuConsumptionList = stuConsumptionIBLL.GetListByAccount(userInfo.account); + //if (stuConsumptionList.Any()) + //{ + // ViewBag.StuConsumptionTotalNum = stuConsumptionList.Select(x => x.OPFARE.ToDecimal()).Sum(); + //} //常用链接 var userfunctionlist = perm_FunctionIBLL.GetListByUserId(userInfo.userId); var ff = userfunctionlist.GroupBy(x => x.FTName).Select(x => new Perm_FunctionEntity() @@ -2020,5 +2021,42 @@ namespace Learun.Application.Web.Controllers return Success("操作成功"); } + [HandlerLogin(FilterMode.Enforce)] + public ActionResult GetYKTPayed() + { + var yktpayed=cdMajorIBLL.GetYKTPayed(LoginUserInfo.Get().account); + if (yktpayed!=null&& yktpayed.Rows.Count>0) + { + return Success(new + { + YKTPayed = (yktpayed.Rows[0][0].ToDecimal()/100).ToDecimal(2) + }); + } + else + { + return Success(new { + YKTPayed=0 + }); + } + } + [HandlerLogin(FilterMode.Enforce)] + public ActionResult GetYKTBalance() + { + var yktpayed = cdMajorIBLL.GetYKTBalance(LoginUserInfo.Get().account); + if (yktpayed != null && yktpayed.Rows.Count > 0) + { + return Success(new + { + YKTPayed = (yktpayed.Rows[0][0].ToDecimal()/100).ToDecimal(2) + }); + } + else + { + return Success(new + { + YKTPayed = 0 + }); + } + } } } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml index 3d97972c1..5108768ba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml @@ -20,71 +20,71 @@ //数据看板 var card1Fun = function (ind) { var html = '
' - +'
' - +'
' - +'数据看板' - +'' - +'
' - +'
' - +'
' - +'
' - +'
' - +'校园一卡通余额' - + '
' - + '
@ViewBag.StuSaveRecordTotalNum
' - +'
' - +'
' - +'
' - +'
' - +'校园一卡通消费金额' - + '
' - + '
@ViewBag.StuConsumptionTotalNum
' - +'
' - +'
' - +'
' - +'
' - +'图书馆借阅(未还) ' - + '
' - + '
0
' - +'
' - +'
' - +'
' - +'
' - +'已完成办公事项' - +'
' - +'
@ViewBag.FinishTaskTotalNum
' - +'
' - +'
' - +'
' - +'
' - +'智慧教育在线学习时长' - +'
' - + '
0
' - +'
' - +'
' - +'
' - +'
' - +'办公业务往来人员' - +'
' - + '
0
' - +'
' - +'
' - +'
' - +'
' - +'来往邮件数量' - +'
' - +'
@ViewBag.LanMailTotalNum
' - +'
' - +'
' - +'
' - +'
' - +'累计在线时长' - +'
' - + '
0
' - +'
' - +'
' - +'
' - +'
' + +'
' + +'
' + +'数据看板' + +'' + +'
' + +'
' + +'
' + +'
' + +'
' + +'校园一卡通余额' + + '
' + + '
@ViewBag.StuSaveRecordTotalNum
' + +'
' + +'
' + +'
' + +'
' + +'校园一卡通消费金额' + + '
' + + '
@ViewBag.StuConsumptionTotalNum
' + +'
' + +'
' + +'
' + +'
' + +'图书馆借阅(未还) ' + + '
' + + '
0
' + +'
' + +'
' + +'
' + +'
' + +'已完成办公事项' + +'
' + +'
@ViewBag.FinishTaskTotalNum
' + +'
' + +'
' + +'
' + +'
' + +'智慧教育在线学习时长' + +'
' + + '
0
' + +'
' + +'
' + +'
' + +'
' + +'办公业务往来人员' + +'
' + + '
0
' + +'
' + +'
' + +'
' + +'
' + +'来往邮件数量' + +'
' + +'
@ViewBag.LanMailTotalNum
' + +'
' + +'
' + +'
' + +'
' + +'累计在线时长' + +'
' + + '
0
' + +'
' + +'
' + +'
' + +'' ; return html; }; @@ -160,11 +160,11 @@ } else { html += noHtml; } - html+='' - +'' - +'' - +'' - +'' + html+='' + +'' + +'' + +'' + +'' ; return html; }; @@ -194,37 +194,37 @@ } else { html += noHtml; } - html+= '' - + '' - + '' + html+= '' + + '' + + '' ; return html; }; //专业总览 var card4Fun = function (ind) { var html = '
' - +'
' - +'
' - +'专业总览' - +'' - +'
' - + '
' - + '
' - +'
' - +'
班级总数
' - +'
@ViewBag.ClassInfoTotalNum
' - +'
' - +'
' - +'
专业学生
' - +'
@ViewBag.StuInfoTotalNum
' - +'
' - +'
' - +'
专业教室
' - +'
@ViewBag.ClassRoomTotalNum
' - +'
' - +'
' - +'
' - +'
' + +'
' + +'
' + +'专业总览' + +'' + +'
' + + '
' + + '
' + +'
' + +'
班级总数
' + +'
@ViewBag.ClassInfoTotalNum
' + +'
' + +'
' + +'
专业学生
' + +'
@ViewBag.StuInfoTotalNum
' + +'
' + +'
' + +'
专业教室
' + +'
@ViewBag.ClassRoomTotalNum
' + +'
' + +'
' + +'
' + +'' ; return html; }; @@ -257,12 +257,12 @@ for (var j = 0; j < list[i].PFunctionList.length; j++) { html += '' + list[i].PFunctionList[j].FName+''; } - html+= ''; + html+= ''; } - html+='' - +'' - +'' - +'' + html+='' + +'' + +'' + +'' ; return html; }; @@ -309,67 +309,67 @@ + ''; } - html+='' - +'' - +'' - +'' + html+='' + +'' + +'' + +'' ; return html; }; //校园总览 var card7Fun = function (ind) { var html = '
' - +'
' - +'
' - +'校园总览' - +'' - +'
' - +'
' - +'
' - +'
' - +'' - +'专业总数' - +'
' - +'
@ViewBag.MajorTotalNum
' - +'
' - +'
' - +'
' - +'' - +'班级总数' - +'
' - +'
@ViewBag.ClassInfoTotalNum
' - +'
' - +'
' - +'
' - +'' - +'在校学生' - +'
' - +'
@ViewBag.StuInfoTotalNum
' - +'
' - +'
' - +'
' - +'' - +'在校教师' - +'
' - +'
@ViewBag.TeacherTotalNum
' - +'
' - +'
' - +'
' - +'' - +'在用教室' - +'
' - +'
@ViewBag.ClassRoomTotalNum
' - +'
' - +'
' - +'
' - +'' - +'课程总数' - +'
' - +'
@ViewBag.LessonTotalNum
' - +'
' - +'
' - +'
' - +'
' + +'
' + +'
' + +'校园总览' + +'' + +'
' + +'
' + +'
' + +'
' + +'' + +'专业总数' + +'
' + +'
@ViewBag.MajorTotalNum
' + +'
' + +'
' + +'
' + +'' + +'班级总数' + +'
' + +'
@ViewBag.ClassInfoTotalNum
' + +'
' + +'
' + +'
' + +'' + +'在校学生' + +'
' + +'
@ViewBag.StuInfoTotalNum
' + +'
' + +'
' + +'
' + +'' + +'在校教师' + +'
' + +'
@ViewBag.TeacherTotalNum
' + +'
' + +'
' + +'
' + +'' + +'在用教室' + +'
' + +'
@ViewBag.ClassRoomTotalNum
' + +'
' + +'
' + +'
' + +'' + +'课程总数' + +'
' + +'
@ViewBag.LessonTotalNum
' + +'
' + +'
' + +'
' + +'' ; return html; }; @@ -411,9 +411,9 @@ } else { html += noHtml; } - html+='' - +'' - +'' + html+='' + +'' + +'' ; return html; }; @@ -477,12 +477,12 @@ } else { html += noHtml; } - html+='' - +'' - +'' - +'' - +'' - ; + html+='' + +'' + +'' + +'' + +'' + ; return html; }; //通知公告 @@ -510,9 +510,9 @@ } else { html += noHtml; } - html+= '' - + '' - + '' + html+= '' + + '' + + '' ; return html; }; @@ -534,9 +534,9 @@ } else { html += noHtml; } - html+= '' - + '' - + '' + html+= '' + + '' + + '' ; return html; }; @@ -572,35 +572,35 @@ } else { html += noHtml; } - html+='' - +'' - +'' + html+='' + +'' + +'' ; return html; }; //办公业务流量 var card13Fun = function (ind) { var html = '
' - +'
' - +'
' - +'办公业务流量' - +'' - +'
' - + '
' - + '
' - + '
' - + '' - +'
' - +'
' - +'
' - +'
' + +'
' + +'
' + +'办公业务流量' + +'' + +'
' + + '
' + + '
' + + '
' + + '' + +'
' + +'
' + +'
' + +'' ; return html; }; @@ -728,6 +728,30 @@ }); } +