From 8917545e90e306709cc7dc91e2f526278453acb6 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Wed, 30 Jun 2021 16:56:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8A=E6=8A=A5=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/LR_Desktop/Views/QualityReport/Index.js | 4 +++- .../Areas/LR_Desktop/Views/QualityReport/IndexReport.js | 9 +++++++-- .../QualityReportMain/QualityReportMainService.cs | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js index 57ed09dd6..a61959e68 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js @@ -165,7 +165,9 @@ var bootstrap = function ($, learun) { label: "公式计算结果", name: "Result", width: 150, align: "left" }, { - label: "填报时间", name: "ReportTime", width: 150, align: "left" + label: "填报时间", name: "ReportTime", width: 150, align: "left", formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM'); + } }, { label: "状态", name: "Status", width: 150, align: "left", diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/IndexReport.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/IndexReport.js index 606ea66c8..a828edf9f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/IndexReport.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/IndexReport.js @@ -157,7 +157,10 @@ var bootstrap = function ($, learun) { label: "公式计算结果", name: "Result", width: 150, align: "left" }, { - label: "填报时间", name: "ReportTime", width: 150, align: "left" + label: "填报时间", name: "ReportTime", width: 150, align: "left", + formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM'); + } }, { label: "状态", name: "Status", width: 150, align: "left", @@ -173,7 +176,9 @@ var bootstrap = function ($, learun) { }, ], mainId: 'Id', - isPage: true + isPage: true, + sidx: 'ReportTime', + sord: 'DESC', }); page.search(); }, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportMain/QualityReportMainService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportMain/QualityReportMainService.cs index 546f6b6d8..520b5ae25 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportMain/QualityReportMainService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportMain/QualityReportMainService.cs @@ -4,6 +4,7 @@ using Learun.Util; using System; using System.Collections.Generic; using System.Data; +using System.Linq; using System.Text; namespace Learun.Application.TwoDevelopment.LR_Desktop @@ -84,7 +85,7 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop strSql.Append($" AND a.FillInFromId='{queryParam["FillInFromId"].ToString()}' "); } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp).OrderByDescending(x => x.ReportTime); } catch (Exception ex) {