From bdd8c758e7871fa7bea588abf98dd7e473399c3f Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Mon, 13 Nov 2023 11:28:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=8C=BA=E9=97=B4=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Prices/PriceListAppService.cs | 16 ++++++++-------- .../Entities/Prices/PriceListAppServiceBJ.cs | 16 ++++++++-------- .../Entities/Prices/PriceListAppServiceYinDu.cs | 16 ++++++++-------- .../Report/MaiDanBBACSaSeCompareExportService.cs | 1 + 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs index 5e1971f6..c880296b 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs @@ -280,10 +280,10 @@ namespace Win.Sfs.SettleAccount.Entities.Prices .ToList(); var existPrice = existPriceList.Find(t => (entity.BeginTime >= t.BeginTime && entity.BeginTime < t.EndTime) || (t.BeginTime >= entity.BeginTime && t.BeginTime < entity.EndTime)); - if (existPrice != null) - { - throw new UserFriendlyException($"无法启用！此记录启用时间区间与区间【{existPrice.BeginTime:yyyy-MM-dd}至{existPrice.EndTime:yyyy-MM-dd}】存在交集", "400"); - } + //if (existPrice != null) + //{ + // throw new UserFriendlyException($"无法启用！此记录启用时间区间与区间【{existPrice.BeginTime:yyyy-MM-dd}至{existPrice.EndTime:yyyy-MM-dd}】存在交集", "400"); + //} } await _settleAccountDbContext.SaveChangesAsync().ConfigureAwait(false); var dto = ObjectMapper.Map(entity); @@ -310,10 +310,10 @@ namespace Win.Sfs.SettleAccount.Entities.Prices .ToList(); var existPrice = existPriceList.Find(t => (entity.BeginTime >= t.BeginTime && entity.BeginTime < t.EndTime) || (t.BeginTime >= entity.BeginTime && t.BeginTime < entity.EndTime)); - if (existPrice != null) - { - throw new UserFriendlyException($"无法启用！此记录启用时间区间与区间【{existPrice.BeginTime:yyyy-MM-dd}至{existPrice.EndTime:yyyy-MM-dd}】存在交集", "400"); - } + //if (existPrice != null) + //{ + // throw new UserFriendlyException($"无法启用！此记录启用时间区间与区间【{existPrice.BeginTime:yyyy-MM-dd}至{existPrice.EndTime:yyyy-MM-dd}】存在交集", "400"); + //} } plist.Add(entity); } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs index b4754c75..8200506a 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs @@ -248,10 +248,10 @@ namespace Win.Sfs.SettleAccount.Entities.Prices .ToList(); var existPriceBj = existPriceBjList.Find(t => (entity.BeginDate >= t.BeginDate && entity.BeginDate < t.EndDate) || (t.BeginDate >= entity.BeginDate && t.BeginDate < entity.EndDate)); - if (existPriceBj != null) - { - throw new UserFriendlyException($"无法启用！此记录启用时间区间与区间【{existPriceBj.BeginDate:yyyy-MM-dd}至{existPriceBj.EndDate:yyyy-MM-dd}】存在交集", "400"); - } + //if (existPriceBj != null) + //{ + // throw new UserFriendlyException($"无法启用！此记录启用时间区间与区间【{existPriceBj.BeginDate:yyyy-MM-dd}至{existPriceBj.EndDate:yyyy-MM-dd}】存在交集", "400"); + //} } await _settleAccountDbContext.SaveChangesAsync().ConfigureAwait(false); var dto = ObjectMapper.Map(entity); @@ -279,10 +279,10 @@ namespace Win.Sfs.SettleAccount.Entities.Prices .ToList(); var existPrice = existPriceList.Find(t => (entity.BeginDate >= t.BeginDate && entity.BeginDate < t.EndDate) || (t.BeginDate>= entity.BeginDate && t.BeginDate < entity.EndDate)); - if (existPrice != null) - { - throw new UserFriendlyException($"无法启用！此记录启用时间区间与区间【{existPrice.BeginDate:yyyy-MM-dd}至{existPrice.EndDate:yyyy-MM-dd}】存在交集", "400"); - } + //if (existPrice != null) + //{ + // throw new UserFriendlyException($"无法启用！此记录启用时间区间与区间【{existPrice.BeginDate:yyyy-MM-dd}至{existPrice.EndDate:yyyy-MM-dd}】存在交集", "400"); + //} } plist.Add(entity); } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceYinDu.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceYinDu.cs index e50edd57..0be3a72e 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceYinDu.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceYinDu.cs @@ -242,10 +242,10 @@ namespace Win.Sfs.SettleAccount.Entities.Prices .ToList(); var existPrice = existPrices.Find(t => (entity.BeginDate >= t.BeginDate && entity.BeginDate < t.EndDate) || (t.BeginDate >= entity.BeginDate && t.BeginDate < entity.EndDate)); - if (existPrice != null) - { - throw new UserFriendlyException($"无法启用！此记录启用时间区间与区间【{existPrice.BeginDate:yyyy-MM-dd}至{existPrice.EndDate:yyyy-MM-dd}】存在交集", "400"); - } + //if (existPrice != null) + //{ + // throw new UserFriendlyException($"无法启用！此记录启用时间区间与区间【{existPrice.BeginDate:yyyy-MM-dd}至{existPrice.EndDate:yyyy-MM-dd}】存在交集", "400"); + //} } await _settleAccountDbContext.SaveChangesAsync().ConfigureAwait(false); var dto = ObjectMapper.Map(entity); @@ -273,10 +273,10 @@ namespace Win.Sfs.SettleAccount.Entities.Prices .ToList(); var existPrice = existPriceList.Find(t => (entity.BeginDate >= t.BeginDate && entity.EndDate < t.EndDate) || (t.BeginDate >= entity.BeginDate && t.BeginDate < entity.EndDate)); - if (existPrice != null) - { - throw new UserFriendlyException($"无法启用！此记录启用时间区间与区间【{existPrice.BeginDate:yyyy-MM-dd}至{existPrice.EndDate:yyyy-MM-dd}】存在交集", "400"); - } + //if (existPrice != null) + //{ + // throw new UserFriendlyException($"无法启用！此记录启用时间区间与区间【{existPrice.BeginDate:yyyy-MM-dd}至{existPrice.EndDate:yyyy-MM-dd}】存在交集", "400"); + //} } plist.Add(entity); } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs index 7f7ed6af..fa8e451b 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs @@ -133,6 +133,7 @@ namespace SettleAccount.Job.Services.Report foreach (var item in pubSaEntityList) { item.StateOther = "2"; + item.State = "2"; } _settleAccountDbContext.SaveChanges();