费用审核

费用Title，Msg 增加

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -37,6 +37,7 @@ using Aspose.Words.Fields;
 using NPOI.POIFS.FileSystem;
 using Microsoft.AspNetCore.Mvc.ViewEngines;
 using OASystem.Domain.ViewModels.QiYeWeChat;
+using OASystem.Domain.Entities.Financial;
 
 namespace OASystem.API.Controllers
 {
@@ -977,6 +978,19 @@ namespace OASystem.API.Controllers
                                                       .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();
+
+                /*
+                 * 82: //团组客户保险
+                 */
+
                 /*
                  *  Label = 98 其他款项
                  */
@@ -989,11 +1003,17 @@ namespace OASystem.API.Controllers
                  */
 
                 List<Grp_AirTicketReservations> p_AirTicketReservations = await _groupRepository
-                                                                    .Query<Grp_AirTicketReservations>(s => s.DIId == _dto.DiId && s.IsDel == 0)
-                                                                    .ToListAsync();
-
+                                                                                .Query<Grp_AirTicketReservations>(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();
 
+                List<Grp_Customers> _Customers = await _groupRepository.Query<Grp_Customers>(s => s.DiId == _dto.DiId && s.IsDel == 0) .ToListAsync();
                 /*
                  * 币种信息
                  */
@@ -1079,7 +1099,7 @@ namespace OASystem.API.Controllers
                     /*
                      * Bus名称
                      */
-                    _detail.BusName = "";
+                    _detail.BusName = "待增加";
 
                     /*
                      *费用所属
@@ -1101,7 +1121,12 @@ namespace OASystem.API.Controllers
                             Grp_CarTouristGuideGroundReservations touristGuideGroundReservations = _CarTouristGuideGroundReservations.Where(s => s.Id == entity.CId).FirstOrDefault();
                             if (touristGuideGroundReservations != null)
                             {
-                                _detail.BusName = touristGuideGroundReservations.BusName;
+                                if (!string.IsNullOrEmpty(touristGuideGroundReservations.BusName))
+                                {
+                                    _detail.BusName = touristGuideGroundReservations.BusName;
+                                }
+
+                                
                                 _detail.PriceNameContent = touristGuideGroundReservations.Area;
 
                                 List<Grp_CarTouristGuideGroundReservationsContent> touristGuideGroundReservationsContents = _CarTouristGuideGroundReservationsContent
@@ -1125,7 +1150,7 @@ namespace OASystem.API.Controllers
 
                                     priceMsg += typeName + "：" + item.Price.ToString("#0.00") + " " + carCurrencyCode + "(" + carCurrencyName + ")<br/>" +
                                                 "明细：" + item.PriceContent + "<br/>" +
-                                                "备注：" + item.Remark + "<br/>";
+                                                "备注：" + item.Remark + "<br/><br/>";
                                 }
 
 
@@ -1138,16 +1163,43 @@ namespace OASystem.API.Controllers
                             if (visaInfo != null)
                             {
                                 _detail.PriceNameContent = visaInfo.VisaClient;
-                                _detail.PriceMsgContent = visaInfo.Remark;
+                                _detail.PriceMsgContent = "备注：" + visaInfo.Remark;
                             }
 
-                            _detail.BusName = "待增加";
                             break;
                         case 81: //邀请/公务活动
-                            _detail.BusName = "待增加";
+
+                            Grp_InvitationOfficialActivities invitationOfficialActivities = _InvitationOfficialActivities.Where(s => s.Id == entity.CId).FirstOrDefault();
+                            if (invitationOfficialActivities != null)
+                            {
+
+                                string ioaCurrencyCode = "Unknown";
+                                string ioaCurrencyName= "Unknown";
+
+                                var currencyData = currencyItems.Where(s => s.Id == invitationOfficialActivities.Currency && s.IsDel == 0).FirstOrDefault();
+                                if (currencyData != null)
+                                {
+                                    ioaCurrencyCode = currencyData.Name;
+                                    ioaCurrencyName = currencyData.Remark;
+                                }
+
+                                _detail.PriceNameContent = invitationOfficialActivities.InviterArea;
+                                _detail.PriceMsgContent = "邀请费用：" + invitationOfficialActivities.InviteCosts + " "+ ioaCurrencyCode + "("+ ioaCurrencyName+ ")<br/>" +
+                                                          "活动费用：- <br/>" +
+                                                          "备注：" + invitationOfficialActivities.Remark + "<br/>";
+
+                            }
+
                             break;
                         case 82: //团组客户保险
-                            _detail.BusName = "待增加";
+
+                            Grp_Customers customers = _Customers.Where(s => s.Id == entity.Id && s.IsDel == 0).FirstOrDefault();
+                            if (customers != null)
+                            {
+                                _detail.PriceNameContent = customers.ClientName;
+                                _detail.PriceMsgContent = "备注：" + customers.Remark + "<br/>";
+                            }
+
                             break;
                         case 85: //机票预订
                             Grp_AirTicketReservations jpRes = _groupRepository.Query<Grp_AirTicketReservations>(s => s.Id == entity.CId).First();
@@ -1167,8 +1219,14 @@ namespace OASystem.API.Controllers
                                 _detail.PriceNameContent = gdpRes.PriceName;
                             }
                             break;
-                        case 285://收款退还
-                            
+                        case 285://收款退还Fin_PaymentRefundAndOtherMoney
+                            Fin_PaymentRefundAndOtherMoney refundAndOtherMoney = _PaymentRefundAndOtherMoneys.Where(s => s.Id == entity.CId).FirstOrDefault();
+                            if (refundAndOtherMoney != null)
+                            {
+                                _detail.PriceMsgContent = "备注：" + refundAndOtherMoney.Remark;
+                                _detail.PriceNameContent = refundAndOtherMoney.PriceName;
+                            }
+
                             break;
                         case 751://酒店早餐