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

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -1606,7 +1606,8 @@ namespace OASystem.API.Controllers
         public async Task<IActionResult> PostPaymentRefundAndOtherMoneyInfo(PaymentRefundAndOtherMoneyInfoDto dto)
         {
             if (dto == null) return Ok(JsonView(false, "参数不能为空!"));
-            return Ok(_paymentRefundAndOtherMoneyRep._Info(dto));
+            var view = await _paymentRefundAndOtherMoneyRep._Info(dto);
+            return Ok(view);
         }
 
         /// <summary>

OASystem/OASystem.Infrastructure/Repositories/Financial/PaymentRefundAndOtherMoneyRepository.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using Newtonsoft.Json;
+using NPOI.SS.Formula.Functions;
 using OASystem.Domain;
 using OASystem.Domain.Dtos;
 using OASystem.Domain.Dtos.Financial;
@@ -179,32 +180,27 @@ namespace OASystem.Infrastructure.Repositories.Financial
            
             if (dto.PortType == 1 || dto.PortType == 2 || dto.PortType == 3)  //1 Web 2 Android 3 Ios
             {
-                string sql = string.Format(@"
-SELECT
-  prom.Id,
-  ccp.Id CcpId,
-  prom.DiId,
-  prom.PriceName,
-  prom.Price,
-  prom.CurrencyId,
-  ccp.Payee,
-  ccp.PayDId,
-  ccp.OrbitalPrivateTransfer,
-  ccp.ConsumptionPatterns,
-  prom.PayType,
-  prom.Remark,
-  ccp.OtherBankName,
-  ccp.OtherBankName
-FROM
-  Fin_PaymentRefundAndOtherMoney prom
-  LEFT JOIN Grp_CreditCardPayment ccp ON ccp.CId = prom.id
-  AND ccp.CTable = 285
-  AND ccp.IsDel = 0
-WHERE
-  prom.IsDel = 0
-  AND ccp.DIId = prom.DiId
-  AND prom.Id = {0}", dto.Id);
-                var data = await _sqlSugar.SqlQueryable<Fin_PaymentRefundAndOtherMoneyInfoView>(sql).FirstAsync();
+                var data = await _sqlSugar.Queryable<Fin_PaymentRefundAndOtherMoney>()
+                                          .LeftJoin<Grp_CreditCardPayment>((prom, ccp) => prom.Id == ccp.CId && ccp.CTable == 285 && ccp.IsDel == 0)
+                                          .Where((prom, ccp) => prom.IsDel == 0 && ccp.DIId == prom.DiId && prom.Id == dto.Id)
+                                          .Select((prom, ccp) => new Fin_PaymentRefundAndOtherMoneyInfoView()
+                                          {
+                                              Id = prom.Id,
+                                              DiId = prom.DiId,
+                                              CcpId = ccp.Id,
+                                              PriceName = prom.PriceName,
+                                              Price = prom.Price,
+                                              CurrencyId = prom.CurrencyId,
+                                              Payee = ccp.Payee,
+                                              PayDId = ccp.PayDId,
+                                              OrbitalPrivateTransfer = ccp.OrbitalPrivateTransfer,
+                                              ConsumptionPatterns = ccp.ConsumptionPatterns,
+                                              PayType = prom.PayType,
+                                              Remark = prom.Remark,
+                                              OtherBankName = ccp.OtherBankName,
+                                              OtherSideNo = ccp.OtherSideNo,
+                                          })
+                                          .FirstAsync();
 
                 if (data != null)
                 {
@@ -212,17 +208,10 @@ WHERE
                     _view.Code = 200;
                     _view.Msg = "查询成功!";
                 }
-                else
-                {
-                    _result.Msg = "查询失败!";
-                }
+                else _result.Msg = "查询失败!";
 
             }
-            else
-            {
-                _view.Msg = "请输入正确的端口号! 1 Web 2 Android 3 Ios;";
-            }
-           
+            else _view.Msg = "请输入正确的端口号! 1 Web 2 Android 3 Ios;";
             return _view;
         }
 
@@ -431,7 +420,10 @@ WHERE
                                                        it.DayRate,
                                                        it.PayThenMoney,
                                                        it.Payee,
-                                                       it.OrbitalPrivateTransfer
+                                                       it.OrbitalPrivateTransfer,
+                                                       it.OtherSideNo,
+                                                       it.OtherBankName
+                                                       
                                                    })
                                                    .WhereColumns(it => new { it.Id })
                                                    .ExecuteCommandAsync();