Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -939,7 +939,8 @@ namespace OASystem.API.Controllers
                             if (cityInfo.City.Contains("全部城市") || cityInfo.City.Contains("其他城市"))
                             {
                                 item.Place = cityInfo.Country;
-                            }else item.Place = cityInfo.City;
+                            }
+                            else item.Place = cityInfo.City;
                         }
                     }
 
@@ -1193,7 +1194,7 @@ namespace OASystem.API.Controllers
                             }
                         }
                         //MemoryStream outSteam = new MemoryStream();
-                        string filsPath = AppSettingsHelper.Get("WordBasePath") + $"ForeignReceivables/File/{ClientItem.Key.Replace("\n","")}.docx";
+                        string filsPath = AppSettingsHelper.Get("WordBasePath") + $"ForeignReceivables/File/{ClientItem.Key.Replace("\n", "")}.docx";
                         doc.Save(filsPath);
                         filesToZip.Add(filsPath);
                         //streams.Add(ClientItem.Key + ".docx", outSteam.ToArray());
@@ -1903,7 +1904,7 @@ namespace OASystem.API.Controllers
                 tree_Group_DailyFeePaymentResult groupResult = PayRequest_GroupPaymentByDateRange(dto.Status, checkedView.GroupIds, dto.beginDt, dto.endDt);
 
                 stopwatch.Stop();
-                return Ok(JsonView(true, $"查询成功！耗时{stopwatch.ElapsedMilliseconds/1000}s", new { daily = dailyResult, group = groupResult }));
+                return Ok(JsonView(true, $"查询成功！耗时{stopwatch.ElapsedMilliseconds / 1000}s", new { daily = dailyResult, group = groupResult }));
             }
             catch (Exception ex)
             {
@@ -2085,7 +2086,7 @@ namespace OASystem.API.Controllers
                         CNYSubTotalAmount = ((payInfo.DayRate * payInfo.PayMoney) / 100) * payInfo.PayPercentage //此次付款金额
                     };
 
-                    string remaksDescription = $"【{childInfo.PayType}】【{childInfo.ModuleName}】{rouNumber}、[申请人：{childInfo.Applicant}][收款方：{childInfo.Payee}]{priName}[{payInfo.ConsumptionPatterns}] {childInfo.PayCurrCode} {payInfo.PayMoney.ToString("#0.00")}、CNY：{childInfo.CNYSubTotalAmount.ToString("#0.00")}";
+                    string remaksDescription = $"【{childInfo.PayType}】【{childInfo.ModuleName}】{rouNumber}、[申请人：{childInfo.Applicant}][收款方：{childInfo.Payee}]{priName},{payInfo.OtherBankName},{payInfo.OtherSideNo}[{payInfo.ConsumptionPatterns}] {childInfo.PayCurrCode} {payInfo.PayMoney.ToString("#0.00")}、CNY：{childInfo.CNYSubTotalAmount.ToString("#0.00")}";
 
                     childInfo.RemaksDescription = remaksDescription;
                     childList.Add(childInfo);
@@ -2177,7 +2178,7 @@ namespace OASystem.API.Controllers
                     if (sd_transfer != null)
                     {
                         item.transferParentId = sd_transfer.STid;
-                        item.transferParentIdStr = sd_transfer.STid == 62 ? "公转" : sd_transfer.STid == 63 ? "私转" : "";
+                        item.transferParentIdStr = sd_transfer.STid == 0 ? "公转" : sd_transfer.STid == 1 ? "私转" : "";
                     }
                 }
                 else
@@ -2187,7 +2188,7 @@ namespace OASystem.API.Controllers
                     {
                         item.transferTypeIdStr = sd_transfer.Name;
                         item.transferParentId = sd_transfer.STid;
-                        item.transferParentIdStr = sd_transfer.STid == 62 ? "公转" : sd_transfer.STid == 63 ? "私转" : "";
+                        item.transferParentIdStr = sd_transfer.STid == 0 ? "公转" : sd_transfer.STid == 1 ? "私转" : "";
                         dic_setData.Add(item.transferTypeId, sd_transfer.Name);
                     }
                 }
@@ -2206,8 +2207,8 @@ namespace OASystem.API.Controllers
                 }
             }
 
-            decimal total_gz = DailyFeePaymentData.Where(s => s.transferParentId == 62).Sum(d => d.SumPrice ?? 0M);
-            decimal total_sz = DailyFeePaymentData.Where(s => s.transferParentId == 63).Sum(d => d.SumPrice ?? 0M);
+            decimal total_gz = DailyFeePaymentData.Where(s => s.transferParentId == 0).Sum(d => d.SumPrice ?? 0M);
+            decimal total_sz = DailyFeePaymentData.Where(s => s.transferParentId == 1).Sum(d => d.SumPrice ?? 0M);
 
             var result = new tree_Fin_DailyFeePaymentResult() { gz = total_gz, sz = total_sz, dataList = DailyFeePaymentData };
 
@@ -2640,7 +2641,7 @@ namespace OASystem.API.Controllers
                 string rst = AppSettingsHelper.Get("ExcelBaseUrl") + AppSettingsHelper.Get("ExcelFtpPath") + fileName;
                 stopwatch.Stop();
 
-                return Ok(JsonView(true, $"操作成功!{stopwatch.ElapsedMilliseconds/1000}s", new { url = rst }));
+                return Ok(JsonView(true, $"操作成功!{stopwatch.ElapsedMilliseconds / 1000}s", new { url = rst }));
 
             }
             catch (Exception ex)