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

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -2147,7 +2147,7 @@ namespace OASystem.API.Controllers
                                 {
                                     item.BankNo = item.BankType + ":" + item.BankNo?.Substring(0, 3);
                                 }
-                                
+
                             }
                             item.PrePrice = System.Decimal.Round(item.PrePrice, 2);
                             item.Price = System.Decimal.Round(item.Price, 2);
@@ -2178,8 +2178,8 @@ namespace OASystem.API.Controllers
                 throw;
             }
         }
-        
-        
+
+
         Dictionary<string, string> transDic = new Dictionary<string, string>();
 
         /// <summary>
@@ -4341,14 +4341,14 @@ namespace OASystem.API.Controllers
                         decimal dac1totalPrice = 0.00M, dac2totalPrice = 0.00M;
                         foreach (var item in dac1)
                         {
-                            item.Place =GetEnterExitCostExportCity(placeData, item.NationalTravelFeeId);
+                            item.Place = GetEnterExitCostExportCity(placeData, item.NationalTravelFeeId);
                             if (place.Contains(item.Place))
                             {
                                 continue;
                             }
                             DataRow row = dtdac1.NewRow();
 
-                            row["city"] =item.Place;
+                            row["city"] = item.Place;
 
                             string currency = _CurrDatas.Find(it => it.Id == item.Currency)?.Remark ?? "Unknwon";
                             decimal rate = rateDatas.Find(it => it.CurrencyName == currency)?.Rate ?? 0.00M;
@@ -4590,7 +4590,7 @@ namespace OASystem.API.Controllers
                             dac1totalPrice += rbmPrice;
                         }
 
-                        
+
 
 
                         dic.Add("dac1totalPrice", dac1totalPrice.ToString("#0.00"));
@@ -4772,7 +4772,7 @@ namespace OASystem.API.Controllers
         /// <param name="placeData"></param>
         /// <param name="nationalTravelFeeId"></param>
         /// <returns></returns>
