From 01ac9304cbef0e89d6d14fd9b4479b5dbcd0e05f Mon Sep 17 00:00:00 2001
From: zhaoxinyu <89237069@qq.com>
Date: Thu, 25 Jan 2024 15:47:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/SettleAccount.Application/Bases/NOT_SA_SERVICE.cs | 8 +-------
 .../Entities/BQ/BBAC_NOT_SA_SERVICE.cs                    | 5 +----
 .../Entities/BQ/Managers/PUB_NOT_SA_MNG.cs                | 2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/NOT_SA_SERVICE.cs
index 9a4164c0..d8b323ae 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/NOT_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/NOT_SA_SERVICE.cs
@@ -60,8 +60,7 @@ namespace Win.Sfs.SettleAccount.Bases
             if (ls.Count > 0)
             {
                 var entiy = input.Filters.Where(p => p.Column == "businessType").FirstOrDefault();
-                var value = entiy.Value;
-                //if (value == "JisBBAC")
+                var value = entiy.Value;               
                 //{
                 //    input.Filters.Add(new Shared.Filter.FilterCondition() { Column = "businessType", Action = EnumFilterAction.Equal, Logic = EnumFilterLogic.Or, Value = "MaiDanJianBBAC" });
                 //}
@@ -77,8 +76,6 @@ namespace Win.Sfs.SettleAccount.Bases
             var entitys = await _detailRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount).ConfigureAwait(false);
             var totalCount = await _detailRepository.GetCountByFilterAsync(input.Filters).ConfigureAwait(false);
             var dtos = ObjectMapper.Map<List<TEntityDetail>, List<TEntityDetailDto>>(entitys);
-
-           
             return new PagedResultDto<TEntityDetailDto>(totalCount, dtos);
         }
 
@@ -143,10 +140,7 @@ namespace Win.Sfs.SettleAccount.Bases
             IExporter _excel = new ExcelExporter();
             Stopwatch sw = Stopwatch.StartNew();
             var entities = await _detailRepository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, 0, true).ConfigureAwait(false);
-           
             var dtoDetails = ObjectMapper.Map<List<TEntityDetail>, List<TEntityDetailExportDto>>(entities);
-          
-
             var classDisplayName = typeof(TEntityDetailExportDto).GetCustomAttribute<DisplayAttribute>()?.Name ?? typeof(TEntityDetailExportDto).Name;
             string _fileName = $"{classDisplayName}_{Guid.NewGuid().ToString()}.xlsx";
             byte[] result = null;
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs
index 8dcb9138..9bc19b0c 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs
@@ -140,17 +140,14 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         [HttpPost]
         public override async Task<IActionResult> GenerateSettlementOrder(BBAC_NOT_SA_DETAIL_REQ_DTO input)
         {
-
             //_detailRepository.DbContext.Set<BBAC_NOT_SA_DETAIL>().Where(p=>p.)
             var flag= await _bbacNotMng.IsCompleted().ConfigureAwait(false);
-
             if (flag == false)
             {
-                throw new UserFriendlyException("任务生成中请等待", "400");
+                throw new UserFriendlyException("任务生成中请等待...", "400");
             }
             else
             {
-
                 var filters = JsonSerializer.Serialize(input.Filters);
                 List<CustomCondition> customConditionList = new List<CustomCondition>();
                 customConditionList.Add(new CustomCondition() { Name = "condition", Value = filters });
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs
index e8be0fc0..1137a199 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs
@@ -61,7 +61,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
         }
         public virtual async Task<List<string>> GenerateSettlementOrder(List<PUB_NOT_SA_DETAIL> p_list)
         {
-            if (p_list.Count > 0)
+            if (p_list.Count == 0)
             {
                 throw new UserFriendlyException("查询无数据不能生成可结算单","400");
             }