费用审核 增加未审核款项

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1724,96 +1724,76 @@ FROM
 
                 #endregion
 
-                Grp_CreditCardPaymentView _view = new Grp_CreditCardPaymentView();
+                var _view = new Grp_CreditCardPaymentView();
 
-                List<SimplClientInfo> clientNameList = getSimplClientList(_dto.DiId);
+                var clientNameList = getSimplClientList(_dto.DiId);
 
                 #region 费用清单
                 var exp = Expressionable.Create<Grp_CreditCardPayment>();
                 exp.AndIF(_dto.AuditStatus != -1, it => it.IsAuditGM == _dto.AuditStatus);
                 exp.AndIF(_dto.Label != -1, it => it.CTable == _dto.Label);
 
-                List<Grp_CreditCardPayment> entityList = _groupRepository
+                var entityList = _groupRepository
                     .Query<Grp_CreditCardPayment>(s => s.DIId == _dto.DiId && s.IsDel == 0 && s.CreateUserId > 0)
                     .Where(exp.ToExpression())
                     .ToList();
 
 
-                List<Grp_CreditCardPaymentDetailView> detailList = new List<Grp_CreditCardPaymentDetailView>();
+                var detailList = new List<Grp_CreditCardPaymentDetailView>();
 
-                List<CreditCardPaymentCurrencyPriceItem> ccpCurrencyPrices = new List<CreditCardPaymentCurrencyPriceItem>();
+                var ccpCurrencyPrices = new List<CreditCardPaymentCurrencyPriceItem>();
 
                 /*
                  * 76://酒店预订
                  */
-
-                List<Grp_HotelReservations> _HotelReservations = await _groupRepository
-                                                                       .Query<Grp_HotelReservations>(s => s.DiId == _dto.DiId && s.IsDel == 0)
-                                                                       .ToListAsync();
-                List<Grp_HotelReservationsContent> _HotelReservationsContents = await _groupRepository
-                                                                       .Query<Grp_HotelReservationsContent>(s => s.DiId == _dto.DiId && s.IsDel == 0)
-                                                                       .ToListAsync();
+                var _HotelReservations = await _groupRepository.Query<Grp_HotelReservations>(s => s.DiId == _dto.DiId && s.IsDel == 0).ToListAsync();
+                var _HotelReservationsContents = await _groupRepository.Query<Grp_HotelReservationsContent>(s => s.DiId == _dto.DiId && s.IsDel == 0).ToListAsync();
 
                 /*
                  * 79://车/导游地接
                  */
-                List<Grp_CarTouristGuideGroundReservations> _CarTouristGuideGroundReservations = await _groupRepository
-                                                                                                       .Query<Grp_CarTouristGuideGroundReservations>(s => s.DiId == _dto.DiId && s.IsDel == 0)
-                                                                                                       .ToListAsync();
-                List<Grp_CarTouristGuideGroundReservationsContent> _CarTouristGuideGroundReservationsContent = await _groupRepository
-                                                                     .Query<Grp_CarTouristGuideGroundReservationsContent>(s => s.DiId == _dto.DiId && s.IsDel == 0)
-                                                                     .ToListAsync();
+                var _CarTouristGuideGroundReservations = await _groupRepository.Query<Grp_CarTouristGuideGroundReservations>(s => s.DiId == _dto.DiId && s.IsDel == 0).ToListAsync();
+                var _CarTouristGuideGroundReservationsContent = await _groupRepository.Query<Grp_CarTouristGuideGroundReservationsContent>(s => s.DiId == _dto.DiId && s.IsDel == 0).ToListAsync();
 
                 /*
                  * 80: //签证
                  */
-                List<Grp_VisaInfo> _VisaInfos = await _groupRepository
-                                                      .Query<Grp_VisaInfo>(s => s.DIId == _dto.DiId && s.IsDel == 0)
-                                                      .ToListAsync();
+                var _VisaInfos = await _groupRepository.Query<Grp_VisaInfo>(s => s.DIId == _dto.DiId && s.IsDel == 0).ToListAsync();
 
                 /*
                  *81: //邀请/公务活动
                  */
-                List<Grp_InvitationOfficialActivities> _InvitationOfficialActivities = await _groupRepository
-                                                                                             .Query<Grp_InvitationOfficialActivities>(s => s.DiId == _dto.DiId && s.IsDel == 0)
-                                                                                             .ToListAsync();
+                var _InvitationOfficialActivities = await _groupRepository.Query<Grp_InvitationOfficialActivities>(s => s.DiId == _dto.DiId && s.IsDel == 0).ToListAsync();
 
                 /*
                  * 82: //团组客户保险
                  */
