其他款项 新增 供应商名称, 联系人 联系电话

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -3010,20 +3010,15 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> QueryDecreasePaymentsById(DecreasePaymentsByIdDto dto)
         {
-            try
-            {
-                Result groupData = await _decreasePaymentsRep.QueryDecreasePaymentsById(dto);
-                if (groupData.Code != 0)
-                {
-                    return Ok(JsonView(false, groupData.Msg));
-                }
-                return Ok(JsonView(true, groupData.Msg, groupData.Data));
-            }
-            catch (Exception ex)
+            if (dto.Id < 1) return Ok(JsonView(false, "请传入有效的数据Id！"));
+
+            Result groupData = await _decreasePaymentsRep.QueryDecreasePaymentsById(dto);
+            if (groupData.Code != 0)
             {
-                return Ok(JsonView(false, "程序错误！"));
-                throw;
+                return Ok(JsonView(false, groupData.Msg));
             }
+            return Ok(JsonView(true, groupData.Msg, groupData.Data));
+
         }
 
         #endregion

OASystem/OASystem.Domain/Dtos/Groups/DecreasePaymentsDto.cs

@@ -42,10 +42,9 @@ namespace OASystem.Domain.Dtos.Groups
         /// 费用标识
         /// </summary>
         public int OrbitalPrivateTransfer { get; set; }
-        /// <summary>
-        /// 收款方
-        /// </summary>
-        public string Payee { get;set; }
+
+
+
         /// <summary>
         /// 编号
         /// </summary>
@@ -66,6 +65,21 @@ namespace OASystem.Domain.Dtos.Groups
         /// </summary>
         public int SupplierTypeId { get; set; }
 
+        /// <summary>
+        /// 供应商名称
+        /// </summary>
+        public string SupplierName { get; set; }
+
+        /// <summary>
+        /// 供应商联系人
+        /// </summary>
+        public string SupplierContact { get; set; }
+
+        /// <summary>
+        /// 供应商联系电话
+        /// </summary>
+        public string SupplierContactNumber { get; set; }
+
         /// <summary>
         /// 费用名称
         /// </summary>

OASystem/OASystem.Domain/Entities/Groups/Grp_DecreasePayments.cs

@@ -33,6 +33,24 @@ namespace OASystem.Domain.Entities.Groups
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int SupplierTypeId { get; set; }
 
+        /// <summary>
+        /// 供应商名称
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(200)")]
+        public string SupplierName { get; set; }
+
+        /// <summary>
+        /// 供应商联系人
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(100)")]
+        public string SupplierContact { get; set; }
+
+        /// <summary>
+        /// 供应商联系电话
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string SupplierContactNumber { get; set; }
+
         /// <summary>
         /// 费用名称
         /// </summary>

OASystem/OASystem.Domain/ViewModels/Groups/DecreasePaymentsView.cs

@@ -55,4 +55,81 @@ namespace OASystem.Domain.ViewModels.Groups
         public int VisitPNumber { get; set; }
         public DateTime CreateTime { get; set; }
     }
