Browse Source

发运时间增加强制校验,比对任务按创建日期逆序排序

master
zhouhongjun 1 year ago
parent
commit
9238523642
  1. 3
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/compare/compare.js
  2. 6
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Tasks/TaskDapperRepository.cs

3
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/compare/compare.js

@ -12,7 +12,7 @@ const defaultCompareSchema = {
input: "datetime", input: "datetime",
rules: [ rules: [
{ {
required: false, required: true
}, },
], ],
}, },
@ -176,6 +176,7 @@ export default function (businessType, type) {
}, },
sorting: { sorting: {
hidden: true, hidden: true,
default: "createdAt",
}, },
}, },
}, },

6
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.Data;
using System.Linq; using System.Linq;
using System.Text.Json; using System.Text.Json;
@ -28,7 +28,7 @@ namespace Win.Sfs.SettleAccount.Repository
public virtual async Task<List<Job>> GetTaskJobsAsync(Job p_task) public virtual async Task<List<Job>> GetTaskJobsAsync(Job p_task)
{ {
string str = string.Empty; string str = string.Empty;
str = "SELECT\n" + str = "select * from (SELECT\n" +
" b.Id,\n" + " b.Id,\n" +
" isnull( a.StateId, 0 ) StateId,\n" + " isnull( a.StateId, 0 ) StateId,\n" +
" b.Type,\n" + " b.Type,\n" +
@ -79,7 +79,7 @@ namespace Win.Sfs.SettleAccount.Repository
{ {
str += string.Format(" and b.type='{0}'", p_task.Type); 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 _db = await GetDbConnectionAsync().ConfigureAwait(false);
var _query = await _db.QueryAsync<Job>(str).ConfigureAwait(false); var _query = await _db.QueryAsync<Job>(str).ConfigureAwait(false);
var _lst = _query.ToList(); var _lst = _query.ToList();

Loading…
Cancel
Save