From 505dccc3f2d2dd26ade9ec19044b26f5092a7d0a Mon Sep 17 00:00:00 2001 From: “wangming” <“wangming@antissoft.com”> Date: Sun, 14 Sep 2025 01:11:30 +0800 Subject: [PATCH] 优化代码格式，合并多行构造函数和方法调用，确保代码整洁性和可读性。 --- .csharpierrc | 12 ++++++++++++ .vscode/settings.json | 12 ++++++++++++ netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqMdMdwyService.cs | 6 ++---- netcore/src/Modularity/Extend/NCC.Extend/LqLssjService.cs | 23 +++++------------------ netcore/src/Modularity/Extend/NCC.Extend/LqMdMdlbjhsxxService.cs | 286 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend/LqMdMdwyService.cs | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------- netcore/src/Modularity/Extend/NCC.Extend/LqTkXscService.cs | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------- 7 files changed, 359 insertions(+), 256 deletions(-) create mode 100644 .csharpierrc create mode 100644 .vscode/settings.json diff --git a/.csharpierrc b/.csharpierrc new file mode 100644 index 0000000..3714c4c --- /dev/null +++ b/.csharpierrc @@ -0,0 +1,12 @@ +{ + "printWidth": 200, + "tabWidth": 4, + "useTabs": false, + "endOfLine": "LF", + "include": "**/*.cs", + "exclude": [ + "**/bin/**", + "**/obj/**", + "**/node_modules/**" + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..3411ca7 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,12 @@ +{ + "editor.formatOnSave": true, + "editor.defaultFormatter": "csharpier.csharpier-vscode", + "csharpier.printWidth": 200, + "csharpier.tabWidth": 4, + "csharpier.useTabs": false, + "csharpier.endOfLine": "LF", + "[csharp]": { + "editor.formatOnSave": true, + "editor.defaultFormatter": "csharpier.csharpier-vscode" + } +} diff --git a/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqMdMdwyService.cs b/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqMdMdwyService.cs index 25396d5..7904e28 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqMdMdwyService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ILqMdMdwyService.cs @@ -1,6 +1,4 @@ namespace NCC.Extend.Interfaces.LqMdMdwy { - public interface ILqMdMdwyService - { - } -} \ No newline at end of file + public interface ILqMdMdwyService { } +} diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqLssjService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqLssjService.cs index b9baed1..17e10c1 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqLssjService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqLssjService.cs @@ -39,10 +39,7 @@ namespace NCC.Extend.LqLssj /// /// 初始化一个类型的新实例 /// - public LqLssjService( - ISqlSugarRepository lqLssjRepository, - IUserManager userManager - ) + public LqLssjService(ISqlSugarRepository lqLssjRepository, IUserManager userManager) { _lqLssjRepository = lqLssjRepository; _db = _lqLssjRepository.Context; @@ -112,9 +109,7 @@ namespace NCC.Extend.LqLssj var userInfo = await _userManager.GetUserInfo(); var entity = input.Adapt(); entity.Id = YitIdHelper.NextId().ToString(); - 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); } @@ -192,11 +187,7 @@ namespace NCC.Extend.LqLssj if (isExist != null) { excelconfig.ColumnModel.Add( - new ExcelColumnModel() - { - Column = isExist.field, - ExcelColumn = isExist.value, - } + new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value } ); } } @@ -250,9 +241,7 @@ namespace NCC.Extend.LqLssj public async Task Update(string id, [FromBody] LqLssjUpInput input) { var entity = input.Adapt(); - 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); } @@ -266,9 +255,7 @@ namespace NCC.Extend.LqLssj { 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); } diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqMdMdlbjhsxxService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqMdMdlbjhsxxService.cs index 90b2484..b3b7ce3 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqMdMdlbjhsxxService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqMdMdlbjhsxxService.cs @@ -1,34 +1,34 @@ -using NCC.Common.Core.Manager; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Mapster; +using Microsoft.AspNetCore.Mvc; +using NCC.ClayObject; +using NCC.Common.Configuration; +using NCC.Common.Core.Manager; using NCC.Common.Enum; using NCC.Common.Extension; using NCC.Common.Filter; +using NCC.Common.Helper; +using NCC.Common.Model.NPOI; +using NCC.DataEncryption; using NCC.Dependency; using NCC.DynamicApiController; -using NCC.FriendlyException; +using NCC.Extend.Entitys.Dto.LqMdMdlbjhsxx; +using NCC.Extend.Entitys.lq_md_mdlbjhsxx; using NCC.Extend.Interfaces.LqMdMdlbjhsxx; -using Mapster; -using Microsoft.AspNetCore.Mvc; +using NCC.FriendlyException; +using NCC.JsonSerialization; using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using NCC.Extend.Entitys.lq_md_mdlbjhsxx; -using NCC.Extend.Entitys.Dto.LqMdMdlbjhsxx; using Yitter.IdGenerator; -using NCC.Common.Helper; -using NCC.JsonSerialization; -using NCC.Common.Model.NPOI; -using NCC.Common.Configuration; -using NCC.DataEncryption; -using NCC.ClayObject; namespace NCC.Extend.LqMdMdlbjhsxx { /// /// 门店类别及核算信息服务 /// - [ApiDescriptionSettings(Tag = "Extend",Name = "LqMdMdlbjhsxx", Order = 200)] + [ApiDescriptionSettings(Tag = "Extend", Name = "LqMdMdlbjhsxx", Order = 200)] [Route("api/Extend/[controller]")] public class LqMdMdlbjhsxxService : ILqMdMdlbjhsxxService, IDynamicApiController, ITransient { @@ -39,11 +39,9 @@ namespace NCC.Extend.LqMdMdlbjhsxx /// /// 初始化一个类型的新实例 /// - public LqMdMdlbjhsxxService( - ISqlSugarRepository lqMdMdlbjhsxxRepository, - IUserManager userManager) + public LqMdMdlbjhsxxService(ISqlSugarRepository lqMdMdlbjhsxxRepository, IUserManager userManager) { - _lqMdMdlbjhsxxRepository = lqMdMdlbjhsxxRepository; + _lqMdMdlbjhsxxRepository = lqMdMdlbjhsxxRepository; _db = _lqMdMdlbjhsxxRepository.Context; _userManager = userManager; } @@ -62,10 +60,10 @@ namespace NCC.Extend.LqMdMdlbjhsxx } /// - /// 获取门店类别及核算信息列表 - /// - /// 请求参数 - /// + /// 获取门店类别及核算信息列表 + /// + /// 请求参数 + /// [HttpGet("")] public async Task GetList([FromQuery] LqMdMdlbjhsxxListQueryInput input) { @@ -94,43 +92,84 @@ 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 + .Select(it => new LqMdMdlbjhsxxListOutput { id = it.Id, - mdmc=it.Mdmc, - md=it.Md, - dxmbls=it.Dxmbls, - dxmb=it.Dxmb, - kssj=it.Kssj, - jssj=it.Jssj, - syb=it.Syb, - sybssksrq=it.Sybssksrq, - sybsszzrq=it.Sybsszzrq, - mdlxLd=it.MdlxLd, - mdzt=it.Mdzt, - mdlxXd=it.MdlxXd, - xdssksrq=it.Xdssksrq, - xdsszzrq=it.Xdsszzrq, - smxgd=it.Smxgd, - }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize); - return PageResult.SqlSugarPageResult(data); + mdmc = it.Mdmc, + md = it.Md, + dxmbls = it.Dxmbls, + dxmb = it.Dxmb, + kssj = it.Kssj, + jssj = it.Jssj, + syb = it.Syb, + sybssksrq = it.Sybssksrq, + sybsszzrq = it.Sybsszzrq, + mdlxLd = it.MdlxLd, + mdzt = it.Mdzt, + mdlxXd = it.MdlxXd, + xdssksrq = it.Xdssksrq, + xdsszzrq = it.Xdsszzrq, + smxgd = it.Smxgd, + }) + .MergeTable() + .OrderBy(sidx + " " + input.sort) + .ToPagedListAsync(input.currentPage, input.pageSize); + return PageResult.SqlSugarPageResult(data); } /// @@ -145,14 +184,15 @@ namespace NCC.Extend.LqMdMdlbjhsxx var entity = input.Adapt(); entity.Id = YitIdHelper.NextId().ToString(); var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync(); - if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000); + if (!(isOk > 0)) + throw NCCException.Oh(ErrorCode.COM1000); } /// - /// 获取门店类别及核算信息无分页列表 - /// - /// 请求参数 - /// + /// 获取门店类别及核算信息无分页列表 + /// + /// 请求参数 + /// [NonAction] public async Task GetNoPagingList([FromQuery] LqMdMdlbjhsxxListQueryInput input) { @@ -181,50 +221,91 @@ 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 + .Select(it => new LqMdMdlbjhsxxListOutput { id = it.Id, - mdmc=it.Mdmc, - md=it.Md, - dxmbls=it.Dxmbls, - dxmb=it.Dxmb, - kssj=it.Kssj, - jssj=it.Jssj, - syb=it.Syb, - sybssksrq=it.Sybssksrq, - sybsszzrq=it.Sybsszzrq, - mdlxLd=it.MdlxLd, - mdzt=it.Mdzt, - mdlxXd=it.MdlxXd, - xdssksrq=it.Xdssksrq, - xdsszzrq=it.Xdsszzrq, - smxgd=it.Smxgd, - }).MergeTable().OrderBy(sidx+" "+input.sort).ToListAsync(); - return data; + mdmc = it.Mdmc, + md = it.Md, + dxmbls = it.Dxmbls, + dxmb = it.Dxmb, + kssj = it.Kssj, + jssj = it.Jssj, + syb = it.Syb, + sybssksrq = it.Sybssksrq, + sybsszzrq = it.Sybsszzrq, + mdlxLd = it.MdlxLd, + mdzt = it.Mdzt, + mdlxXd = it.MdlxXd, + xdssksrq = it.Xdssksrq, + xdsszzrq = it.Xdsszzrq, + smxgd = it.Smxgd, + }) + .MergeTable() + .OrderBy(sidx + " " + input.sort) + .ToListAsync(); + return data; } /// - /// 导出门店类别及核算信息 - /// - /// 请求参数 - /// + /// 导出门店类别及核算信息 + /// + /// 请求参数 + /// [HttpGet("Actions/Export")] public async Task Export([FromQuery] LqMdMdlbjhsxxListQueryInput input) { @@ -239,7 +320,8 @@ namespace NCC.Extend.LqMdMdlbjhsxx { exportData = await this.GetNoPagingList(input); } - List paramList = "[{\"value\":\"主键\",\"field\":\"id\"},{\"value\":\"门店名称\",\"field\":\"mdmc\"},{\"value\":\"门店\",\"field\":\"md\"},{\"value\":\"大项目部老师\",\"field\":\"dxmbls\"},{\"value\":\"大项目部\",\"field\":\"dxmb\"},{\"value\":\"开始时间\",\"field\":\"kssj\"},{\"value\":\"结束时间\",\"field\":\"jssj\"},{\"value\":\"事业部\",\"field\":\"syb\"},{\"value\":\"事业部所属开始日期\",\"field\":\"sybssksrq\"},{\"value\":\"事业部所属终止日期\",\"field\":\"sybsszzrq\"},{\"value\":\"门店类型-老店\",\"field\":\"mdlxLd\"},{\"value\":\"门店状态\",\"field\":\"mdzt\"},{\"value\":\"新店类型\",\"field\":\"mdlxXd\"},{\"value\":\"新店所属开始日期\",\"field\":\"xdssksrq\"},{\"value\":\"新店所属终止日期\",\"field\":\"xdsszzrq\"},{\"value\":\"生命线-固定\",\"field\":\"smxgd\"},]".ToList(); + List paramList = + "[{\"value\":\"主键\",\"field\":\"id\"},{\"value\":\"门店名称\",\"field\":\"mdmc\"},{\"value\":\"门店\",\"field\":\"md\"},{\"value\":\"大项目部老师\",\"field\":\"dxmbls\"},{\"value\":\"大项目部\",\"field\":\"dxmb\"},{\"value\":\"开始时间\",\"field\":\"kssj\"},{\"value\":\"结束时间\",\"field\":\"jssj\"},{\"value\":\"事业部\",\"field\":\"syb\"},{\"value\":\"事业部所属开始日期\",\"field\":\"sybssksrq\"},{\"value\":\"事业部所属终止日期\",\"field\":\"sybsszzrq\"},{\"value\":\"门店类型-老店\",\"field\":\"mdlxLd\"},{\"value\":\"门店状态\",\"field\":\"mdzt\"},{\"value\":\"新店类型\",\"field\":\"mdlxXd\"},{\"value\":\"新店所属开始日期\",\"field\":\"xdssksrq\"},{\"value\":\"新店所属终止日期\",\"field\":\"xdsszzrq\"},{\"value\":\"生命线-固定\",\"field\":\"smxgd\"},]".ToList(); ExcelConfig excelconfig = new ExcelConfig(); excelconfig.FileName = "门店类别及核算信息.xls"; excelconfig.HeadFont = "微软雅黑"; @@ -258,11 +340,7 @@ namespace NCC.Extend.LqMdMdlbjhsxx 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; } @@ -282,7 +360,7 @@ namespace NCC.Extend.LqMdMdlbjhsxx //开启事务 _db.BeginTran(); //批量删除门店类别及核算信息 - await _db.Deleteable().In(d => d.Id,ids).ExecuteCommandAsync(); + await _db.Deleteable().In(d => d.Id, ids).ExecuteCommandAsync(); //关闭事务 _db.CommitTran(); } @@ -306,7 +384,8 @@ namespace NCC.Extend.LqMdMdlbjhsxx { var entity = input.Adapt(); var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); - if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001); + if (!(isOk > 0)) + throw NCCException.Oh(ErrorCode.COM1001); } /// @@ -319,7 +398,8 @@ namespace NCC.Extend.LqMdMdlbjhsxx 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(); - if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002); + if (!(isOk > 0)) + throw NCCException.Oh(ErrorCode.COM1002); } } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqMdMdwyService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqMdMdwyService.cs index bc7fa6c..b8bc6ae 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqMdMdwyService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqMdMdwyService.cs @@ -1,34 +1,34 @@ -using NCC.Common.Core.Manager; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Mapster; +using Microsoft.AspNetCore.Mvc; +using NCC.ClayObject; +using NCC.Common.Configuration; +using NCC.Common.Core.Manager; using NCC.Common.Enum; using NCC.Common.Extension; using NCC.Common.Filter; +using NCC.Common.Helper; +using NCC.Common.Model.NPOI; +using NCC.DataEncryption; using NCC.Dependency; using NCC.DynamicApiController; -using NCC.FriendlyException; +using NCC.Extend.Entitys.Dto.LqMdMdwy; +using NCC.Extend.Entitys.lq_md_mdwy; using NCC.Extend.Interfaces.LqMdMdwy; -using Mapster; -using Microsoft.AspNetCore.Mvc; +using NCC.FriendlyException; +using NCC.JsonSerialization; using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using NCC.Extend.Entitys.lq_md_mdwy; -using NCC.Extend.Entitys.Dto.LqMdMdwy; using Yitter.IdGenerator; -using NCC.Common.Helper; -using NCC.JsonSerialization; -using NCC.Common.Model.NPOI; -using NCC.Common.Configuration; -using NCC.DataEncryption; -using NCC.ClayObject; namespace NCC.Extend.LqMdMdwy { /// /// 门店物业服务 /// - [ApiDescriptionSettings(Tag = "Extend",Name = "LqMdMdwy", Order = 200)] + [ApiDescriptionSettings(Tag = "Extend", Name = "LqMdMdwy", Order = 200)] [Route("api/Extend/[controller]")] public class LqMdMdwyService : ILqMdMdwyService, IDynamicApiController, ITransient { @@ -39,11 +39,9 @@ namespace NCC.Extend.LqMdMdwy /// /// 初始化一个类型的新实例 /// - public LqMdMdwyService( - ISqlSugarRepository lqMdMdwyRepository, - IUserManager userManager) + public LqMdMdwyService(ISqlSugarRepository lqMdMdwyRepository, IUserManager userManager) { - _lqMdMdwyRepository = lqMdMdwyRepository; + _lqMdMdwyRepository = lqMdMdwyRepository; _db = _lqMdMdwyRepository.Context; _userManager = userManager; } @@ -62,10 +60,10 @@ namespace NCC.Extend.LqMdMdwy } /// - /// 获取门店物业列表 - /// - /// 请求参数 - /// + /// 获取门店物业列表 + /// + /// 请求参数 + /// [HttpGet("")] public async Task GetList([FromQuery] LqMdMdwyListQueryInput input) { @@ -77,16 +75,19 @@ namespace NCC.Extend.LqMdMdwy .WhereIF(!string.IsNullOrEmpty(input.wy), p => p.Wy.Contains(input.wy)) .WhereIF(!string.IsNullOrEmpty(input.jf), p => p.Jf.Equals(input.jf)) .WhereIF(!string.IsNullOrEmpty(input.df), p => p.Df.Equals(input.df)) - .Select(it=> new LqMdMdwyListOutput + .Select(it => new LqMdMdwyListOutput { id = it.Id, - mdbm=it.Mdbm, - djmd=it.Djmd, - wy=it.Wy, - jf=it.Jf, - df=it.Df, - }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize); - return PageResult.SqlSugarPageResult(data); + mdbm = it.Mdbm, + djmd = it.Djmd, + wy = it.Wy, + jf = it.Jf, + df = it.Df, + }) + .MergeTable() + .OrderBy(sidx + " " + input.sort) + .ToPagedListAsync(input.currentPage, input.pageSize); + return PageResult.SqlSugarPageResult(data); } /// @@ -101,14 +102,15 @@ namespace NCC.Extend.LqMdMdwy var entity = input.Adapt(); entity.Id = YitIdHelper.NextId().ToString(); var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync(); - if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000); + if (!(isOk > 0)) + throw NCCException.Oh(ErrorCode.COM1000); } /// - /// 获取门店物业无分页列表 - /// - /// 请求参数 - /// + /// 获取门店物业无分页列表 + /// + /// 请求参数 + /// [NonAction] public async Task GetNoPagingList([FromQuery] LqMdMdwyListQueryInput input) { @@ -120,23 +122,26 @@ namespace NCC.Extend.LqMdMdwy .WhereIF(!string.IsNullOrEmpty(input.wy), p => p.Wy.Contains(input.wy)) .WhereIF(!string.IsNullOrEmpty(input.jf), p => p.Jf.Equals(input.jf)) .WhereIF(!string.IsNullOrEmpty(input.df), p => p.Df.Equals(input.df)) - .Select(it=> new LqMdMdwyListOutput + .Select(it => new LqMdMdwyListOutput { id = it.Id, - mdbm=it.Mdbm, - djmd=it.Djmd, - wy=it.Wy, - jf=it.Jf, - df=it.Df, - }).MergeTable().OrderBy(sidx+" "+input.sort).ToListAsync(); - return data; + mdbm = it.Mdbm, + djmd = it.Djmd, + wy = it.Wy, + jf = it.Jf, + df = it.Df, + }) + .MergeTable() + .OrderBy(sidx + " " + input.sort) + .ToListAsync(); + return data; } /// - /// 导出门店物业 - /// - /// 请求参数 - /// + /// 导出门店物业 + /// + /// 请求参数 + /// [HttpGet("Actions/Export")] public async Task Export([FromQuery] LqMdMdwyListQueryInput input) { @@ -151,7 +156,8 @@ namespace NCC.Extend.LqMdMdwy { exportData = await this.GetNoPagingList(input); } - List paramList = "[{\"value\":\"物业编号\",\"field\":\"id\"},{\"value\":\"门店编码\",\"field\":\"mdbm\"},{\"value\":\"单据门店\",\"field\":\"djmd\"},{\"value\":\"物业\",\"field\":\"wy\"},{\"value\":\"借方\",\"field\":\"jf\"},{\"value\":\"贷方\",\"field\":\"df\"},]".ToList(); + List paramList = + "[{\"value\":\"物业编号\",\"field\":\"id\"},{\"value\":\"门店编码\",\"field\":\"mdbm\"},{\"value\":\"单据门店\",\"field\":\"djmd\"},{\"value\":\"物业\",\"field\":\"wy\"},{\"value\":\"借方\",\"field\":\"jf\"},{\"value\":\"贷方\",\"field\":\"df\"},]".ToList(); ExcelConfig excelconfig = new ExcelConfig(); excelconfig.FileName = "门店物业.xls"; excelconfig.HeadFont = "微软雅黑"; @@ -164,7 +170,9 @@ namespace NCC.Extend.LqMdMdwy 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; @@ -173,7 +181,7 @@ namespace NCC.Extend.LqMdMdwy var output = new { name = excelconfig.FileName, - url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") + url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC"), }; return output; } @@ -194,7 +202,7 @@ namespace NCC.Extend.LqMdMdwy //开启事务 _db.BeginTran(); //批量删除门店物业 - await _db.Deleteable().In(d => d.Id,ids).ExecuteCommandAsync(); + await _db.Deleteable().In(d => d.Id, ids).ExecuteCommandAsync(); //关闭事务 _db.CommitTran(); } @@ -218,7 +226,8 @@ namespace NCC.Extend.LqMdMdwy { var entity = input.Adapt(); var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); - if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001); + if (!(isOk > 0)) + throw NCCException.Oh(ErrorCode.COM1001); } /// @@ -231,7 +240,8 @@ namespace NCC.Extend.LqMdMdwy 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(); - if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002); + if (!(isOk > 0)) + throw NCCException.Oh(ErrorCode.COM1002); } } } diff --git a/netcore/src/Modularity/Extend/NCC.Extend/LqTkXscService.cs b/netcore/src/Modularity/Extend/NCC.Extend/LqTkXscService.cs index b7947ff..043bced 100644 --- a/netcore/src/Modularity/Extend/NCC.Extend/LqTkXscService.cs +++ b/netcore/src/Modularity/Extend/NCC.Extend/LqTkXscService.cs @@ -1,34 +1,34 @@ -using NCC.Common.Core.Manager; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Mapster; +using Microsoft.AspNetCore.Mvc; +using NCC.ClayObject; +using NCC.Common.Configuration; +using NCC.Common.Core.Manager; using NCC.Common.Enum; using NCC.Common.Extension; using NCC.Common.Filter; +using NCC.Common.Helper; +using NCC.Common.Model.NPOI; +using NCC.DataEncryption; using NCC.Dependency; using NCC.DynamicApiController; -using NCC.FriendlyException; +using NCC.Extend.Entitys.Dto.LqTkXsc; +using NCC.Extend.Entitys.lq_tk_xsc; using NCC.Extend.Interfaces.LqTkXsc; -using Mapster; -using Microsoft.AspNetCore.Mvc; +using NCC.FriendlyException; +using NCC.JsonSerialization; using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using NCC.Extend.Entitys.lq_tk_xsc; -using NCC.Extend.Entitys.Dto.LqTkXsc; using Yitter.IdGenerator; -using NCC.Common.Helper; -using NCC.JsonSerialization; -using NCC.Common.Model.NPOI; -using NCC.Common.Configuration; -using NCC.DataEncryption; -using NCC.ClayObject; namespace NCC.Extend.LqTkXsc { /// /// 线索池服务 /// - [ApiDescriptionSettings(Tag = "Extend",Name = "LqTkXsc", Order = 200)] + [ApiDescriptionSettings(Tag = "Extend", Name = "LqTkXsc", Order = 200)] [Route("api/Extend/[controller]")] public class LqTkXscService : ILqTkXscService, IDynamicApiController, ITransient { @@ -39,11 +39,9 @@ namespace NCC.Extend.LqTkXsc /// /// 初始化一个类型的新实例 /// - public LqTkXscService( - ISqlSugarRepository lqTkXscRepository, - IUserManager userManager) + public LqTkXscService(ISqlSugarRepository lqTkXscRepository, IUserManager userManager) { - _lqTkXscRepository = lqTkXscRepository; + _lqTkXscRepository = lqTkXscRepository; _db = _lqTkXscRepository.Context; _userManager = userManager; } @@ -62,10 +60,10 @@ namespace NCC.Extend.LqTkXsc } /// - /// 获取线索池列表 - /// - /// 请求参数 - /// + /// 获取线索池列表 + /// + /// 请求参数 + /// [HttpGet("")] public async Task GetList([FromQuery] LqTkXscListQueryInput input) { @@ -93,24 +91,27 @@ namespace NCC.Extend.LqTkXsc .WhereIF(!string.IsNullOrEmpty(input.dz), p => p.Dz.Contains(input.dz)) .WhereIF(!string.IsNullOrEmpty(input.yx), p => p.Yx.Contains(input.yx)) .WhereIF(!string.IsNullOrEmpty(input.wx), p => p.Wx.Contains(input.wx)) - .Select(it=> new LqTkXscListOutput + .Select(it => new LqTkXscListOutput { id = it.Id, - tjsj=it.Tjsj, - tkry=it.Tkry, - gkxm=it.Gkxm, - dhhm=it.Dhhm, - gmzs=it.Gmzs, - zffs=it.Zffs, - sfjwx=it.Sfjwx, - bz=it.Bz, - xb=it.Xb, - sr=it.Sr, - dz=it.Dz, - yx=it.Yx, - wx=it.Wx, - }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize); - return PageResult.SqlSugarPageResult(data); + tjsj = it.Tjsj, + tkry = it.Tkry, + gkxm = it.Gkxm, + dhhm = it.Dhhm, + gmzs = it.Gmzs, + zffs = it.Zffs, + sfjwx = it.Sfjwx, + bz = it.Bz, + xb = it.Xb, + sr = it.Sr, + dz = it.Dz, + yx = it.Yx, + wx = it.Wx, + }) + .MergeTable() + .OrderBy(sidx + " " + input.sort) + .ToPagedListAsync(input.currentPage, input.pageSize); + return PageResult.SqlSugarPageResult(data); } /// @@ -125,14 +126,15 @@ namespace NCC.Extend.LqTkXsc var entity = input.Adapt(); entity.Id = YitIdHelper.NextId().ToString(); var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync(); - if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000); + if (!(isOk > 0)) + throw NCCException.Oh(ErrorCode.COM1000); } /// - /// 获取线索池无分页列表 - /// - /// 请求参数 - /// + /// 获取线索池无分页列表 + /// + /// 请求参数 + /// [NonAction] public async Task GetNoPagingList([FromQuery] LqTkXscListQueryInput input) { @@ -160,31 +162,34 @@ namespace NCC.Extend.LqTkXsc .WhereIF(!string.IsNullOrEmpty(input.dz), p => p.Dz.Contains(input.dz)) .WhereIF(!string.IsNullOrEmpty(input.yx), p => p.Yx.Contains(input.yx)) .WhereIF(!string.IsNullOrEmpty(input.wx), p => p.Wx.Contains(input.wx)) - .Select(it=> new LqTkXscListOutput + .Select(it => new LqTkXscListOutput { id = it.Id, - tjsj=it.Tjsj, - tkry=it.Tkry, - gkxm=it.Gkxm, - dhhm=it.Dhhm, - gmzs=it.Gmzs, - zffs=it.Zffs, - sfjwx=it.Sfjwx, - bz=it.Bz, - xb=it.Xb, - sr=it.Sr, - dz=it.Dz, - yx=it.Yx, - wx=it.Wx, - }).MergeTable().OrderBy(sidx+" "+input.sort).ToListAsync(); - return data; + tjsj = it.Tjsj, + tkry = it.Tkry, + gkxm = it.Gkxm, + dhhm = it.Dhhm, + gmzs = it.Gmzs, + zffs = it.Zffs, + sfjwx = it.Sfjwx, + bz = it.Bz, + xb = it.Xb, + sr = it.Sr, + dz = it.Dz, + yx = it.Yx, + wx = it.Wx, + }) + .MergeTable() + .OrderBy(sidx + " " + input.sort) + .ToListAsync(); + return data; } /// - /// 导出线索池 - /// - /// 请求参数 - /// + /// 导出线索池 + /// + /// 请求参数 + /// [HttpGet("Actions/Export")] public async Task Export([FromQuery] LqTkXscListQueryInput input) { @@ -199,7 +204,8 @@ namespace NCC.Extend.LqTkXsc { exportData = await this.GetNoPagingList(input); } - List paramList = "[{\"value\":\"客户编号\",\"field\":\"id\"},{\"value\":\"创建时间\",\"field\":\"tjsj\"},{\"value\":\"拓客人员\",\"field\":\"tkry\"},{\"value\":\"顾客姓名\",\"field\":\"gkxm\"},{\"value\":\"电话号码\",\"field\":\"dhhm\"},{\"value\":\"购买张数\",\"field\":\"gmzs\"},{\"value\":\"支付方式\",\"field\":\"zffs\"},{\"value\":\"是否加微信\",\"field\":\"sfjwx\"},{\"value\":\"备注\",\"field\":\"bz\"},{\"value\":\"性别\",\"field\":\"xb\"},{\"value\":\"生日\",\"field\":\"sr\"},{\"value\":\"地址\",\"field\":\"dz\"},{\"value\":\"邮箱\",\"field\":\"yx\"},{\"value\":\"微信\",\"field\":\"wx\"},]".ToList(); + List paramList = + "[{\"value\":\"客户编号\",\"field\":\"id\"},{\"value\":\"创建时间\",\"field\":\"tjsj\"},{\"value\":\"拓客人员\",\"field\":\"tkry\"},{\"value\":\"顾客姓名\",\"field\":\"gkxm\"},{\"value\":\"电话号码\",\"field\":\"dhhm\"},{\"value\":\"购买张数\",\"field\":\"gmzs\"},{\"value\":\"支付方式\",\"field\":\"zffs\"},{\"value\":\"是否加微信\",\"field\":\"sfjwx\"},{\"value\":\"备注\",\"field\":\"bz\"},{\"value\":\"性别\",\"field\":\"xb\"},{\"value\":\"生日\",\"field\":\"sr\"},{\"value\":\"地址\",\"field\":\"dz\"},{\"value\":\"邮箱\",\"field\":\"yx\"},{\"value\":\"微信\",\"field\":\"wx\"},]".ToList(); ExcelConfig excelconfig = new ExcelConfig(); excelconfig.FileName = "线索池.xls"; excelconfig.HeadFont = "微软雅黑"; @@ -218,11 +224,7 @@ namespace NCC.Extend.LqTkXsc 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; } @@ -242,7 +244,7 @@ namespace NCC.Extend.LqTkXsc //开启事务 _db.BeginTran(); //批量删除线索池 - await _db.Deleteable().In(d => d.Id,ids).ExecuteCommandAsync(); + await _db.Deleteable().In(d => d.Id, ids).ExecuteCommandAsync(); //关闭事务 _db.CommitTran(); } @@ -266,7 +268,8 @@ namespace NCC.Extend.LqTkXsc { var entity = input.Adapt(); var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); - if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001); + if (!(isOk > 0)) + throw NCCException.Oh(ErrorCode.COM1001); } /// @@ -279,7 +282,8 @@ namespace NCC.Extend.LqTkXsc 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(); - if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002); + if (!(isOk > 0)) + throw NCCException.Oh(ErrorCode.COM1002); } } } -- libgit2 0.21.4