-                List<Grp_Customers> _Customers = await _groupRepository.Query<Grp_Customers>(s => s.DiId == _dto.DiId && s.IsDel == 0).ToListAsync();
-
+                var _Customers = await _groupRepository.Query<Grp_Customers>(s => s.DiId == _dto.DiId && s.IsDel == 0).ToListAsync();
 
                 /*
                  *  Lable = 85 机票预订
                  */
-                List<Grp_AirTicketReservations> p_AirTicketReservations = await _groupRepository
-                                                                                .Query<Grp_AirTicketReservations>(s => s.DIId == _dto.DiId && s.IsDel == 0)
-                                                                                .ToListAsync();
+                var p_AirTicketReservations = await _groupRepository.Query<Grp_AirTicketReservations>(s => s.DIId == _dto.DiId && s.IsDel == 0).ToListAsync();
 
                 /*
                  * 85 机票预定
                  */
-                List<Grp_AirTicketReservations> _AirTicketReservations = await _groupRepository.Query<Grp_AirTicketReservations>(s => s.DIId == _dto.DiId && s.IsDel == 0).ToListAsync();
+                var _AirTicketReservations = await _groupRepository.Query<Grp_AirTicketReservations>(s => s.DIId == _dto.DiId && s.IsDel == 0).ToListAsync();
 
                 /*
                 *  98 其他款项
                 */
-                List<Grp_DecreasePayments> _DecreasePayments = await _groupRepository
-                                                                    .Query<Grp_DecreasePayments>(s => s.DiId == _dto.DiId && s.IsDel == 0)
-                                                                    .ToListAsync();
+                var _DecreasePayments = await _groupRepository.Query<Grp_DecreasePayments>(s => s.DiId == _dto.DiId && s.IsDel == 0).ToListAsync();
 
                 /*
                  *  285:收款退还
                  */
-                List<Fin_PaymentRefundAndOtherMoney> _PaymentRefundAndOtherMoneys = await _groupRepository
-                                                                                .Query<Fin_PaymentRefundAndOtherMoney>(s => s.DiId == _dto.DiId && s.IsDel == 0)
-                                                                                .ToListAsync();
+                var _PaymentRefundAndOtherMoneys = await _groupRepository.Query<Fin_PaymentRefundAndOtherMoney>(s => s.DiId == _dto.DiId && s.IsDel == 0).ToListAsync();
+
                 /*
                  * 1015: //超支费用
                  */
-                List<Fin_GroupExtraCost> _GroupExtraCosts = await _groupRepository.Query<Fin_GroupExtraCost>(s => s.DiId == _dto.DiId && s.IsDel == 0).ToListAsync();
-
+                var _GroupExtraCosts = await _groupRepository.Query<Fin_GroupExtraCost>(s => s.DiId == _dto.DiId && s.IsDel == 0).ToListAsync();
 
                 /*
                  * 币种信息
@@ -1823,16 +1803,13 @@ FROM
                 /*
                  * 车/导游地接 费用类型
                  */
-
                 var carFeeTypeItems = await _groupRepository.Query<Sys_SetData>(s => s.STid == 17 && s.IsDel == 0).ToListAsync();
 
-
                 /*
                  * 车/导游地接 费用类型
                  */
                 var carFeeItems = await _groupRepository.Query<Sys_SetData>(s => s.STid == 83 && s.IsDel == 0).ToListAsync();
 
-
                 var initDatas = await _groupRepository.Query<Sys_SetData>(s => s.IsDel == 0).ToListAsync();
 
                 var cityData = await _groupRepository.Query<Grp_NationalTravelFee>(s => s.IsDel == 0).ToListAsync();
@@ -1840,13 +1817,12 @@ FROM
                 /*
                  * 用户信息
                  */
-
                 var userItems = await _groupRepository.Query<Sys_Users>(s => s.IsDel == 0).ToListAsync();
 
                 /*
                  * 费用模块
                  */
