Commit 7189ca0c by 陶然

优化

parent 47850bbc
......@@ -93,7 +93,7 @@ namespace Njhg.Third.Semir.Entities
if (thirdDetails.IsNullOrEmpty()) return false;
var reports = conn.SelectByIds<Report>(thirdDetails.ConvertAll(o => o.ReportKvid));
if (reports.IsNullOrEmpty()) return false;
if (reports.Exists(o => o.Status < (int)ReportStatusType.ReportIssue)) return false;
if (reports.Exists(o => o.Status <= (int)ReportStatusType.ReportIssue)) return false;
var result_info = new ReportResultInfo();
result_info.DOC_NO = third.SerialNumber;
......
......@@ -225,11 +225,11 @@ namespace Njhg.Third.Semir.Extensions
var conn = KiviiContext.GetOpenedDbConnection<Report>();
if (thirds.IsNullOrEmpty())
{
thirds = conn.Select<ThirdReportOrder>(o => o.IsAccepted == false & o.IsOffseted == false & o.IsUploaded == false & o.ThirdType == typeof(SemirOrder).FullName);
thirds = conn.Select<ThirdReportOrder>(o => o.IsAccepted == false && o.IsOffseted == false && o.IsUploaded == false && o.ThirdType == typeof(SemirOrder).FullName);
}
if (thirds.IsNullOrEmpty()) return;
var queryReports = conn.From<Report>();
queryReports.Where(o => Sql.In(o.BizId, thirds.ConvertAll(p => p.SerialNumber)) & o.Status >= (int)ReportStatusType.ReportIssue).OrderBy(o => o.ReportId);
queryReports.Where(o => Sql.In(o.BizId, thirds.ConvertAll(p => p.SerialNumber))).OrderBy(o => o.ReportId);
var allReports = conn.Select(queryReports);
if (allReports.IsNullOrEmpty()) return;
......
......@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.4.2024.2050")]
[assembly: AssemblyFileVersion("5.4.2024.2050")]
[assembly: AssemblyVersion("5.4.2024.2210")]
[assembly: AssemblyFileVersion("5.4.2024.2210")]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment