支付申请显示文本修改

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -2067,12 +2067,15 @@ namespace OASystem.API.Controllers
                         status1 = _groupIds.Contains(payInfo.Id);
                     }
 
+                    string payeeStr = string.Format(@" {0},开户行：{1},银行卡号：{2} ", string.IsNullOrEmpty(payInfo.Payee) ? "-" : payInfo.Payee,
+                        string.IsNullOrEmpty(payInfo.OtherBankName) ? "-" : payInfo.OtherBankName,
+                        string.IsNullOrEmpty(payInfo.OtherSideNo) ? "-" : payInfo.OtherSideNo);
 
                     var childInfo = new Group_DailyFeePaymentContentInfolView()
                     {
                         IsChecked = status1,
                         Id = payInfo.Id,
-                        Payee = payInfo.Payee,
+                        Payee = payeeStr,
                         RowNumber = rouNumber,
                         Applicant = userDatas.Find(it => it.Id == payInfo.CreateUserId)?.CnName ?? "",
                         ApplicantDt = payInfo.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -11447,18 +11447,81 @@ namespace OASystem.API.Controllers
         {
             _airTicketResRep.ChangeDataBase(DBEnum.OA2014DB);
 
-            string sql = string.Format(@" Select * From Visa With(Nolock) ");
-            List<OA2014_Visa> list_visa = _airTicketResRep._sqlSugar.SqlQueryable<OA2014_Visa>(sql).ToList();
+            string sql = string.Format(@" Select * From grouopExceed where id > 20 And id not in (26,27) ");
+            List<OA2014_grouopExceed> list_visa = _airTicketResRep._sqlSugar.SqlQueryable<OA2014_grouopExceed>(sql).ToList();
 
             _airTicketResRep.ChangeDataBase(DBEnum.OA2023DB);
+
+            Dictionary<int, int> dicDetail = new Dictionary<int, int>();
+            dicDetail.Add(789, 1034);
+            dicDetail.Add(790, 1035);
+            dicDetail.Add(791, 1036);
+            dicDetail.Add(792, 1037);
+            dicDetail.Add(793, 1038);
+            dicDetail.Add(794, 1039);
+            dicDetail.Add(795, 1040);
+            dicDetail.Add(796, 1041);
+            dicDetail.Add(797, 1042);
+            dicDetail.Add(798, 1043);
+            dicDetail.Add(801, 1044);
+            dicDetail.Add(802, 1045);
+            dicDetail.Add(803, 1046);
+
+            Dictionary<int, int> dic = new Dictionary<int, int>();
+            dic.Add(806, 1027);
+            dic.Add(807, 1028);
+            dic.Add(808, 1029);
+            dic.Add(809, 1030);
+            dic.Add(810, 1031);
+            dic.Add(811, 1032);
+            dic.Add(812, 1033);
+
+
             foreach (var item in list_visa)
             {
-                var result = await _grpScheduleRep._sqlSugar.Updateable<Grp_VisaInfo>()
-               .SetColumns(it => it.CreateUserId == item.Operator)
-               .Where(s => s.Id == item.Id)
+                Fin_GroupExtraCost temp = new Fin_GroupExtraCost();
+                temp.Coefficient = item.coefficient;
 
-               //.UpdateColumns(s => new { s.Duty, s.ExpectBeginDt, s.ExpectEndDt, s.JobContent, s.Remark, s.StepStatus })
-               .ExecuteCommandAsync();
+                DateTime dtCrt;
+                bool b1 = DateTime.TryParse(item.OperatorsDate, out dtCrt);
+                if (b1)
+                {
+                    temp.CreateTime = dtCrt;
+                }
+                else {
+                    temp.CreateTime = DateTime.Now;
+                }
+
+                temp.CreateUserId = item.Operators;
+                temp.DeleteTime = "";
+                temp.DeleteUserId = 0;
+                temp.DiId = int.Parse(item.DIID);
+                temp.FilePath = item.FilePath;
+                temp.IsDel = item.IsDel;
+                temp.Price = item.Price;
+                temp.PriceCount = 1;
+                temp.PriceCurrency = item.Currency;
+
+                int detailId = 0;
+                if (dicDetail.ContainsKey(item.PriceTypeDetail)) {
+                    detailId = dicDetail[item.PriceTypeDetail];
+                }
+                temp.PriceDetailType = detailId;
+
+                temp.PriceDt = DateTime.Now;
+                temp.PriceName = item.PriceName;
+                temp.PriceSum = item.Price;
+
+                int tid = 0;
+                if (dic.ContainsKey(item.PriceType))
+                {
+                    tid = dic[item.PriceType];
+                }
+                temp.PriceType = tid;
+
+                temp.Remark = item.Remark;
+
+                await _airTicketResRep.AddAsync<Fin_GroupExtraCost>(temp);
             }
 
             return Ok(JsonView(true, "操作成功！"));

OASystem/OASystem.Domain/ViewModels/OA2014DB.cs

@@ -593,4 +593,132 @@ namespace OASystem.Domain.ViewModels
         public int IsMatchCreditCard { get; set; }
 
     }
+
+    public class OA2014_grouopExceed
+    {
+        int id;
+
+        /// <summary>
+        /// 主键编号
+        /// </summary>
+        public int Id
+        {
+            get { return id; }
+            set { id = value; }
+        }
+
+        string dIID;
+
+        /// <summary>
+        /// 团组外键编号
+        /// </summary>
+        public string DIID
+        {
+            get { return dIID; }
+            set { dIID = value; }
+        }
+
+        string priceName;
+
+        /// <summary>
+        /// 费用名称
+        /// </summary>
+        public string PriceName
+        {
+            get { return priceName; }
+            set { priceName = value; }
+        }
+
+        decimal price;
+
+        /// <summary>
+        /// 费用金额
+        /// </summary>
+        public decimal Price
+        {
+            get { return price; }
+            set { price = value; }
+        }
+
+        int currency;
+
+        /// <summary>
+        /// 费用币种
+        /// </summary>
+        public int Currency
+        {
+            get { return currency; }
+            set { currency = value; }
+        }
+
+        string filePath;
+
+        /// <summary>
+        /// 附件地址
+        /// </summary>
+        public string FilePath
+        {
+            get { return filePath; }
+            set { filePath = value; }
+        }
+
+        string remark;
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark
+        {
+            get { return remark; }
+            set { remark = value; }
+        }
+
+        int operators;
+
+        /// <summary>
+        /// 操作人
+        /// </summary>
+        public int Operators
+        {
+            get { return operators; }
+            set { operators = value; }
+        }
+
+        string operatorsDate;
+
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        public string OperatorsDate
+        {
+            get { return operatorsDate; }
+            set { operatorsDate = value; }
+        }
+
+        int isDel;
+
+        /// <summary>
+        /// 删除标识
+        /// </summary>
+        public int IsDel
+        {
+            get { return isDel; }
+            set { isDel = value; }
+        }
+
+        /// <summary>
+        /// 费用类型
+        /// </summary>
+        public int PriceType { get; set; }
+
+        /// <summary>
+        /// 系数
+        /// </summary>
+        public decimal coefficient { get; set; }
+
+        /// <summary>
+        /// 费用详细类型
+        /// </summary>
+        public int PriceTypeDetail { get; set; }
+    }
 }