-                Sys_SetData sdPriceName = _groupRepository.Query<Sys_SetData>(s => s.Id == _dto.Label).First();
+                var sdPriceName = _groupRepository.Query<Sys_SetData>(s => s.Id == _dto.Label).First();
                 string priceModule = string.Empty;
                 if (sdPriceName != null)
                 {
@@ -1881,7 +1857,7 @@ FROM
                  */
                 foreach (var entity in entityList)
                 {
-                    Grp_CreditCardPaymentDetailView _detail = new Grp_CreditCardPaymentDetailView();
+                    var _detail = new Grp_CreditCardPaymentDetailView();
 
                     _detail.Id = entity.Id;
 
@@ -1907,7 +1883,7 @@ FROM
                     /*
                      * 应付款金额	
                      */
-                    Sys_SetData sdPaymentCurrency_WaitPay = currencyItems.Where(s => s.Id == entity.PaymentCurrency).FirstOrDefault();
+                    var sdPaymentCurrency_WaitPay = currencyItems.Where(s => s.Id == entity.PaymentCurrency).FirstOrDefault();
                     string PaymentCurrency_WaitPay = "Unknown";
                     string hotelCurrncyCode = "Unknown";
                     string hotelCurrncyName = "Unknown";
@@ -1958,11 +1934,7 @@ FROM
                         }
 
                     }
-                    else
-                    {
-                        _detail.CurrPay = CurrPayStr.ToString("#0.00") + " CNY";
-                    }
-
+                    else _detail.CurrPay = CurrPayStr.ToString("#0.00") + " CNY";
 
                     /*
                      * 剩余尾款
@@ -2409,13 +2381,11 @@ FROM
                     * 审核人
                     */
                     string auditOperatorName = "Unknown";
-                    if (entity.AuditGMOperate == 0)
-                        auditOperatorName = " - ";
-                    else if (entity.AuditGMOperate == 4)
-                        auditOperatorName = "自动审核";
+                    if (entity.AuditGMOperate == 0) auditOperatorName = " - ";
+                    else if (entity.AuditGMOperate == 4) auditOperatorName = "自动审核";
                     else
                     {
-                        Sys_Users _adUser = userItems.Where(s => s.Id == entity.AuditGMOperate).FirstOrDefault();
+                        var _adUser = userItems.Where(s => s.Id == entity.AuditGMOperate).FirstOrDefault();
                         if (_adUser != null)
                         {
                             auditOperatorName = _adUser.CnName;
@@ -2428,8 +2398,7 @@ FROM
                      */
                     string overBudgetStr = "";
 
-                    if (entity.ExceedBudget == -1)
-                        overBudgetStr = sdPriceName.Name + "尚无预算";
+                    if (entity.ExceedBudget == -1) overBudgetStr = sdPriceName.Name + "尚无预算";
                     else if (entity.ExceedBudget == 0)
                     {
                         if (entity.CTable == 76 || entity.CTable == 79)
@@ -2442,17 +2411,15 @@ FROM
                             overBudgetStr = "未超预算";
                         }
                     }
-                    else
-                        overBudgetStr = entity.ExceedBudget.ToString("P");
+                    else overBudgetStr = entity.ExceedBudget.ToString("P");
+
                     _detail.OverBudget = overBudgetStr;
 
 
-                    /*
-                     * 已审核金额
-                     */
-                    decimal auditFee = 0.00M;
+                    decimal auditFee = 0.00M; //已审核金额
+                    decimal unAuditFee = 0.00M; //未审核款项
                     if (entity.IsAuditGM == 1 || entity.IsAuditGM == 3) auditFee = CurrPayStr;
-
+                    else if (entity.IsAuditGM == 0) unAuditFee = CurrPayStr;
                     /*
                      * 费用总计
                      */
@@ -2463,7 +2430,8 @@ FROM
                         AmountPayable = entity.PayMoney,
                         ThisPayment = OriginalCurrPay,
                         BalancePayment = BalanceStr,
-                        AuditedFunds = auditFee
+                        AuditedFunds = auditFee,
+                        UnAuditFunds = unAuditFee
                     });
 
                     _detail.IsAuditGM = entity.IsAuditGM;
