From ebf503fef43189dec05f9f79f2be457aab8249d5 Mon Sep 17 00:00:00 2001 From: Abbh1 <86962549+Abbh1@users.noreply.github.com> Date: Thu, 23 Nov 2023 00:13:55 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E5=AE=8C=E5=96=84=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B7=BB=E5=8A=A0=E4=B8=8E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TableDataProductsInvolveDto.cs | 49 ++++++ .../TableDatas/TableDataDto.cs | 1 + .../TableDataProductsInvolve.cs | 59 +++++++ .../TableDataProductsInvolveVo.cs | 45 +++++ .../TableDataManage/TableDatas/TableDataVo.cs | 12 ++ .../TableDataProductsInvolveRepository.cs | 20 +++ .../ProductsInvolvedService.cs | 2 + .../TableDataProductsInvolveService.cs | 90 ++++++++++ .../TableDatas/TableDataService.cs | 158 +++++++++++++----- .../ITableDataProductsInvolveService.cs | 41 +++++ .../TableDatas/ITableDataService.cs | 2 +- .../TableDatas/TableDataController.cs | 2 +- 12 files changed, 435 insertions(+), 46 deletions(-) create mode 100644 ARW.Model/Dto/Business/TableDataManage/TableDataProductsInvolves/TableDataProductsInvolveDto.cs create mode 100644 ARW.Model/Models/Business/TableDataManage/TableDataProductsInvolves/TableDataProductsInvolve.cs create mode 100644 ARW.Model/Vo/Business/TableDataManage/TableDataProductsInvolves/TableDataProductsInvolveVo.cs create mode 100644 ARW.Repository/Business/TableDataManage/TableDataProductsInvolves/TableDataProductsInvolveRepository.cs create mode 100644 ARW.Service/Business/BusinessService/TableDataManage/TableDataProductsInvolves/TableDataProductsInvolveService.cs create mode 100644 ARW.Service/Business/IBusinessService/TableDataManage/TableDataProductsInvolves/ITableDataProductsInvolveService.cs diff --git a/ARW.Model/Dto/Business/TableDataManage/TableDataProductsInvolves/TableDataProductsInvolveDto.cs b/ARW.Model/Dto/Business/TableDataManage/TableDataProductsInvolves/TableDataProductsInvolveDto.cs new file mode 100644 index 0000000..404e249 --- /dev/null +++ b/ARW.Model/Dto/Business/TableDataManage/TableDataProductsInvolves/TableDataProductsInvolveDto.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using ARW.Model.Models.Business.TableDataManage.TableDataProductsInvolves; + +namespace ARW.Model.Dto.Business.TableDataManage.TableDataProductsInvolves +{ + /// + /// 表格数据所属涉及产品输入对象 + /// + /// @author lwh + /// @date 2023-11-22 + /// + public class TableDataProductsInvolveDto + { + + public int TableDataProductsInvolveId { get; set; } + + public long TableDataProductsInvolveGuid { get; set; } + + [Required(ErrorMessage = "表格guid不能为空")] + public long TableGuid { get; set; } + + [Required(ErrorMessage = "涉及产品guid不能为空")] + public long ProductsInvolvedGuid { get; set; } + + + + + + } + + + /// + /// 表格数据所属涉及产品查询对象 + /// + /// @author lwh + /// @date 2023-11-22 + /// + public class TableDataProductsInvolveQueryDto : PagerInfo + { + + public string ids { get; set; } + } + + + + +} diff --git a/ARW.Model/Dto/Business/TableDataManage/TableDatas/TableDataDto.cs b/ARW.Model/Dto/Business/TableDataManage/TableDatas/TableDataDto.cs index feccd3e..5bfc20e 100644 --- a/ARW.Model/Dto/Business/TableDataManage/TableDatas/TableDataDto.cs +++ b/ARW.Model/Dto/Business/TableDataManage/TableDatas/TableDataDto.cs @@ -17,6 +17,7 @@ namespace ARW.Model.Dto.Business.TableDataManage.TableDatas public int TableDataId { get; set; } public long TableDataGuid { get; set; } + public string ProductsInvolvedGuid { get; set; } [Required(ErrorMessage = "采购内容不能为空")] public string TableDataProcurementContent { get; set; } diff --git a/ARW.Model/Models/Business/TableDataManage/TableDataProductsInvolves/TableDataProductsInvolve.cs b/ARW.Model/Models/Business/TableDataManage/TableDataProductsInvolves/TableDataProductsInvolve.cs new file mode 100644 index 0000000..8c41b1b --- /dev/null +++ b/ARW.Model/Models/Business/TableDataManage/TableDataProductsInvolves/TableDataProductsInvolve.cs @@ -0,0 +1,59 @@ +using System; +using System.Collections.Generic; +using SqlSugar; +using OfficeOpenXml.Attributes; +using Newtonsoft.Json; + +namespace ARW.Model.Models.Business.TableDataManage.TableDataProductsInvolves +{ + /// + /// 表格数据所属涉及产品，数据实体对象 + /// + /// @author lwh + /// @date 2023-11-22 + /// + [SugarTable("tb_table_data_products_involve")] + public class TableDataProductsInvolve : BusinessBase + { + + /// + /// 描述 : + /// 空值 : false + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnName = "table_data_products_involve_id")] + public int TableDataProductsInvolveId { get; set; } + + + /// + /// 描述 : + /// 空值 : false + /// + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "table_data_products_involve_guid")] + public long TableDataProductsInvolveGuid { get; set; } + + + /// + /// 描述 :表格guid + /// 空值 : false + /// + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "table_guid")] + public long TableGuid { get; set; } + + + /// + /// 描述 :涉及产品guid + /// 空值 : false + /// + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(ColumnName = "products_involved_id")] + public int ProductsInvolvedId { get; set; } + + + + + + + } +} \ No newline at end of file diff --git a/ARW.Model/Vo/Business/TableDataManage/TableDataProductsInvolves/TableDataProductsInvolveVo.cs b/ARW.Model/Vo/Business/TableDataManage/TableDataProductsInvolves/TableDataProductsInvolveVo.cs new file mode 100644 index 0000000..b5f08d6 --- /dev/null +++ b/ARW.Model/Vo/Business/TableDataManage/TableDataProductsInvolves/TableDataProductsInvolveVo.cs @@ -0,0 +1,45 @@ +using Newtonsoft.Json; +using OfficeOpenXml.Attributes; +using SqlSugar; +using System; + +namespace ARW.Model.Vo.Business.TableDataManage.TableDataProductsInvolves +{ + /// + /// 表格数据所属涉及产品展示对象 + /// + /// @author lwh + /// @date 2023-11-22 + /// + public class TableDataProductsInvolveVo + { + + + /// + /// 描述 : + /// + public int TableDataProductsInvolveId { get; set; } + + + /// + /// 描述 : + /// + [JsonConverter(typeof(ValueToStringConverter))] + public long TableDataProductsInvolveGuid { get; set; } + + + /// + /// 描述 :表格guid + /// + [JsonConverter(typeof(ValueToStringConverter))] + public long TableGuid { get; set; } + + + /// + /// 描述 :涉及产品guid + /// + [JsonConverter(typeof(ValueToStringConverter))] + public long ProductsInvolvedGuid { get; set; } + + } +} diff --git a/ARW.Model/Vo/Business/TableDataManage/TableDatas/TableDataVo.cs b/ARW.Model/Vo/Business/TableDataManage/TableDatas/TableDataVo.cs index 7ae3cd8..94a8798 100644 --- a/ARW.Model/Vo/Business/TableDataManage/TableDatas/TableDataVo.cs +++ b/ARW.Model/Vo/Business/TableDataManage/TableDatas/TableDataVo.cs @@ -2,6 +2,7 @@ using Newtonsoft.Json; using OfficeOpenXml.Attributes; using SqlSugar; using System; +using System.Collections.Generic; namespace ARW.Model.Vo.Business.TableDataManage.TableDatas { @@ -29,6 +30,17 @@ namespace ARW.Model.Vo.Business.TableDataManage.TableDatas [EpplusIgnore] public long TableDataGuid { get; set; } + /// + /// 描述 :表格数据所属涉及产品 + /// + [EpplusTableColumn(Header = "表格数据所属涉及产品")] + public string ProductsInvolvedName { get; set; } + + /// + /// 描述 :表格数据所属涉及产品id + /// + [EpplusIgnore] + public List ProductsInvolvedGuid { get; set; } /// /// 描述 :采购内容 diff --git a/ARW.Repository/Business/TableDataManage/TableDataProductsInvolves/TableDataProductsInvolveRepository.cs b/ARW.Repository/Business/TableDataManage/TableDataProductsInvolves/TableDataProductsInvolveRepository.cs new file mode 100644 index 0000000..3869098 --- /dev/null +++ b/ARW.Repository/Business/TableDataManage/TableDataProductsInvolves/TableDataProductsInvolveRepository.cs @@ -0,0 +1,20 @@ +using System; +using Infrastructure.Attribute; +using ARW.Repository.System; +using ARW.Model.Models.Business.TableDataManage.TableDataProductsInvolves; + +namespace ARW.Repository.Business.TableDataManage.TableDataProductsInvolves +{ + /// + /// 表格数据所属涉及产品仓储 + /// + /// @author lwh + /// @date 2023-11-22 + /// + [AppService(ServiceLifetime = LifeTime.Transient)] + public class TableDataProductsInvolveRepository : BaseRepository + { + #region 业务逻辑代码 + #endregion + } +} \ No newline at end of file diff --git a/ARW.Service/Business/BusinessService/ProductsInvolveds/ProductsInvolvedService.cs b/ARW.Service/Business/BusinessService/ProductsInvolveds/ProductsInvolvedService.cs index cf38f10..db1a9d2 100644 --- a/ARW.Service/Business/BusinessService/ProductsInvolveds/ProductsInvolvedService.cs +++ b/ARW.Service/Business/BusinessService/ProductsInvolveds/ProductsInvolvedService.cs @@ -14,6 +14,8 @@ using ARW.Service.Business.IBusinessService.ProductsInvolveds; using ARW.Model.Dto.Business.ProductsInvolveds; using ARW.Model.Models.Business.ProductsInvolveds; using ARW.Model.Vo.Business.ProductsInvolveds; +using Common.Request.Bsamecity; +using ARW.Model.Dto.Business.TableDataManage.TableDataProductsInvolves; namespace ARW.Service.Business.BusinessService.ProductsInvolveds { diff --git a/ARW.Service/Business/BusinessService/TableDataManage/TableDataProductsInvolves/TableDataProductsInvolveService.cs b/ARW.Service/Business/BusinessService/TableDataManage/TableDataProductsInvolves/TableDataProductsInvolveService.cs new file mode 100644 index 0000000..2914e7d --- /dev/null +++ b/ARW.Service/Business/BusinessService/TableDataManage/TableDataProductsInvolves/TableDataProductsInvolveService.cs @@ -0,0 +1,90 @@ +using Infrastructure.Attribute; +using Microsoft.AspNetCore.Http; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Infrastructure; +using ARW.Model; +using ARW.Repository; +using ARW.Repository.Business.TableDataManage.TableDataProductsInvolves; +using ARW.Service.Business.IBusinessService.TableDataManage.TableDataProductsInvolves; +using ARW.Model.Dto.Business.TableDataManage.TableDataProductsInvolves; +using ARW.Model.Models.Business.TableDataManage.TableDataProductsInvolves; +using ARW.Model.Vo.Business.TableDataManage.TableDataProductsInvolves; + +namespace ARW.Service.Business.BusinessService.TableDataManage.TableDataProductsInvolves +{ + /// + /// 表格数据所属涉及产品接口实现类 + /// + /// @author lwh + /// @date 2023-11-22 + /// + [AppService(ServiceType = typeof(ITableDataProductsInvolveService), ServiceLifetime = LifeTime.Transient)] + public class TableDataProductsInvolveServiceImpl : BaseService, ITableDataProductsInvolveService + { + private readonly TableDataProductsInvolveRepository _TableDataProductsInvolveRepository; + + public TableDataProductsInvolveServiceImpl(TableDataProductsInvolveRepository TableDataProductsInvolveRepository) + { + this._TableDataProductsInvolveRepository = TableDataProductsInvolveRepository; + } + + #region 业务逻辑代码 + + + /// + /// 查询表格数据所属涉及产品分页列表 + /// + public async Task> GetTableDataProductsInvolveList(TableDataProductsInvolveQueryDto parm) + { + //开始拼装查询条件d + var predicate = Expressionable.Create(); + + var query = _TableDataProductsInvolveRepository + .Queryable() + .Where(predicate.ToExpression()) + .OrderBy(s => s.Update_time, OrderByType.Desc) + .Select(s => new TableDataProductsInvolveVo + { + TableDataProductsInvolveId = s.TableDataProductsInvolveId, + TableDataProductsInvolveGuid = s.TableDataProductsInvolveGuid, + TableGuid = s.TableGuid, + }); + + + return await query.ToPageAsync(parm); + } + + /// + /// 添加或修改表格数据所属涉及产品 + /// + public async Task AddOrUpdateTableDataProductsInvolve(TableDataProductsInvolve model) + { + if (model.TableDataProductsInvolveId != 0) + { + var response = await _TableDataProductsInvolveRepository.UpdateAsync(model); + return "修改成功！"; + } + else + { + + var response = await _TableDataProductsInvolveRepository.InsertReturnSnowflakeIdAsync(model); + return "添加成功！"; + } + } + + #region Excel处理 + + + #endregion + + + + #endregion + + } +} diff --git a/ARW.Service/Business/BusinessService/TableDataManage/TableDatas/TableDataService.cs b/ARW.Service/Business/BusinessService/TableDataManage/TableDatas/TableDataService.cs index 0408170..c792252 100644 --- a/ARW.Service/Business/BusinessService/TableDataManage/TableDatas/TableDataService.cs +++ b/ARW.Service/Business/BusinessService/TableDataManage/TableDatas/TableDataService.cs @@ -14,6 +14,10 @@ using ARW.Service.Business.IBusinessService.TableDataManage.TableDatas; using ARW.Model.Dto.Business.TableDataManage.TableDatas; using ARW.Model.Models.Business.TableDataManage.TableDatas; using ARW.Model.Vo.Business.TableDataManage.TableDatas; +using ARW.Model.Models.Business.ProductsInvolveds; +using ARW.Model.Models.Business.TableDataManage.TableDataProductsInvolves; +using ARW.Repository.Business.TableDataManage.TableDataProductsInvolves; +using ARW.Repository.Business.ProductsInvolveds; namespace ARW.Service.Business.BusinessService.TableDataManage.TableDatas { @@ -27,19 +31,23 @@ namespace ARW.Service.Business.BusinessService.TableDataManage.TableDatas public class TableDataServiceImpl : BaseService, ITableDataService { private readonly TableDataRepository _TableDataRepository; + private readonly TableDataProductsInvolveRepository _TableDataProductsInvolveRepository; + private readonly ProductsInvolvedRepository _ProductsInvolveRepository; - public TableDataServiceImpl(TableDataRepository TableDataRepository) + public TableDataServiceImpl(TableDataRepository TableDataRepository, TableDataProductsInvolveRepository tableDataProductsInvolveRepository, ProductsInvolvedRepository productsInvolveRepository) { this._TableDataRepository = TableDataRepository; + _TableDataProductsInvolveRepository = tableDataProductsInvolveRepository; + _ProductsInvolveRepository = productsInvolveRepository; } - #region 业务逻辑代码 - - - /// + #region 业务逻辑代码 + + + /// /// 查询表格数据分页列表 /// - public async Task> GetTableDataList(TableDataQueryDto parm) + public async Task> GetTableDataList(TableDataQueryDto parm) { //开始拼装查询条件d var predicate = Expressionable.Create(); @@ -51,55 +59,116 @@ namespace ARW.Service.Business.BusinessService.TableDataManage.TableDatas var query = _TableDataRepository .Queryable() .Where(predicate.ToExpression()) - .OrderBy(s => s.TableDataSort,OrderByType.Asc) + .OrderBy(s => s.TableDataSort, OrderByType.Asc) .Select(s => new TableDataVo { - TableDataId = s.TableDataId, - TableDataGuid = s.TableDataGuid, - TableDataProcurementContent = s.TableDataProcurementContent, - TableDataProcurementUnit = s.TableDataProcurementUnit, - TableDataProcurementMethod = s.TableDataProcurementMethod, - TableDataSupplierName = s.TableDataSupplierName, - TableDataSupplierOffer = s.TableDataSupplierOffer, - TableDataProjectPricingForm = s.TableDataProjectPricingForm, - TableDataLink = s.TableDataLink, - TableDataDate = s.TableDataDate, - TableDataDeadline = s.TableDataDeadline, - TableDataWinningBidde = s.TableDataWinningBidde, - TableDataBidWinningPrice = s.TableDataBidWinningPrice, - TableDataIsBidAnnouncement = s.TableDataIsBidAnnouncement, - TableDataIsHumanResourcePoolOrFrameworkAgreement = s.TableDataIsHumanResourcePoolOrFrameworkAgreement, - TableDataIsMultiple = s.TableDataIsMultiple, - TableDataIsOnlyBidder = s.TableDataIsOnlyBidder, - TableDataSingleSource = s.TableDataSingleSource, - TableDataDetails = s.TableDataDetails, - TableDataSort = s.TableDataSort, - }); - + TableDataId = s.TableDataId, + TableDataGuid = s.TableDataGuid, + TableDataProcurementContent = s.TableDataProcurementContent, + TableDataProcurementUnit = s.TableDataProcurementUnit, + TableDataProcurementMethod = s.TableDataProcurementMethod, + TableDataSupplierName = s.TableDataSupplierName, + TableDataSupplierOffer = s.TableDataSupplierOffer, + TableDataProjectPricingForm = s.TableDataProjectPricingForm, + TableDataLink = s.TableDataLink, + TableDataDate = s.TableDataDate, + TableDataDeadline = s.TableDataDeadline, + TableDataWinningBidde = s.TableDataWinningBidde, + TableDataBidWinningPrice = s.TableDataBidWinningPrice, + TableDataIsBidAnnouncement = s.TableDataIsBidAnnouncement, + TableDataIsHumanResourcePoolOrFrameworkAgreement = s.TableDataIsHumanResourcePoolOrFrameworkAgreement, + TableDataIsMultiple = s.TableDataIsMultiple, + TableDataIsOnlyBidder = s.TableDataIsOnlyBidder, + TableDataSingleSource = s.TableDataSingleSource, + TableDataDetails = s.TableDataDetails, + TableDataSort = s.TableDataSort, + }); - return await query.ToPageAsync(parm); + var list = await query.ToPageAsync(parm); + + foreach (var item in list.Result) + { + var productsInvolvedList = await _TableDataProductsInvolveRepository.GetListAsync(s => s.TableGuid == item.TableDataGuid); + if (productsInvolvedList.Count > 0) + { + var str = ""; + List stringId = new List(); + foreach (var item1 in productsInvolvedList) + { + var productsInvolved = await _ProductsInvolveRepository.GetFirstAsync(s => s.ProductsInvolvedId == item1.ProductsInvolvedId); + if (productsInvolved != null) + { + str += productsInvolved.ProductsInvolvedName + ","; + stringId.Add(item1.ProductsInvolvedId); + } + } + // 检查字符串是否以逗号结尾 + if (str.EndsWith(",")) + { + // 去掉字符串末尾的逗号 + str = str.TrimEnd(','); + } + item.ProductsInvolvedName = str; + item.ProductsInvolvedGuid = stringId; + } + } + + return list; } - /// + /// /// 添加或修改表格数据 /// - public async Task AddOrUpdateTableData(TableData model) + public async Task AddOrUpdateTableData(TableData model, TableDataDto dto) { if (model.TableDataId != 0) { + var list = await _TableDataProductsInvolveRepository.GetListAsync(s => s.TableGuid == model.TableDataGuid); + if (list.Count > 0) + { + await _TableDataProductsInvolveRepository.DeleteAsync(s => s.TableGuid == model.TableDataGuid); + await HandleAddTableDataProductsInvolves(model.TableDataGuid, dto); + } var response = await _TableDataRepository.UpdateAsync(model); return "修改成功！"; } else { - var response = await _TableDataRepository.InsertReturnSnowflakeIdAsync(model); + await HandleAddTableDataProductsInvolves(response, dto); return "添加成功！"; } } + + /// + /// 添加表格数据所属涉及产品 + /// + /// 商品Model + /// + public async Task HandleAddTableDataProductsInvolves(long tableGuid, TableDataDto dto) + { + if (!string.IsNullOrEmpty(dto.ProductsInvolvedGuid)) + { + var productsInvolvedIds = dto.ProductsInvolvedGuid.Split(','); + var productsInvolvedList = new List(); + foreach (var id in productsInvolvedIds) + { + var productsInvolved = new TableDataProductsInvolve + { + TableGuid = tableGuid, + ProductsInvolvedId = Convert.ToInt32(id), + Create_time = DateTime.Now, + }; + productsInvolvedList.Add(productsInvolved); + } + await _TableDataProductsInvolveRepository.InsertReturnSnowflakeIdAsync(productsInvolvedList); + } + } + + #region Excel处理 - /// + /// /// 数据导入处理 /// public async Task HandleImportData(TableDataVo TableData) @@ -111,7 +180,7 @@ namespace ARW.Service.Business.BusinessService.TableDataManage.TableDatas /// /// Excel导入 /// - public async Task ImportExcel(TableData TableData,int index,bool isUpdateSupport,string user) + public async Task ImportExcel(TableData TableData, int index, bool isUpdateSupport, string user) { try { @@ -122,14 +191,14 @@ namespace ARW.Service.Business.BusinessService.TableDataManage.TableDatas { // 判断唯一值 var model = await GetFirstAsync(s => s.TableDataId == TableData.TableDataId); - + // 如果为空就新增数据 if (model == null) { // 开启事务 var res = await UseTranAsync(async () => { - var addRes = await AddOrUpdateTableData(TableData); + var addRes = await AddOrUpdateTableData(TableData, new TableDataDto()); }); var addStr = $"第 {index} 行 => 表格数据：【{TableData.TableDataId}】新增成功!
"; return addStr; @@ -144,17 +213,18 @@ namespace ARW.Service.Business.BusinessService.TableDataManage.TableDatas TableData.TableDataGuid = model.TableDataGuid; TableData.Update_by = user; TableData.Update_time = DateTime.Now; - var editRes = await AddOrUpdateTableData(TableData); + var editRes = await AddOrUpdateTableData(TableData, new TableDataDto()); }); var editStr = $"第 {index} 行 => 表格数据：【{TableData.TableDataId}】更新成功!
"; return editStr; } } - else{ - // 开启事务 + else + { + // 开启事务 var res = await UseTranAsync(async () => { - var addRes = await AddOrUpdateTableData(TableData); + var addRes = await AddOrUpdateTableData(TableData, new TableDataDto()); }); //Console.WriteLine(res.IsSuccess); var addStr = $"第 {index} 行 => 表格数据：【{TableData.TableDataId}】新增成功!
"; @@ -170,7 +240,7 @@ namespace ARW.Service.Business.BusinessService.TableDataManage.TableDatas } - + /// /// Excel数据导出处理 /// @@ -180,10 +250,10 @@ namespace ARW.Service.Business.BusinessService.TableDataManage.TableDatas } #endregion - -#endregion + + #endregion } } diff --git a/ARW.Service/Business/IBusinessService/TableDataManage/TableDataProductsInvolves/ITableDataProductsInvolveService.cs b/ARW.Service/Business/IBusinessService/TableDataManage/TableDataProductsInvolves/ITableDataProductsInvolveService.cs new file mode 100644 index 0000000..cddf8c8 --- /dev/null +++ b/ARW.Service/Business/IBusinessService/TableDataManage/TableDataProductsInvolves/ITableDataProductsInvolveService.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ARW.Model; +using ARW.Model.Dto.Business.TableDataManage.TableDataProductsInvolves; +using ARW.Model.Models.Business.TableDataManage.TableDataProductsInvolves; +using ARW.Model.Vo.Business.TableDataManage.TableDataProductsInvolves; + +namespace ARW.Service.Business.IBusinessService.TableDataManage.TableDataProductsInvolves +{ + /// + /// 表格数据所属涉及产品接口类 + /// + /// @author lwh + /// @date 2023-11-22 + /// + public interface ITableDataProductsInvolveService : IBaseService + { + /// + /// 获取表格数据所属涉及产品分页列表 + /// + /// + /// + Task> GetTableDataProductsInvolveList(TableDataProductsInvolveQueryDto parm); + + + /// + /// 添加或修改表格数据所属涉及产品 + /// + /// + /// + Task AddOrUpdateTableDataProductsInvolve(TableDataProductsInvolve parm); + + + + + + } +} diff --git a/ARW.Service/Business/IBusinessService/TableDataManage/TableDatas/ITableDataService.cs b/ARW.Service/Business/IBusinessService/TableDataManage/TableDatas/ITableDataService.cs index fba5fc9..714c2c9 100644 --- a/ARW.Service/Business/IBusinessService/TableDataManage/TableDatas/ITableDataService.cs +++ b/ARW.Service/Business/IBusinessService/TableDataManage/TableDatas/ITableDataService.cs @@ -31,7 +31,7 @@ namespace ARW.Service.Business.IBusinessService.TableDataManage.TableDatas /// /// /// - Task AddOrUpdateTableData(TableData parm); + Task AddOrUpdateTableData(TableData parm, TableDataDto dto); /// diff --git a/ARW.WebApi/Controllers/Business/TableDataManage/TableDatas/TableDataController.cs b/ARW.WebApi/Controllers/Business/TableDataManage/TableDatas/TableDataController.cs index 9f9ce35..768dfe1 100644 --- a/ARW.WebApi/Controllers/Business/TableDataManage/TableDatas/TableDataController.cs +++ b/ARW.WebApi/Controllers/Business/TableDataManage/TableDatas/TableDataController.cs @@ -70,7 +70,7 @@ namespace ARW.WebApi.Controllers.Business.TableDataManage.TableDatas if (parm.TableDataId != 0) modal = parm.Adapt().ToUpdate(HttpContext); else modal = parm.Adapt().ToCreate(HttpContext); - var res = await _TableDataService.AddOrUpdateTableData(modal); + var res = await _TableDataService.AddOrUpdateTableData(modal, parm); return SUCCESS(res); }