From 9e55866f54fec06627bc1b02519549418e05cd33 Mon Sep 17 00:00:00 2001 From: “wangming” <“wangming@antissoft.com”> Date: Sun, 14 Sep 2025 01:12:52 +0800 Subject: [PATCH] 优化代码格式，合并多行表达式，提升代码可读性和整洁性。 --- netcore/src/Modularity/Extend/NCC.Extend/LqLssjService.cs | 10 ++-------- netcore/src/Modularity/Extend/NCC.Extend/LqMdMdlbjhsxxService.cs | 124 ++++++++++++++++++++++++---------------------------------------------------------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend/LqMdXdbhsjService.cs | 30 +++++++----------------------- 3 files changed, 33 insertions(+), 131 deletions(-) diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqLssjService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqLssjService.cs index 17e10c1..e3861f0 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqLssjService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqLssjService.cs @@ -186,19 +186,13 @@ namespace NCC.Extend.LqLssj var isExist = paramList.Find(p => p.field == item); if (isExist != null) { - excelconfig.ColumnModel.Add( - new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value } - ); + excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value }); } } var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName; ExcelExportHelper.Export(exportData, excelconfig, addPath); var fileName = _userManager.UserId + "|" + addPath + "|xls"; - var output = new - { - name = excelconfig.FileName, - url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC"), - }; + var output = new { name = excelconfig.FileName, url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") }; return output; } diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqMdMdlbjhsxxService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqMdMdlbjhsxxService.cs index b3b7ce3..7ec58eb 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqMdMdlbjhsxxService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqMdMdlbjhsxxService.cs @@ -92,60 +92,22 @@ namespace NCC.Extend.LqMdMdlbjhsxx .WhereIF(!string.IsNullOrEmpty(input.md), p => p.Md.Equals(input.md)) .WhereIF(!string.IsNullOrEmpty(input.dxmbls), p => p.Dxmbls.Equals(input.dxmbls)) .WhereIF(!string.IsNullOrEmpty(input.dxmb), p => p.Dxmb.Equals(input.dxmb)) - .WhereIF( - queryKssj != null, - p => p.Kssj >= new DateTime(startKssj.ToDate().Year, startKssj.ToDate().Month, startKssj.ToDate().Day, 0, 0, 0) - ) - .WhereIF( - queryKssj != null, - p => p.Kssj <= new DateTime(endKssj.ToDate().Year, endKssj.ToDate().Month, endKssj.ToDate().Day, 23, 59, 59) - ) - .WhereIF( - queryJssj != null, - p => p.Jssj >= new DateTime(startJssj.ToDate().Year, startJssj.ToDate().Month, startJssj.ToDate().Day, 0, 0, 0) - ) - .WhereIF( - queryJssj != null, - p => p.Jssj <= new DateTime(endJssj.ToDate().Year, endJssj.ToDate().Month, endJssj.ToDate().Day, 23, 59, 59) - ) + .WhereIF(queryKssj != null, p => p.Kssj >= new DateTime(startKssj.ToDate().Year, startKssj.ToDate().Month, startKssj.ToDate().Day, 0, 0, 0)) + .WhereIF(queryKssj != null, p => p.Kssj <= new DateTime(endKssj.ToDate().Year, endKssj.ToDate().Month, endKssj.ToDate().Day, 23, 59, 59)) + .WhereIF(queryJssj != null, p => p.Jssj >= new DateTime(startJssj.ToDate().Year, startJssj.ToDate().Month, startJssj.ToDate().Day, 0, 0, 0)) + .WhereIF(queryJssj != null, p => p.Jssj <= new DateTime(endJssj.ToDate().Year, endJssj.ToDate().Month, endJssj.ToDate().Day, 23, 59, 59)) .WhereIF(!string.IsNullOrEmpty(input.syb), p => p.Syb.Equals(input.syb)) - .WhereIF( - querySybssksrq != null, - p => - p.Sybssksrq >= new DateTime(startSybssksrq.ToDate().Year, startSybssksrq.ToDate().Month, startSybssksrq.ToDate().Day, 0, 0, 0) - ) - .WhereIF( - querySybssksrq != null, - p => p.Sybssksrq <= new DateTime(endSybssksrq.ToDate().Year, endSybssksrq.ToDate().Month, endSybssksrq.ToDate().Day, 23, 59, 59) - ) - .WhereIF( - querySybsszzrq != null, - p => - p.Sybsszzrq >= new DateTime(startSybsszzrq.ToDate().Year, startSybsszzrq.ToDate().Month, startSybsszzrq.ToDate().Day, 0, 0, 0) - ) - .WhereIF( - querySybsszzrq != null, - p => p.Sybsszzrq <= new DateTime(endSybsszzrq.ToDate().Year, endSybsszzrq.ToDate().Month, endSybsszzrq.ToDate().Day, 23, 59, 59) - ) + .WhereIF(querySybssksrq != null, p => p.Sybssksrq >= new DateTime(startSybssksrq.ToDate().Year, startSybssksrq.ToDate().Month, startSybssksrq.ToDate().Day, 0, 0, 0)) + .WhereIF(querySybssksrq != null, p => p.Sybssksrq <= new DateTime(endSybssksrq.ToDate().Year, endSybssksrq.ToDate().Month, endSybssksrq.ToDate().Day, 23, 59, 59)) + .WhereIF(querySybsszzrq != null, p => p.Sybsszzrq >= new DateTime(startSybsszzrq.ToDate().Year, startSybsszzrq.ToDate().Month, startSybsszzrq.ToDate().Day, 0, 0, 0)) + .WhereIF(querySybsszzrq != null, p => p.Sybsszzrq <= new DateTime(endSybsszzrq.ToDate().Year, endSybsszzrq.ToDate().Month, endSybsszzrq.ToDate().Day, 23, 59, 59)) .WhereIF(!string.IsNullOrEmpty(input.mdlxLd), p => p.MdlxLd.Equals(input.mdlxLd)) .WhereIF(!string.IsNullOrEmpty(input.mdzt), p => p.Mdzt.Equals(input.mdzt)) .WhereIF(!string.IsNullOrEmpty(input.mdlxXd), p => p.MdlxXd.Equals(input.mdlxXd)) - .WhereIF( - queryXdssksrq != null, - p => p.Xdssksrq >= new DateTime(startXdssksrq.ToDate().Year, startXdssksrq.ToDate().Month, startXdssksrq.ToDate().Day, 0, 0, 0) - ) - .WhereIF( - queryXdssksrq != null, - p => p.Xdssksrq <= new DateTime(endXdssksrq.ToDate().Year, endXdssksrq.ToDate().Month, endXdssksrq.ToDate().Day, 23, 59, 59) - ) - .WhereIF( - queryXdsszzrq != null, - p => p.Xdsszzrq >= new DateTime(startXdsszzrq.ToDate().Year, startXdsszzrq.ToDate().Month, startXdsszzrq.ToDate().Day, 0, 0, 0) - ) - .WhereIF( - queryXdsszzrq != null, - p => p.Xdsszzrq <= new DateTime(endXdsszzrq.ToDate().Year, endXdsszzrq.ToDate().Month, endXdsszzrq.ToDate().Day, 23, 59, 59) - ) + .WhereIF(queryXdssksrq != null, p => p.Xdssksrq >= new DateTime(startXdssksrq.ToDate().Year, startXdssksrq.ToDate().Month, startXdssksrq.ToDate().Day, 0, 0, 0)) + .WhereIF(queryXdssksrq != null, p => p.Xdssksrq <= new DateTime(endXdssksrq.ToDate().Year, endXdssksrq.ToDate().Month, endXdssksrq.ToDate().Day, 23, 59, 59)) + .WhereIF(queryXdsszzrq != null, p => p.Xdsszzrq >= new DateTime(startXdsszzrq.ToDate().Year, startXdsszzrq.ToDate().Month, startXdsszzrq.ToDate().Day, 0, 0, 0)) + .WhereIF(queryXdsszzrq != null, p => p.Xdsszzrq <= new DateTime(endXdsszzrq.ToDate().Year, endXdsszzrq.ToDate().Month, endXdsszzrq.ToDate().Day, 23, 59, 59)) .WhereIF(!string.IsNullOrEmpty(input.smxgd), p => p.Smxgd.Contains(input.smxgd)) .Select(it => new LqMdMdlbjhsxxListOutput { @@ -221,60 +183,22 @@ namespace NCC.Extend.LqMdMdlbjhsxx .WhereIF(!string.IsNullOrEmpty(input.md), p => p.Md.Equals(input.md)) .WhereIF(!string.IsNullOrEmpty(input.dxmbls), p => p.Dxmbls.Equals(input.dxmbls)) .WhereIF(!string.IsNullOrEmpty(input.dxmb), p => p.Dxmb.Equals(input.dxmb)) - .WhereIF( - queryKssj != null, - p => p.Kssj >= new DateTime(startKssj.ToDate().Year, startKssj.ToDate().Month, startKssj.ToDate().Day, 0, 0, 0) - ) - .WhereIF( - queryKssj != null, - p => p.Kssj <= new DateTime(endKssj.ToDate().Year, endKssj.ToDate().Month, endKssj.ToDate().Day, 23, 59, 59) - ) - .WhereIF( - queryJssj != null, - p => p.Jssj >= new DateTime(startJssj.ToDate().Year, startJssj.ToDate().Month, startJssj.ToDate().Day, 0, 0, 0) - ) - .WhereIF( - queryJssj != null, - p => p.Jssj <= new DateTime(endJssj.ToDate().Year, endJssj.ToDate().Month, endJssj.ToDate().Day, 23, 59, 59) - ) + .WhereIF(queryKssj != null, p => p.Kssj >= new DateTime(startKssj.ToDate().Year, startKssj.ToDate().Month, startKssj.ToDate().Day, 0, 0, 0)) + .WhereIF(queryKssj != null, p => p.Kssj <= new DateTime(endKssj.ToDate().Year, endKssj.ToDate().Month, endKssj.ToDate().Day, 23, 59, 59)) + .WhereIF(queryJssj != null, p => p.Jssj >= new DateTime(startJssj.ToDate().Year, startJssj.ToDate().Month, startJssj.ToDate().Day, 0, 0, 0)) + .WhereIF(queryJssj != null, p => p.Jssj <= new DateTime(endJssj.ToDate().Year, endJssj.ToDate().Month, endJssj.ToDate().Day, 23, 59, 59)) .WhereIF(!string.IsNullOrEmpty(input.syb), p => p.Syb.Equals(input.syb)) - .WhereIF( - querySybssksrq != null, - p => - p.Sybssksrq >= new DateTime(startSybssksrq.ToDate().Year, startSybssksrq.ToDate().Month, startSybssksrq.ToDate().Day, 0, 0, 0) - ) - .WhereIF( - querySybssksrq != null, - p => p.Sybssksrq <= new DateTime(endSybssksrq.ToDate().Year, endSybssksrq.ToDate().Month, endSybssksrq.ToDate().Day, 23, 59, 59) - ) - .WhereIF( - querySybsszzrq != null, - p => - p.Sybsszzrq >= new DateTime(startSybsszzrq.ToDate().Year, startSybsszzrq.ToDate().Month, startSybsszzrq.ToDate().Day, 0, 0, 0) - ) - .WhereIF( - querySybsszzrq != null, - p => p.Sybsszzrq <= new DateTime(endSybsszzrq.ToDate().Year, endSybsszzrq.ToDate().Month, endSybsszzrq.ToDate().Day, 23, 59, 59) - ) + .WhereIF(querySybssksrq != null, p => p.Sybssksrq >= new DateTime(startSybssksrq.ToDate().Year, startSybssksrq.ToDate().Month, startSybssksrq.ToDate().Day, 0, 0, 0)) + .WhereIF(querySybssksrq != null, p => p.Sybssksrq <= new DateTime(endSybssksrq.ToDate().Year, endSybssksrq.ToDate().Month, endSybssksrq.ToDate().Day, 23, 59, 59)) + .WhereIF(querySybsszzrq != null, p => p.Sybsszzrq >= new DateTime(startSybsszzrq.ToDate().Year, startSybsszzrq.ToDate().Month, startSybsszzrq.ToDate().Day, 0, 0, 0)) + .WhereIF(querySybsszzrq != null, p => p.Sybsszzrq <= new DateTime(endSybsszzrq.ToDate().Year, endSybsszzrq.ToDate().Month, endSybsszzrq.ToDate().Day, 23, 59, 59)) .WhereIF(!string.IsNullOrEmpty(input.mdlxLd), p => p.MdlxLd.Equals(input.mdlxLd)) .WhereIF(!string.IsNullOrEmpty(input.mdzt), p => p.Mdzt.Equals(input.mdzt)) .WhereIF(!string.IsNullOrEmpty(input.mdlxXd), p => p.MdlxXd.Equals(input.mdlxXd)) - .WhereIF( - queryXdssksrq != null, - p => p.Xdssksrq >= new DateTime(startXdssksrq.ToDate().Year, startXdssksrq.ToDate().Month, startXdssksrq.ToDate().Day, 0, 0, 0) - ) - .WhereIF( - queryXdssksrq != null, - p => p.Xdssksrq <= new DateTime(endXdssksrq.ToDate().Year, endXdssksrq.ToDate().Month, endXdssksrq.ToDate().Day, 23, 59, 59) - ) - .WhereIF( - queryXdsszzrq != null, - p => p.Xdsszzrq >= new DateTime(startXdsszzrq.ToDate().Year, startXdsszzrq.ToDate().Month, startXdsszzrq.ToDate().Day, 0, 0, 0) - ) - .WhereIF( - queryXdsszzrq != null, - p => p.Xdsszzrq <= new DateTime(endXdsszzrq.ToDate().Year, endXdsszzrq.ToDate().Month, endXdsszzrq.ToDate().Day, 23, 59, 59) - ) + .WhereIF(queryXdssksrq != null, p => p.Xdssksrq >= new DateTime(startXdssksrq.ToDate().Year, startXdssksrq.ToDate().Month, startXdssksrq.ToDate().Day, 0, 0, 0)) + .WhereIF(queryXdssksrq != null, p => p.Xdssksrq <= new DateTime(endXdssksrq.ToDate().Year, endXdssksrq.ToDate().Month, endXdssksrq.ToDate().Day, 23, 59, 59)) + .WhereIF(queryXdsszzrq != null, p => p.Xdsszzrq >= new DateTime(startXdsszzrq.ToDate().Year, startXdsszzrq.ToDate().Month, startXdsszzrq.ToDate().Day, 0, 0, 0)) + .WhereIF(queryXdsszzrq != null, p => p.Xdsszzrq <= new DateTime(endXdsszzrq.ToDate().Year, endXdsszzrq.ToDate().Month, endXdsszzrq.ToDate().Day, 23, 59, 59)) .WhereIF(!string.IsNullOrEmpty(input.smxgd), p => p.Smxgd.Contains(input.smxgd)) .Select(it => new LqMdMdlbjhsxxListOutput { diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqMdXdbhsjService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqMdXdbhsjService.cs index 6843d46..546c7c5 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqMdXdbhsjService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqMdXdbhsjService.cs @@ -39,10 +39,7 @@ namespace NCC.Extend.LqMdXdbhsj /// /// 初始化一个类型的新实例 /// - public LqMdXdbhsjService( - ISqlSugarRepository lqMdXdbhsjRepository, - IUserManager userManager - ) + public LqMdXdbhsjService(ISqlSugarRepository lqMdXdbhsjRepository, IUserManager userManager) { _lqMdXdbhsjRepository = lqMdXdbhsjRepository; _db = _lqMdXdbhsjRepository.Context; @@ -115,9 +112,7 @@ namespace NCC.Extend.LqMdXdbhsj var exists = await _db.Queryable() .Where(p => p.Mdid == entity.Mdid && p.Sfqy == 1) .Where(p => - (p.Bhkssj <= entity.Bhkssj && p.Bhjssj > entity.Bhkssj) - || (p.Bhkssj < entity.Bhjssj && p.Bhjssj >= entity.Bhjssj) - || (p.Bhkssj >= entity.Bhkssj && p.Bhjssj <= entity.Bhjssj) + (p.Bhkssj <= entity.Bhkssj && p.Bhjssj > entity.Bhkssj) || (p.Bhkssj < entity.Bhjssj && p.Bhjssj >= entity.Bhjssj) || (p.Bhkssj >= entity.Bhkssj && p.Bhjssj <= entity.Bhjssj) ) .AnyAsync(); @@ -126,9 +121,7 @@ namespace NCC.Extend.LqMdXdbhsj throw NCCException.Oh(ErrorCode.COM1000, "该门店在指定时间段内已存在保护时间设置"); } - var isOk = await _db.Insertable(entity) - .IgnoreColumns(ignoreNullColumn: true) - .ExecuteCommandAsync(); + var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync(); if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000); } @@ -155,9 +148,7 @@ namespace NCC.Extend.LqMdXdbhsj var exists = await _db.Queryable() .Where(p => p.Mdid == entity.Mdid && p.Sfqy == 1 && p.Id != id) .Where(p => - (p.Bhkssj <= entity.Bhkssj && p.Bhjssj > entity.Bhkssj) - || (p.Bhkssj < entity.Bhjssj && p.Bhjssj >= entity.Bhjssj) - || (p.Bhkssj >= entity.Bhkssj && p.Bhjssj <= entity.Bhjssj) + (p.Bhkssj <= entity.Bhkssj && p.Bhjssj > entity.Bhkssj) || (p.Bhkssj < entity.Bhjssj && p.Bhjssj >= entity.Bhjssj) || (p.Bhkssj >= entity.Bhkssj && p.Bhjssj <= entity.Bhjssj) ) .AnyAsync(); @@ -166,9 +157,7 @@ namespace NCC.Extend.LqMdXdbhsj throw NCCException.Oh(ErrorCode.COM1000, "该门店在指定时间段内已存在保护时间设置"); } - var isOk = await _db.Updateable(entity) - .IgnoreColumns(ignoreAllNullColumns: true) - .ExecuteCommandAsync(); + var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001); } @@ -182,9 +171,7 @@ namespace NCC.Extend.LqMdXdbhsj { var entity = await _db.Queryable().FirstAsync(p => p.Id == id); _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005); - var isOk = await _db.Deleteable() - .Where(d => d.Id == id) - .ExecuteCommandAsync(); + var isOk = await _db.Deleteable().Where(d => d.Id == id).ExecuteCommandAsync(); if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002); } @@ -217,10 +204,7 @@ namespace NCC.Extend.LqMdXdbhsj public async Task GetByStoreId(string mdid) { var now = DateTime.Now; - var entity = await _db.Queryable() - .Where(p => p.Mdid == mdid && p.Sfqy == 1) - .Where(p => p.Bhkssj <= now && p.Bhjssj >= now) - .FirstAsync(); + var entity = await _db.Queryable().Where(p => p.Mdid == mdid && p.Sfqy == 1).Where(p => p.Bhkssj <= now && p.Bhjssj >= now).FirstAsync(); if (entity == null) { -- libgit2 0.21.4