@@ -2499,44 +2467,49 @@ FROM
 
                 foreach (var item in nonDuplicat)
                 {
+                    var currencyName = item.CurrencyName;
                     var strs = ccpCurrencyPrices.Where(it => it.CurrencyId == item.CurrencyId).ToList();
                     if (strs.Count > 0)
                     {
                         decimal amountPayable = strs.Sum(it => it.AmountPayable);
                         decimal thisPayment = ccpCurrencyPrices.Sum(it => it.ThisPayment);
                         decimal balancePayment = strs.Sum(it => it.BalancePayment);
-                        amountPayableStr += string.Format(@"{0}{1}&nbsp;|&nbsp;", amountPayable.ToString("#0.00"), item.CurrencyName);
+                        amountPayableStr += string.Format(@"{0}{1}&nbsp;|;", amountPayable.ToString("#0.00"), currencyName);
 
                         //单独处理此次付款金额
                         if (item.CurrencyId == 836) //人民币
                         {
-                            thisPaymentStr += string.Format(@"{0}{1}&nbsp;|&nbsp;", thisPayment.ToString("#0.00"), item.CurrencyName);
+                            thisPaymentStr += string.Format(@"{0}{1}&nbsp;|;", thisPayment.ToString("#0.00"), currencyName);
                         }
                         else
                         {
-                            thisPaymentStr += string.Format(@"{0}{1}&nbsp;|&nbsp;", thisPayment.ToString("#0.00"), item.CurrencyName);
+                            thisPaymentStr += string.Format(@"{0}{1}&nbsp;|;", thisPayment.ToString("#0.00"), currencyName);
                         }
 
-                        balancePaymentStr += string.Format(@"{0}{1}&nbsp;|&nbsp;", balancePayment.ToString("#0.00"), item.CurrencyName);
+                        balancePaymentStr += string.Format(@"{0}{1}&nbsp;|;", balancePayment.ToString("#0.00"), currencyName);
 
                         //单独处理已审核费用
                         if (item.CurrencyId == 836) //人民币
                         {
                             decimal auditedFunds = ccpCurrencyPrices.Sum(it => it.AuditedFunds);
-                            auditedFundsStr += string.Format(@"{0}{1}&nbsp;|", auditedFunds.ToString("#0.00"), item.CurrencyName);
+                            auditedFundsStr += string.Format(@"{0}{1}&nbsp;|", auditedFunds.ToString("#0.00"), currencyName);
                         }
                         else
                         {
-                            auditedFundsStr += string.Format(@"{0}{1}&nbsp;|", "0.00", item.CurrencyName);
+                            auditedFundsStr += string.Format(@"{0}{1}&nbsp;|", strs.Sum(x => x.AmountPayable), currencyName);
                         }
+
+                        //未审核费用
+                        var unAudit = strs.Sum(x => x.UnAuditFunds);
+                        unAuditedFundsStr += string.Format(@"{0}{1}&nbsp;|", unAudit.ToString("#0.00"), currencyName);
                     }
                 }
 
                 _view.TotalStr1 = amountPayableStr.Substring(0, amountPayableStr.Length - 1);
                 _view.TotalStr2 = thisPaymentStr.Substring(0, thisPaymentStr.Length - 1);
                 _view.TotalStr3 = balancePaymentStr.Substring(0, balancePaymentStr.Length - 1);
-                _view.TotalStr4 = auditedFundsStr.Substring(0, auditedFundsStr.Length - 1);
-                _view.TotalStr5 = unAuditedFundsStr.Substring(0, unAuditedFundsStr.Length - 1);
+                _view.TotalStr4 = $"{auditedFundsStr.Substring(0, auditedFundsStr.Length - 1)}<br/>{unAuditedFundsStr.Substring(0, unAuditedFundsStr.Length - 1)}";
+                //_view.TotalStr5 = unAuditedFundsStr.Substring(0, unAuditedFundsStr.Length - 1);
 
 
                 var _view1 = new

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -2200,7 +2200,6 @@ ORDER BY
             return Ok(JsonView(true, "成功", url));
         }
 
-
         private void StatementExportExcelSetCell(WorkbookDesigner designer, Worksheet sheet,DataTable dt, Style style,string judgeLable,  int startIndex, string startRange,string endRange)
         {
             if (designer == null) return;

OASystem/OASystem.Domain/ViewModels/Groups/Grp_CreditCardPaymentView.cs

@@ -101,7 +101,7 @@ namespace OASystem.Domain.ViewModels.Groups
         public string TotalStr2 { get; set; }
         public string TotalStr3 { get; set; }
         public string TotalStr4 { get; set; }
-        public string TotalStr5 { get; set; }
+        //public string TotalStr5 { get; set; }
     }
 
     public class Grp_CreditCardPaymentDetailView
@@ -212,5 +212,10 @@ namespace OASystem.Domain.ViewModels.Groups
         /// 已审款项
         /// </summary>
         public decimal AuditedFunds { get; set; }
+
+        /// <summary>
+        /// 未审核款项
+        /// </summary>
+        public decimal UnAuditFunds { get; set; }
     }
 }