-        private string GetEnterExitCostExportCity(List<Grp_NationalTravelFee> placeData,int nationalTravelFeeId)
+        private string GetEnterExitCostExportCity(List<Grp_NationalTravelFee> placeData, int nationalTravelFeeId)
         {
             string _city = string.Empty;
 
@@ -10138,7 +10138,7 @@ namespace OASystem.API.Controllers
 
                 int updateCount = 0;
 
-                if (oldOAClientList.Count > 0 )
+                if (oldOAClientList.Count > 0)
                 {
 
                     _sqlSugar.ChangeDatabase(DBEnum.OA2023DB);
@@ -10166,7 +10166,7 @@ namespace OASystem.API.Controllers
                             var clientComInfo = clientComInfos.Where(it => it.CompanyFullName.Equals(item.Company)).FirstOrDefault();
 
 
-                           
+
 
                             if (clientComInfo == null) // add
                             {
@@ -10235,7 +10235,7 @@ namespace OASystem.API.Controllers
                             continue;
                         }
 
-                        int airType= 0;
+                        int airType = 0;
 
                         if (item.AirType == "超经舱") airType = 459;
                         else if (item.AirType == "公务舱") airType = 458;
@@ -10280,7 +10280,7 @@ namespace OASystem.API.Controllers
 
         }
 
-        private  bool IsValidDate(string dateString, string format)
+        private bool IsValidDate(string dateString, string format)
         {
             DateTime dateValue;
             bool valid = DateTime.TryParseExact(dateString, format, CultureInfo.InvariantCulture, DateTimeStyles.None, out dateValue);
@@ -10680,7 +10680,7 @@ namespace OASystem.API.Controllers
 
             string fileName = "组团人员名单(" + DateTime.Now.ToString("yyyyhhddHHmmss") + ").doc";
 
-            var fileDir = AppSettingsHelper.Get("WordBasePath")+ "TourClientList/" + fileName;
+            var fileDir = AppSettingsHelper.Get("WordBasePath") + "TourClientList/" + fileName;
             doc.Save(fileDir);
             string Url = AppSettingsHelper.Get("WordBaseUrl") + "Office/Word/TourClientList/" + fileName;
             return Ok(JsonView(true, "操作成功！", Url));
@@ -10844,5 +10844,70 @@ namespace OASystem.API.Controllers
 
 
         #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="_dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> ChangeDataBase_Offi(PostTourClientListDownloadFile _dto)
+        {
+            _airTicketResRep.ChangeDataBase(DBEnum.OA2014DB);
+
+            string sqlOld = string.Format(@" Select * From OfficialActivities With(nolock) ");
+
+            List<OA2014_OfficialActivities> listOld = _airTicketResRep._sqlSugar.SqlQueryable<OA2014_OfficialActivities>(sqlOld).ToList();
+            Dictionary<string, int> dic = new Dictionary<string, int>();
+            dic.Add("座谈", 383);
+            dic.Add("参观", 384);
+            dic.Add("推介会", 385);
+            dic.Add("路演", 386);
+
+
+            _airTicketResRep.ChangeDataBase(DBEnum.OA2023DB);
+            foreach (var item in listOld)
+            {
+                Res_OfficialActivities temp = new Res_OfficialActivities();
+
+                temp.DiId = item.Diid;
+                temp.Type = item.Type;
+                temp.Client = item.Client;
+                temp.Date = item.Date;
+                temp.Time = item.Time;
+
+                temp.Address = item.Address;
+                temp.Contact = item.Contact;
+                temp.Job = item.Job;
+                temp.Tel = item.Tel;
+                temp.OfficialForm = dic[item.Form];
+
+                temp.Setting = item.Setting;
+                temp.Dresscode = item.Dresscode;
+                temp.Attendees = item.Attendees;
+                temp.IsNeedTrans = item.IsNeedTrans.ToLower() == "true" ? 1 : 0;
+                temp.Translators = item.Translators;
+
+                temp.language = item.Language;
+                temp.Trip = item.Trip;
+                temp.CreateUserId = item.Oper;
+                temp.CreateTime = DateTime.Parse(item.OpDate + " 00:00:00");
+                temp.Remark = "";
+
+                temp.IsDel = item.Isdel;
+                temp.IsSubmitApproval = item.IsSubmitApproval;
+                temp.IsPay = item.IsPay;
+
+                await _airTicketResRep.AddAsync<Res_OfficialActivities>(temp);
+            }
+
+
+            
+
+
+
+            return Ok(JsonView(true, "操作成功！"));
+        }
     }
 }

OASystem/OASystem.Domain/Dtos/Resource/OfficialActivitiesDto.cs

@@ -105,5 +105,13 @@ namespace OASystem.Domain.Dtos.Resource
         /// </summary>
         public string Remark { get; set; }
 
+        /// <summary>
+        /// 是否报批
+        /// </summary>
+        public int IsSubmitApproval { get; set; }
+        /// <summary>
+        /// 是否付费
+        /// </summary>
+        public int IsPay { get; set; }
     }
 }

OASystem/OASystem.Domain/Entities/Resource/Res_OfficialActivities.cs

@@ -14,7 +14,7 @@ namespace OASystem.Domain.Entities.Resource
     {    /// <summary>
          /// 团组ID
          /// </summary>
-        [SugarColumn(IsNullable =true,ColumnDataType ="int")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int DiId { get; set; }
         /// <summary>
         /// 邀请方 1  公务方 0 
@@ -96,5 +96,17 @@ namespace OASystem.Domain.Entities.Resource
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(MAX)")]
         public string Trip { get; set; }
+
+        /// <summary>
+        /// 是否报批
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsSubmitApproval { get; set; }
+        /// <summary>
+        /// 是否付费
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsPay { get; set; }
+
     }
 }

OASystem/OASystem.Domain/ViewModels/Resource/TicketBlackCodeView.cs

@@ -11,4 +11,228 @@ namespace OASystem.Domain.ViewModels.Resource
     {
         public string CreateName { get; set; }
     }
