From 92385236420d3b7a60ddec7fa988547078ae1486 Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Fri, 24 Nov 2023 09:24:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=BF=90=E6=97=B6=E9=97=B4=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=BC=BA=E5=88=B6=E6=A0=A1=E9=AA=8C=EF=BC=8C=E6=AF=94?=
 =?UTF-8?q?=E5=AF=B9=E4=BB=BB=E5=8A=A1=E6=8C=89=E5=88=9B=E5=BB=BA=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E9=80=86=E5=BA=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/models/compare/compare.js                       | 3 ++-
 .../SettleAccountJob/Tasks/TaskDapperRepository.cs          | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/compare/compare.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/compare/compare.js
index 7bc73254..d2375943 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/compare/compare.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/compare/compare.js
@@ -12,7 +12,7 @@ const defaultCompareSchema = {
       input: "datetime",
       rules: [
         {
-          required: false,
+          required: true
         },
       ],
     },
@@ -176,6 +176,7 @@ export default function (businessType, type) {
           },
           sorting: {
             hidden: true,
+            default: "createdAt",
           },
         },
       },
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Tasks/TaskDapperRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Tasks/TaskDapperRepository.cs
index 160d7afb..380a29d2 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Tasks/TaskDapperRepository.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Tasks/TaskDapperRepository.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Data;
 using System.Linq;
 using System.Text.Json;
@@ -28,7 +28,7 @@ namespace Win.Sfs.SettleAccount.Repository
         public virtual async Task<List<Job>> GetTaskJobsAsync(Job p_task)
         {
             string str = string.Empty;
-            str = "SELECT\n" +
+            str = "select * from (SELECT\n" +
      "	b.Id,\n" +
      "	isnull( a.StateId, 0 ) StateId,\n" +
      "	b.Type,\n" +
@@ -79,7 +79,7 @@ namespace Win.Sfs.SettleAccount.Repository
             {
                 str += string.Format(" and b.type='{0}'", p_task.Type);
             }
-            str += " order by a.CreatedAt desc ";
+            str += ") c order by c.CreatedAt desc ";
             var _db = await GetDbConnectionAsync().ConfigureAwait(false);
             var _query = await _db.QueryAsync<Job>(str).ConfigureAwait(false);
             var _lst = _query.ToList();