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 f4d49d1f0..09895abeb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs @@ -18,6 +18,7 @@ using Learun.Cache.Factory; using Newtonsoft.Json; using Learun.Application.TwoDevelopment.LR_Desktop; using Learun.Application.TwoDevelopment.PersonnelManagement; +using DocumentFormat.OpenXml.Spreadsheet; namespace Learun.Application.Web.Controllers { @@ -56,6 +57,8 @@ namespace Learun.Application.Web.Controllers private TeachSwitchIBLL teachSwitchIBLL = new TeachSwitchBLL(); private StuSaverecordIBLL stuSaverecordIBLL = new StuSaverecordBLL(); private StuConsumptionIBLL stuConsumptionIBLL = new StuConsumptionBLL(); + private YKTStateMentIBLL yktStateMentIbll = new YKTStateMentBLL(); + private LoginStatisticsIBLL loginStatisticsIBLL = new LoginStatisticsBLL(); #region 统一身份认证2.0 /// @@ -401,12 +404,12 @@ namespace Learun.Application.Web.Controllers 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(); - } + ViewBag.StuConsumptionTotalNum = GetConsumption(userInfo); + //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,12 +1404,12 @@ namespace Learun.Application.Web.Controllers 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(); - } + ViewBag.StuConsumptionTotalNum = GetConsumption(userInfo); + //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() @@ -1424,10 +1427,56 @@ namespace Learun.Application.Web.Controllers ViewBag.FunctionList = ff; ViewBag.FunctionListStr = JsonConvert.SerializeObject(ViewBag.FunctionList); + ViewBag.LoginCount=GetLoginCount(userInfo); return View(); } + + private decimal GetConsumption(Util.UserInfo userInfo) + { + try + { + //var userInfo = LoginUserInfo.Get(); + Pagination paginationobj=new Pagination() { page=1,rows=10000}; + var um = new { EmpNo = userInfo.account, EmpName = userInfo.realName }; + var umj=um.ToJson(); + var data = new List(); + if (userInfo.Description == "学生") + { + data= yktStateMentIbll.GetPageList(paginationobj, umj).ToList(); + } + else + { + data = yktStateMentIbll.GetTeacherPageList(paginationobj, umj).ToList() ; + + } + return data.Select(x => x.Moneys).DefaultIfEmpty().Sum(); + } + catch (Exception) + { + return 0.0M; + } + + } + + private int GetLoginCount(Util.UserInfo userInfo) + { + try + { + Pagination paginationobj = new Pagination() { page = 1, rows = 1000 }; + var um = new { Account = userInfo.account }; + var umj = um.ToJson(); + var data = loginStatisticsIBLL.GetList(paginationobj, umj).ToList(); + + return data.Select(x => x.sumnum??0).DefaultIfEmpty().Sum(); + } + catch (Exception) + { + return 0; + } + } + /// /// 网上办事大厅拖拽版-效率优先模式 /// @@ -1731,12 +1780,12 @@ namespace Learun.Application.Web.Controllers 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(); - } + ViewBag.StuConsumptionTotalNum = GetConsumption(userInfo); + //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() @@ -1754,6 +1803,7 @@ namespace Learun.Application.Web.Controllers ViewBag.FunctionList = ff; ViewBag.FunctionListStr = JsonConvert.SerializeObject(ViewBag.FunctionList); + ViewBag.LoginCount = GetLoginCount(userInfo); return View(); } @@ -1948,6 +1998,7 @@ namespace Learun.Application.Web.Controllers } ViewBag.SearchModule = searchmodulelist; + ViewBag.LoginCount = GetLoginCount(userInfo); return View(); } 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 02d2f9338..46649368c 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 @@ -43,9 +43,9 @@ +'
' +'
' +'
' - +'图书馆借阅(未还) ' + +'待办事项 ' + '
' - + '
0
' + + '
@ViewBag.TaskTotalNum
' +'
' +'
' +'
' @@ -78,9 +78,9 @@ +'
' +'
' +'
' - +'累计在线时长' + +'累计登录次数' +'
' - + '
0
' + + '
@ViewBag.LoginCount
' +'
' +'
' +'
' @@ -308,7 +308,7 @@ html += '' + ''; } - + html+='' +'' +'' diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml index 1da5c8c0d..68bb137ee 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml @@ -44,9 +44,9 @@ +'
' +'
' +'
' - +'图书馆借阅(未还) ' + +'待办事项 ' + '
' - + '
0
' + + '
@ViewBag.TaskTotalNum
' +'
' +'
' +'
' @@ -79,9 +79,9 @@ +'
' +'
' +'
' - +'累计在线时长' + +'累计登录次数' +'
' - + '
0
' + + '
@ViewBag.LoginCount
' +'
' +'
' +'
' @@ -733,6 +733,7 @@ .desktopSetBox b { font-weight: normal; } + .searchLi > a { width: 100%; } @@ -740,7 +741,7 @@ .searchLi > a > * { display: inline-block; vertical-align: middle; - } + }
@@ -766,23 +767,23 @@
@*
- 服务角色 -
    -
  • 全部
  • -
  • 校领导
  • -
  • 游客
  • -
  • 教师
  • -
  • 学生
  • -
-
-
- 服务角色 -
    -
  • 全部
  • -
  • 最新应用
  • -
  • 常用链接
  • -
-
*@ + 服务角色 +
    +
  • 全部
  • +
  • 校领导
  • +
  • 游客
  • +
  • 教师
  • +
  • 学生
  • +
+
+
+ 服务角色 +
    +
  • 全部
  • +
  • 最新应用
  • +
  • 常用链接
  • +
+
*@
@{ var searchModule = ViewBag.SearchModule as List; @@ -963,10 +964,10 @@
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentEntity.cs index 235d63e9f..8b652582f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentEntity.cs @@ -26,6 +26,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 消费金额 ///
public string MONEY { get; set; } + + public decimal Moneys + { + get + { + if (decimal.TryParse(MONEY, out decimal result)) + { + + return result; + } + return 0; + } + } /// /// 余额 ///