+
+    public class DecreasePaymentsInfoView
+    {
+       
+        public int id { get; set; }
+        /// <summary>
+        /// 团组外键编号
+        /// </summary>
+        public int diId { get; set; }
+
+        /// <summary>
+        /// 供应商地区
+        ///  1 国内(默认) 2 国外
+        /// </summary>
+        public int supplierArea { get; set; }
+
+        /// <summary>
+        /// 供应商类型
+        /// </summary>
+        public int supplierTypeId { get; set; }
+
+        /// <summary>
+        /// 供应商名称
+        /// </summary>
+        public string SupplierName { get; set; }
+
+        /// <summary>
+        /// 供应商联系人
+        /// </summary>
+        public string SupplierContact { get; set; }
+
+        /// <summary>
+        /// 供应商联系电话
+        /// </summary>
+        public string SupplierContactNumber { get; set; }
+
+        /// <summary>
+        /// 费用名称
+        /// </summary>
+        public string priceName { get; set; }
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal price { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal quantity { get; set; }
+
+        /// <summary>
+        /// 费用总计
+        /// </summary>
+        public decimal feeTotal { get; set; }
+
+        /// <summary>
+        /// 费用币种
+        /// </summary>
+        public int currency { get; set; }
+        /// <summary>
+        /// 附件地址
+        /// </summary>
+        public string filePath { get; set; }
+
+        /// <summary>
+        /// 支付方式
+        /// </summary>
+        public int payDId { get; set; }
+        /// <summary>
+        /// 费用标识
+        /// </summary>
+        public int orbitalPrivateTransfer { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string remark { get; set; }
+    }
 }

OASystem/OASystem.Infrastructure/Repositories/Groups/DecreasePaymentsRepository.cs

@@ -248,7 +248,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         C.PayPercentageOld = 0;
                         C.PayThenMoneyOld = 0;
                         C.UpdateDate = "";
-                        C.Payee = dto.Payee;
+                        C.Payee = dto.SupplierName;
                         C.OrbitalPrivateTransfer = dto.OrbitalPrivateTransfer;
                         C.ExceedBudget = 0;
                         //C.RMBPrice = 0.00f;
@@ -298,6 +298,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         DiId = grp_Decrease.DiId,
                         SupplierArea = grp_Decrease.SupplierArea,
                         SupplierTypeId = grp_Decrease.SupplierTypeId,
+                        SupplierName = grp_Decrease.SupplierName,
+                        SupplierContact = grp_Decrease.SupplierContact,
+                        SupplierContactNumber = grp_Decrease.SupplierContactNumber,
                         PriceName = grp_Decrease.PriceName,
                         Price = grp_Decrease.Price,
                         Quantity    = grp_Decrease.Quantity,
@@ -346,7 +349,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                                             IsPay = ispay,
                                                             PayMoney = grp_Decrease.FeeTotal,
                                                             PaymentCurrency = grp_Decrease.Currency,
-                                                            Payee = dto.Payee,
+                                                            Payee = dto.SupplierName,
                                                             OrbitalPrivateTransfer = dto.OrbitalPrivateTransfer,
                                                             DayRate = grp_CreditCardPayment.DayRate,
                                                             RMBPrice = grp_CreditCardPayment.RMBPrice,
@@ -466,24 +469,30 @@ namespace OASystem.Infrastructure.Repositories.Groups
         /// <exception cref="NotImplementedException"></exception>
         public async Task<Result> QueryDecreasePaymentsById(DecreasePaymentsByIdDto dto)
         {
-            Result result = new Result() { Code = -2, Msg = "程序错误" };
-            try
-            {
-                Grp_DecreasePayments grp_Decrease = _sqlSugar.Queryable<Grp_DecreasePayments>().First(a => a.Id == dto.Id && a.IsDel == 0);
-                Grp_CreditCardPayment grp_CreditCard = _sqlSugar.Queryable<Grp_CreditCardPayment>().First(a => a.CId == dto.Id && a.IsDel == 0 && a.CTable == 98);
-                var data = new
-                {
-                    _Decrease = grp_Decrease,
-                    _CreditCard = grp_CreditCard,
-                };
-                result = new Result() { Code = 0, Msg = "查询成功！", Data = data };
-            }
-            catch (Exception ex)
-            {
-                result = new Result() { Code = -2, Msg = "程序错误" };
-                throw;
-            }
-            return result;
+            string sql = string.Format($@"Select 
+											dp.Id,
+											dp.DiId,
+											dp.SupplierArea,
+											dp.SupplierTypeId,
+											dp.SupplierName,
+											dp.SupplierContact,
+											dp.SupplierContactNumber,
+											dp.PriceName,
+											dp.Price,
+											dp.Quantity,
+											dp.FeeTotal,
+											dp.Currency,
+											dp.FilePath,
+											dp.Remark,
+											ccp.PayDId,
+											ccp.OrbitalPrivateTransfer
+										From Grp_DecreasePayments dp With(NoLock)
+										Left Join Grp_CreditCardPayment ccp With(NoLock) On dp.Id = ccp.CId And dp.DiId = ccp.DIId And ccp.CTable = 98
+										Where dp.IsDel = 0  And dp.Id = {dto.Id}");
+
+            var info = await _sqlSugar.Queryable<DecreasePaymentsInfoView>(sql).FirstAsync();
+
+            return new Result() { Code = 0, Msg = "查询成功！", Data = info };
         }
 
         /// <summary>