From 132e31cecc921b8a59a0eec29249b67f2d03b9b1 Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 25 May 2022 22:21:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=95=BF=E9=98=B3=E4=B8=80?= =?UTF-8?q?=E5=8D=A1=E9=80=9A=E4=BD=99=E9=A2=9D=E5=92=8C=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/MealCardRunTab/Index.js | 14 ++------------ .../Controllers/SSOSystemController.cs | 8 ++++---- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MealCardRunTab/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MealCardRunTab/Index.js index 94186c7f0..5457669d2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MealCardRunTab/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MealCardRunTab/Index.js @@ -136,18 +136,8 @@ var bootstrap = function ($, learun) { { label: '身份证号', name: 'personId', width: 150, align: "left" }, { label: '身份名称', name: 'identiName', width: 80, align: "left" }, { label: '流水类型', name: 'flowtype', width: 100, align: "left" }, - { - label: '交易金额', name: 'flowamount', width: 100, align: "left", - formatter: function (cellvalue) { - return cellvalue / 10000; - } - }, - { - label: '余额', name: 'balance', width: 100, align: "left", - formatter: function (cellvalue) { - return cellvalue / 10000; - } - }, + { label: '交易金额', name: 'flowamount', width: 100, align: "left" }, + { label: '余额', name: 'balance', width: 100, align: "left" }, { label: '卡号', name: 'cardNo', width: 100, align: "left" }, { label: '中心时间', name: 'centralTm', width: 150, align: "left" }, { label: '中心序号', name: 'centralNo', width: 100, align: "left" }, 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 0f9963165..6f731902e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs @@ -1221,13 +1221,13 @@ namespace Learun.Application.Web.Controllers var mealCardRunTabList = mealCardRunTabIBLL.GetListByAccount(card).OrderByDescending(x => x.centralTm); if (mealCardRunTabList.Any()) { - ViewBag.StuSaveRecordTotalNum = mealCardRunTabList.FirstOrDefault().balance / 10000; + ViewBag.StuSaveRecordTotalNum = mealCardRunTabList.FirstOrDefault().balance; } var mealCardRunTabListJY = mealCardRunTabIBLL.GetListByAccount(card); if (mealCardRunTabListJY.Any()) { - ViewBag.StuConsumptionTotalNum = Math.Abs(mealCardRunTabListJY.Select(x => x.flowamount.ToDecimal() / 10000).Sum()); + ViewBag.StuConsumptionTotalNum = Math.Abs(mealCardRunTabListJY.Select(x => x.flowamount).Sum()); } } //常用链接 @@ -1560,14 +1560,14 @@ namespace Learun.Application.Web.Controllers var mealCardRunTabList = mealCardRunTabIBLL.GetListByAccount(card).OrderByDescending(x => x.centralTm); if (mealCardRunTabList.Any()) { - ViewBag.StuSaveRecordTotalNum = mealCardRunTabList.FirstOrDefault().balance / 10000; + ViewBag.StuSaveRecordTotalNum = mealCardRunTabList.FirstOrDefault().balance; } //红湖付款码余额 ViewBag.StuConsumptionTotalNum = 0; var mealCardRunTabListJY = mealCardRunTabIBLL.GetListByAccount(userInfo.IdentityCardNo); if (mealCardRunTabListJY.Any()) { - ViewBag.StuConsumptionTotalNum = Math.Abs(mealCardRunTabListJY.Select(x => x.flowamount.ToDecimal() / 10000).Sum()); + ViewBag.StuConsumptionTotalNum = Math.Abs(mealCardRunTabListJY.Select(x => x.flowamount).Sum()); } //常用链接 var userfunctionlist = perm_FunctionIBLL.GetListByUserId(userInfo.userId);