付款申请

代码调整

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -2050,7 +2050,7 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
                                                 From Fin_DailyFeePayment dfp
                                                 Inner Join Sys_Company c On dfp.CompanyId = c.Id
                                                 Left Join Sys_Users u On dfp.CreateUserId = u.Id
-                                                Where dfp.IsDel=0 {0} And dfp.FAudit = 1 And dfp.MAudit = 1
+                                                Where dfp.IsDel=0 {0} And dfp.FAudit = 1 And dfp.MAudit = 1 And dfp.IsPay = 0
                                                 ) temp ", sqlWhere);
             #endregion
 
@@ -2104,10 +2104,14 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
                 string feeContentSql = string.Format(@"Select * From Fin_DailyFeePaymentContent 
                                                         Where IsDel=0 And DFPId = {0} ", item.Id);
                 item.childList = _sqlSugar.SqlQueryable<Fin_DailyFeePaymentContentInfolView>(feeContentSql).ToList();
+                int rowNumber = 1;
                 foreach (var subItem in item.childList)
                 {
-                    string remaksDescription = $"【{item.priceTypeStr}】{item.Instructions}({subItem.PriceName}) CNY：{subItem.ItemTotal.ToString("#0.00")}(单价：{subItem.Price.ToString("#0.00")} * {subItem.Quantity})【申请人：{item.CreateUser}  申请时间：{item.CreateTime.ToString("yyyy-MM-dd HH:mm:ss")}】";
+                    string remaksDescription = $"{rowNumber}、【{item.priceTypeStr}】{item.Instructions}({subItem.PriceName}) CNY：{subItem.ItemTotal.ToString("#0.00")}(单价：{subItem.Price.ToString("#0.00")} * {subItem.Quantity})";
                     subItem.RemaksDescription = remaksDescription;
+                    string excelRemaksDescription = $"【{item.priceTypeStr}】{item.Instructions}({subItem.PriceName}) CNY：{subItem.ItemTotal.ToString("#0.00")}(单价：{subItem.Price.ToString("#0.00")} * {subItem.Quantity})【申请人：{item.CreateUser}  申请时间：{item.CreateTime.ToString("yyyy-MM-dd HH:mm:ss")}】";
+                    subItem.RemaksDescription = excelRemaksDescription;
+                    rowNumber++;
                 }
             }
 
@@ -2255,7 +2259,7 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
                     decimal _gz = dailyResult.gz + groupResult.gz;
                     decimal _sz = dailyResult.sz + groupResult.sz;
 
-                    return Ok(JsonView(true, "获取成功", new { gz = dailyResult, sz = groupResult }));
+                    return Ok(JsonView(true, "操作成功!", new { gz = dailyResult, sz = groupResult }));
                 }
 
                 return Ok(JsonView(false, "该项汇率修改失败!"));
@@ -2366,7 +2370,7 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
 
         /// <summary>
         /// 付款申请 (PageId=51)
-        /// File Down
+        /// File Download
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
@@ -2505,13 +2509,13 @@ Where c.CTable = 1015 And c.IsPay = 1 And f.IsDel = 0 And c.IsDel = 0 And f.DiId
                         if (item.transferParentId == 62) //公转
                         {
                             dailyGZAmout += item.SumPrice ?? 0.00M;
-                            dailyGZStr += $"{item.RowNumber}、【{item.CompanyName}】{subItem.RemaksDescription}\r\n";
+                            dailyGZStr += $"{item.RowNumber}、【{item.CompanyName}】{subItem.ExcelRemaksDescription}\r\n";
 
                         }
                         else if (item.transferParentId == 63) //私转
                         {
                             dailySZAmout += item.SumPrice ?? 0.00M;
-                            dailySZStr += $"{item.RowNumber}、【{item.CompanyName}】{subItem.RemaksDescription}\r\n";
+                            dailySZStr += $"{item.RowNumber}、【{item.CompanyName}】{subItem.ExcelRemaksDescription}\r\n";
                         }
                     }
                 }

OASystem/OASystem.Domain/ViewModels/Financial/Fin_DailyFeePaymentView.cs

@@ -191,6 +191,11 @@ namespace OASystem.Domain.ViewModels.Financial
         /// 备注描述
         /// </summary>
         public string RemaksDescription { get; set; }
+
+        /// <summary>
+        /// Excel备注描述
+        /// </summary>
+        public string ExcelRemaksDescription { get; set; }
     }
 
     public class Fin_DailyFeePaymentInfolView