数据上报调整

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",

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();
         },

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<QualityReportMainEntity>(strSql.ToString(), dp);
+                return this.BaseRepository("CollegeMIS").FindList<QualityReportMainEntity>(strSql.ToString(), dp).OrderByDescending(x => x.ReportTime);
             }
             catch (Exception ex)
             {