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

OA2021/finance/PaymentApplicationReport.aspx.cs

@@ -174,13 +174,12 @@ namespace OA2014.finance
                 List<CreditCardPayment> ccpList = ccps.GetOPIsPaymentApplicationReport(beginDt, endDt);
                 /*End*/
 
-
+                List<DelegationInfo> deleList = new DelegationInfoService().GetAll();
                 for (int i = 0; i < ccpList.Count; i++)
                 {
                     int a = ccpList[i].DIId;
-                    Models.DelegationInfo d = new DelegationInfoService().GetDelegationInfoByID(a);
-                    if (d == null)
-                        PublicCode.GetAlertMsg(this, GetType(), "团组【" + new DelegationInfoService().GetRemoveDeleByID(a).TeamName + "】已被删除");
+                    Models.DelegationInfo d = deleList.Find(x => x.Id == a);
+                    if (d == null) PublicCode.GetAlertMsg(this, GetType(), "团组【" + new DelegationInfoService().GetRemoveDeleByID(a).TeamName + "】已被删除");
                     int tempDID = d.TeamDid;
                     //int tempDID = new DelegationInfoService().GetDelegationInfoByID(ccpList[i].DIId).TeamDid;
                     if (tempDID != 300)
@@ -312,7 +311,7 @@ namespace OA2014.finance
                                         break;
                                     case 751:
                                         string Hotelid = new hotelidbreakfastService().GetHotelidbreakfastByID(ccpList[i].CId).Hotelid;
-                                        if(!string.IsNullOrEmpty(Hotelid))
+                                        if (!string.IsNullOrEmpty(Hotelid))
                                             name = new HotelReservationsService().GetHotelReservationsByID(Convert.ToInt32(Hotelid)).HotelName + "【早餐费用】";
                                         break;
                                     case 805:
@@ -378,9 +377,9 @@ namespace OA2014.finance
                                     //    if (dis.GetDelegationInfoByID(ccpList[i].DIId).TeamDid != 302)
                                     //    {
                                     string createUserId = "暂未查到申请人信息";
-                                    if (ccpList[i].Operators!=0 && ccpList[i].Operators!=null)
+                                    if (ccpList[i].Operators != 0 && ccpList[i].Operators != null)
                                     {
-                                        createUserId=(new UsersService().GetUsersByID(ccpList[i].Operators)).CnName;
+                                        createUserId = (new UsersService().GetUsersByID(ccpList[i].Operators)).CnName;
                                     }
                                     row["opMsg"] = "【" + new SetDataService().GetSetDataByID(ccpList[i].PayDId).Name + "】" + (i + 1).ToString() + "、[申请人：" + createUserId + "][收款方：" + ccpList[i].Payee + "]" + name + "（团组：" + di.TeamName + "[" + tableName + "]）：" + (currency.Name == "CNY" ? "RMB" : currency.Name) + " " + moneyN.ToString("#0.00") + "、RMB：" + RMBPrice.ToString("#0.00") + "<br /><br />";
                                     row["Id"] = ccpList[i].Id;
@@ -562,8 +561,20 @@ namespace OA2014.finance
                 string beginDt = !string.IsNullOrEmpty(txtStartTime.Text.Trim()) ? txtStartTime.Text.Trim() + " 00:00:00" : "";
                 string endDt = !string.IsNullOrEmpty(txtEndTime.Text.Trim()) ? txtEndTime.Text.Trim() + " 23:59:59" : "";
 
-                List<CreditCardPayment> ccpList = ccps.GetOPIsPaymentApplicationReport(beginDt, endDt);
-
+                List<CreditCardPayment> ccpList1 = ccps.GetOPIsPaymentApplicationReport(beginDt, endDt);
+                List<CreditCardPayment> ccpList = new List<CreditCardPayment>();
+                List<DelegationInfo> deleList = new DelegationInfoService().GetAll();
+                for (int i = 0; i < ccpList1.Count; i++)
+                {
+                    int a = ccpList1[i].DIId;
+                    Models.DelegationInfo d = deleList.Find(x=>x.Id == a);
+                    if (d == null) continue;
+                    int tempDID = d.TeamDid;
+                    if (tempDID != 300 && tempDID != 302 && tempDID != 248)
+                    {
+                        ccpList.Add(ccpList1[i]);
+                    }
+                }
                 for (int i = 0; i < rptOpMsg.Items.Count; i++)
                 {
                     TextBox txtRate = (rptOpMsg.Items[i].FindControl("txtRate") as TextBox);
@@ -601,8 +612,6 @@ namespace OA2014.finance
                     catch { }
                 }
 
-
-
                 //日常付款费用---------------------