+
+    public class OA2014_OfficialActivities
+    {
+        int id;
+
+        public int Id
+        {
+            get { return id; }
+            set { id = value; }
+        }
+        int diid;
+        /// <summary>
+        /// 团组ID
+        /// </summary>
+        public int Diid
+        {
+            get { return diid; }
+            set { diid = value; }
+        }
+
+        int dovid;
+        /// <summary>
+        /// DeleOverView数据ID
+        /// </summary>
+        public int Dovid
+        {
+            get { return dovid; }
+            set { dovid = value; }
+        }
+        int type;
+        /// <summary>
+        /// 0带公务 1不带公务 2纯公务
+        ///  邀请方 1  公务方 0 
+        /// </summary>
+        public int Type
+        {
+            get { return type; }
+            set { type = value; }
+        }
+        string client;
+        /// <summary>
+        /// 公务单位
+        /// </summary>
+        public string Client
+        {
+            get { return client; }
+            set { client = value; }
+        }
+        string date;
+        /// <summary>
+        /// 公务日期
+        /// </summary>
+        public string Date
+        {
+            get { return date; }
+            set { date = value; }
+        }
+        string time;
+        /// <summary>
+        /// 精确时间
+        /// </summary>
+        public string Time
+        {
+            get { return time; }
+            set { time = value; }
+        }
+
+        string address;
+        /// <summary>
+        /// 地址
+        /// </summary>
+        public string Address
+        {
+            get { return address; }
+            set { address = value; }
+        }
+        string contact;
+        /// <summary>
+        /// 联系人
+        /// </summary>
+        public string Contact
+        {
+            get { return contact; }
+            set { contact = value; }
+        }
+
+
+        string job;
+        /// <summary>
+        /// 联系人职务
+        /// </summary>
+        public string Job
+        {
+            get { return job; }
+            set { job = value; }
+        }
+
+        string tel;
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        public string Tel
+        {
+            get { return tel; }
+            set { tel = value; }
+        }
+        string form;
+        /// <summary>
+        /// 公务形式
+        /// </summary>
+        public string Form
+        {
+            get { return form; }
+            set { form = value; }
+        }
+
+        string setting;
+        /// <summary>
+        /// 公务方背景
+        /// </summary>
+        public string Setting
+        {
+            get { return setting; }
+            set { setting = value; }
+        }
+        string dresscode;
+        /// <summary>
+        /// 着装要求
+        /// </summary>
+        public string Dresscode
+        {
+            get { return dresscode; }
+            set { dresscode = value; }
+        }
+
+        string attendees;
+        /// <summary>
+        /// 参会人员
+        /// </summary>
+        public string Attendees
+        {
+            get { return attendees; }
+            set { attendees = value; }
+        }
+
+
+        string isNeedTrans;
+        /// <summary>
+        /// 是否需要翻译
+        /// </summary>
+        public string IsNeedTrans
+        {
+            get { return isNeedTrans; }
+            set { isNeedTrans = value; }
+        }
+
+
+        string translators;
+        /// <summary>
+        /// 翻译人员
+        /// </summary>
+        public string Translators
+        {
+            get { return translators; }
+            set { translators = value; }
+        }
+
+
+        string language;
+        /// <summary>
+        /// 翻译语种
+        /// </summary>
+        public string Language
+        {
+            get { return language; }
+            set { language = value; }
+        }
+
+        string trip;
+        /// <summary>
+        /// 暂定行程
+        /// </summary>
+        public string Trip
+        {
+            get { return trip; }
+            set { trip = value; }
+        }
+        int oper;
+        /// <summary>
+        /// 操作人员
+        /// </summary>
+        public int Oper
+        {
+            get { return oper; }
+            set { oper = value; }
+        }
+        string opDate;
+        /// <summary>
+        /// 日期
+        /// </summary>
+        public string OpDate
+        {
+            get { return opDate; }
+            set { opDate = value; }
+        }
+        int isdel;
+        /// <summary>
+        /// 删除标识
+        /// </summary>
+        public int Isdel
+        {
+            get { return isdel; }
+            set { isdel = value; }
+        }
+        /// <summary>
+        /// 是否报批
+        /// </summary>
+        public int IsSubmitApproval { get; set; }
+        /// <summary>
+        /// 是否付费
+        /// </summary>
+        public int IsPay { get; set; }
+
+    }
 }