工资计算 处理 ”名字“ and ”部门_名字“ 打卡查询

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1512,29 +1512,30 @@ namespace OASystem.API.Controllers
                                     _detail.BusName = touristGuideGroundReservations.BusName;
                                 }
 
+                                _detail.PriceNameContent = touristGuideGroundReservations.PriceName;
 
-                                bool isInt = int.TryParse(touristGuideGroundReservations.Area, out int cityId);
+                                //bool isInt = int.TryParse(touristGuideGroundReservations.Area, out int cityId);
 
-                                if (isInt)
-                                {
-                                    var cityInfo = cityData.Find(it => it.Id == cityId);
-                                    if (cityInfo != null)
-                                    {
-                                        string nameContent = $@"{cityInfo.Country}-{cityInfo.City}";
+                                //if (isInt)
+                                //{
+                                //    var cityInfo = cityData.Find(it => it.Id == cityId);
+                                //    if (cityInfo != null)
+                                //    {
+                                //        string nameContent = $@"{cityInfo.Country}-{cityInfo.City}";
 
-                                        var carFeeItem = carFeeItems.Find(it => it.Id == touristGuideGroundReservations.PriceType);
-                                        if (carFeeItem != null)
-                                        {
-                                            nameContent += $@"({carFeeItem.Name})";
-                                        }
-                                        _detail.PriceNameContent = nameContent;
+                                //        var carFeeItem = carFeeItems.Find(it => it.Id == touristGuideGroundReservations.PriceType);
+                                //        if (carFeeItem != null)
+                                //        {
+                                //            nameContent += $@"({carFeeItem.Name})";
+                                //        }
+                                //        _detail.PriceNameContent = nameContent;
 
-                                    }
-                                }
-                                else
-                                {
-                                    _detail.PriceNameContent = touristGuideGroundReservations.Area;
-                                }
+                                //    }
+                                //}
+                                //else
+                                //{
+                                //    _detail.PriceNameContent = touristGuideGroundReservations.Area;
+                                //}
 
 
 
@@ -6460,7 +6461,6 @@ namespace OASystem.API.Controllers
                                 string exstr = ex.Message.ToString();
                             }
                         }
-
                     }
 
                     //排序
@@ -6758,7 +6758,6 @@ namespace OASystem.API.Controllers
             return str;
         }
 
-
         /// <summary>
         /// 根据月份返回天数
         /// </summary>
@@ -9344,7 +9343,6 @@ namespace OASystem.API.Controllers
             {
             }
             //删除多余行
-
             while (tableOne.Rows.Count > dt.Rows.Count + 1)
             {
                 tableOne.Rows.RemoveAt(dt.Rows.Count + 1);

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -1811,7 +1811,7 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                 //应×××（邀请方名称+邀请人职务和姓名）的邀请，我单位拟派×××（职务、姓名）等×人（人数）于×××年×××月×××日赴×××（国家或地区）进行×××（出访目的）。现请示如下。
                 string visitDateStr = @$"{groupInfo.VisitDate.Year}年{groupInfo.VisitDate.Month}月{groupInfo.VisitDate.Day}日";
                 string obInfoStr = "";
-                string obBackgroundStr = "";//出访背景
+                string obBackgroundStr = "×××";//出访背景
                 foreach (var ob in obDatas)
                 {
                     obInfoStr += @$"{ob.Client}{ob.Job}{ob.Contact}、";
@@ -1827,6 +1827,7 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                 dic.Add("AskSubTitle", askSubTitle);
 
                 //出访背景
+                obBackgroundStr = "×××";//出访背景
                 dic.Add("OBSetting", obBackgroundStr);
 
                 //出访目的
@@ -1837,31 +1838,35 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                 //1.拜访×××（机构名称）×××（姓名、职务）洽谈（或调研、推动等）×××（项目或机构名称等）。（例：拜会×××经济与发展司司长×××，商讨“×××活动”相关筹备工作。）
                 //2.拜访×××（机构名称）×××（姓名、职务）洽谈（或调研、推动等）×××（项目或机构名称等）。（例：拜会×××经济与发展司司长×××，商讨“×××活动”相关筹备工作。）
 
-                string taskStr = "";
-                List<string> countrys = groupInfo.VisitCountry.Split("、").ToList();
-                int countryIndex = 1;
-                foreach (var item in countrys)
-                {
-                    string taskTitle = $"（{GetToUpperNumber(countryIndex)}）{item}\r\n";
+                string taskStr = "××××"; ;
+                //List<string> countrys = groupInfo.VisitCountry.Split("、").ToList();
+                //int countryIndex = 1;
+                //foreach (var item in countrys)
+                //{
+                //    string taskTitle = $"（{GetToUpperNumber(countryIndex)}）{item}\r\n";
 
-                    string taskContent = "";
-                    var countryObDatas = obDatas.Where(it => it.Client.Contains(item)).ToList();
-                    int obIndex = 1;
-                    foreach (var obInfo in countryObDatas)
-                    {
-                        taskContent += $"{obIndex}. 拜访{obInfo.Client}（{obInfo.Contact}、{obInfo.Job}）洽谈“{groupInfo.VisitPurpose}”相关工作。\r\n";
-                    }
+                //    string taskContent = "";
+                //    var countryObDatas = obDatas.Where(it => it.Client.Contains(item)).ToList();
+                //    int obIndex = 1;
+                //    foreach (var obInfo in countryObDatas)
+                //    {
+                //        taskContent += $"{obIndex}. 拜访{obInfo.Client}（{obInfo.Contact}、{obInfo.Job}）洽谈“{groupInfo.VisitPurpose}”相关工作。\r\n";
+                //    }
 
-                    taskStr += $"{taskTitle}{taskContent}";
+                //    taskStr += $"{taskTitle}{taskContent}";
+
+                //    countryIndex++;
+                //}
 
-                    countryIndex++;
-                }
                 //出访任务
                 dic.Add("TaskContent", taskStr);
 
                 //出访时间
                 //代表团拟于××年×月×日—×月×日出访，在外停留×天。其中，××国家（或地区）×天，××国家（或地区）×天。
                 string visitCountryStr = $"[OP行程单读取]";
+                visitCountryStr = GeneralMethod.GetCountryStandingTime(groupInfo.Id); //计算国家出访天数
+
+
                 string visitTimeQuantumStr = $"代表团拟于{groupInfo.VisitStartDate.Year}年{groupInfo.VisitStartDate.Month}月{groupInfo.VisitStartDate.Day}日—{groupInfo.VisitEndDate.Month}月{groupInfo.VisitEndDate.Day}日出访，在外停留{groupInfo.VisitDays}天。其中，{visitCountryStr}。";
                 //出访时间
                 dic.Add("TimeQuantum", visitTimeQuantumStr);
@@ -1871,8 +1876,22 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                 string lineStr = GeneralMethod.GetGroupCityLine(groupInfo.Id, "—");
                 dic.Add("Line", lineStr);
 
-                //TripInfo
-                dic.Add("Line", lineStr);
+                //scheduling //行程安排
+                string schedulingStr = $"[OP行程单暂未生成]";
+
+                var tripInfo = _sqlSugar.Queryable<Grp_TravelList>().Where(it => it.IsDel == 0 && it.Diid == groupInfo.Id).OrderBy(it => it.Days).ToList();
+
+                if (tripInfo.Count > 0 )
+                {
+                    schedulingStr = "";
+
+                    foreach (var item in tripInfo)
+                    {
+                        schedulingStr += $"{item.Date}（{item.WeekDay}）\r\n{item.Trip}\r\n";
+                    }
+                }
+
+                dic.Add("Scheduling", schedulingStr);
 
                 #region 填充word模板书签内容
                 foreach (var key in dic.Keys)
@@ -1916,7 +1935,12 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                         birthDayStr = Convert.ToDateTime(birthDay).ToString("yyyy-MM-dd");
                     }
                     builder.Write(birthDayStr);
+                }
 
+                //删除多余行
+                while (tableOne.Rows.Count > guestInfos.Count + 1)
+                {
+                    tableOne.Rows.RemoveAt(guestInfos.Count + 1);
                 }
 
                 var fileDir = AppSettingsHelper.Get("WordBasePath");

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -450,7 +450,7 @@ namespace OASystem.API.Controllers
 
                 List<GroupCTGGRFeeView> groupCTGGRFeeViews = new List<GroupCTGGRFeeView>();
 
-                string CTGGRFeeSql = string.Format(@"Select ctggr.Id As CTGGRId,ctggr.DiId As CTGGRDiId,ctggr.Area,ctggrc.*,ctggrc.Price As PayMoney,
+                string CTGGRFeeSql = string.Format(@"Select ctggr.Id As CTGGRId,ctggr.DiId As CTGGRDiId,ctggr.PriceName As Area,ctggrc.*,ctggrc.Price As PayMoney,
                                                      sd2.name As PaymentCurrency,ccp.PayPercentage,
                                                      (ctggrc.Price / (ccp.PayPercentage / 100)) As AmountPaid,
                                                      (ctggrc.Price / (ccp.PayPercentage / 100) - ctggrc.Price) As BalancePayment,

OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -15,10 +15,12 @@ using OASystem.Domain.ViewModels.Groups;
 using OASystem.Domain.ViewModels.JuHeExchangeRate;
 using OASystem.Infrastructure.Repositories.CRM;
 using OASystem.Infrastructure.Repositories.Groups;
+using System.Data;
 using System.IdentityModel.Tokens.Jwt;
 using System.IO.Compression;
 using System.Security.Claims;
 using System.Web;
+using static OpenAI.GPT3.ObjectModels.SharedModels.IOpenAiModels;
 
 namespace OASystem.API.OAMethodLib
 {
@@ -1430,7 +1432,623 @@ namespace OASystem.API.OAMethodLib
         #endregion
 
 
-        #region op行程单 
+        #region op行程单，黑屏幕代码
+
+        public static string GetCountryStandingTime(int diId) 
+        {
+            DataTable datas =  GetTableByBlackCode(diId);
+
+            string countryStr = "";
+            if (datas.Rows.Count > 0 )
+            {
+                var airDatas = from row in datas.AsEnumerable()
+                               select new
+                               {
+                                   Three = row.Field<string>("Three"),
+                                   Day = row.Field<string>("Day"),
+                                   ArrivedDate = row.Field<string>("ArrivedDate"),
+                               };
+
+
+                //三字码信息
+                List<Res_ThreeCode> listcode = _dirRep._sqlSugar.Queryable<Res_ThreeCode>().Where(x => x.IsDel == 0).ToList();
+                //string countryStr = "";
+                int index = 0;
+                List<string> cityCodes = new List<string>();
+                //去掉开始和结束城市
+                foreach (var row in airDatas) 
+                {
+                    if (index == 0) cityCodes.Add(row.Three.Substring(3, 3)); //到达国家
+                    else if (airDatas.Count()-1 == index) cityCodes.Add(row.Three.Substring(0, 3)); //到达国家
+                    else cityCodes.Add(row.Three.Substring(0, 3)); //到达国家
+
+                    index++;
+                }
+                cityCodes = cityCodes.Distinct().ToList();
+
+                foreach (var item in cityCodes)
+                {
+                    var airData = airDatas.Where(it => it.Three.Contains(item)).ToList();
+                    string country = listcode.Find(it => it.Three.Equals(item))?.Country ?? "Unknown";
+                    if (country.Equals("中国"))
+                    {
+                        country = listcode.Find(it => it.Three.Equals(item))?.City ?? "Unknown";
+                    }
+                    int days = 0;
+                    if (airData.Count == 2)
+                    {
+                        DateTime arr_dt = Convert.ToDateTime(airData[0].ArrivedDate); //抵达时间
+                        DateTime dep_dt = Convert.ToDateTime(airData[1].Day); //离开时间
+                        days = (dep_dt - arr_dt).Days;
+                        countryStr += $@"{country}停留{days}日、";
+                    }
+                }
+                if (countryStr.Length > 0) countryStr = countryStr.Substring(0, countryStr.Length - 1);
+
+            }
+
+            return countryStr;
+        }
+
+        /// <summary>
+        ///根据机票黑屏代码整理DataTable
+        /// </summary>
+        /// <param name="diid"></param>
+        /// <returns></returns>
+        public static  DataTable GetTableByBlackCode(int diid)
+        {
+            //黑屏代码信息
+            List<Air_TicketBlackCode> listcode = _dirRep._sqlSugar.Queryable<Air_TicketBlackCode>().Where(x => x.DiId == diid && x.IsDel == 0).ToList();
+
+            //测试数据为序号,航班号,起飞日期,三字码,起飞时刻,到达时刻,出发航站楼,到达航站楼,机型,飞行时间
+            //1.3U8391   TU17NOV CTUCAI  0220 0715   T1 T2  330  10H55M
+            DataTable dt = new DataTable();
+            dt.Columns.Add("Fliagtcode", typeof(string)); //航班号
+            dt.Columns.Add("Date", typeof(string));//起飞日期
+            dt.Columns.Add("Three", typeof(string));//三字码
+            dt.Columns.Add("StartTime", typeof(string));//起飞时刻
+            dt.Columns.Add("EndTime", typeof(string));//到达时刻
+            dt.Columns.Add("StartBuilding", typeof(string));//出发航站楼
+            dt.Columns.Add("EndBuilding", typeof(string));//到达航站楼
+            dt.Columns.Add("AirModel", typeof(string)); //机型
+            dt.Columns.Add("FlightTime", typeof(string));//飞行时间
+            dt.Columns.Add("Day", typeof(string));//整理的起飞日期;作为排序依据 
+            dt.Columns.Add("ArrivedDate", typeof(string));//整理的到达日期
+            dt.Columns.Add("Error", typeof(string));//整理的到达日期
+            dt.Columns.Add("Sign", typeof(string));//标识：0表示为原生黑屏代码、1表示“+1”新增的黑屏代码
+
+            //判断是否录入黑屏代码
+            if (listcode.Count() == 0 || listcode == null)
+            {
+                dt.Rows.Add(null, null, null, null, null, null, null, null, null, null, null, "黑屏代码未录入!", null);
+            }
+            else
+            {
+                //读取单段黑屏代码
+                for (int i = 0; i < listcode.Count; i++)
+                {
+                    //去除序号
+                    string[] CodeList = Regex.Split(listcode[i].BlackCode, "\\d+\\.", RegexOptions.IgnoreCase);
+                    //去除多余空格，方法一Linq扩展方法
+                    CodeList = CodeList.Where(str => str != "").ToArray();
+                    CodeList = CodeList.Where(str => str != " ").ToArray();
+
+                    //年
+                    int year = Convert.ToInt32(DateTime.Now.Year.ToString());
+
+                    //读取单条黑屏代码
+                    for (int j = 0; j < CodeList.Count(); j++)
+                    {
+                        //去除多余空格，方法二使用Split()方法进行分割,分割有一个选项是RemoveEmptyEntries
+                        CodeList[j] = CodeList[j].Replace("\r\n", string.Empty).Replace("\\r\\n", string.Empty).TrimStart().TrimEnd();
+                        string[] Info = CodeList[j].Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+
+                        //string[] Info = CodeList[j].Replace("\r\n", string.Empty).Replace("\\r\\n", string.Empty)
+                        //                   .TrimStart().TrimEnd().Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+
+                        //去除多余空格
+                        Info = Info.Where(str => str != "").ToArray();
+                        Info = Info.Where(str => str != " ").ToArray();
+
+                        //判断黑屏代码是否正确拆分; 理应拆成9段
+                        if (Info.Count() < 9)
+                        {
+                            dt.Rows.Add(null, null, null, null, null, null, null, null, null, null, null, "本团组第" + (i + 1) + "段黑屏代码中第" + (j + 1) + " 条有误,请联系机票同事核对", null);
+                        }
+                        else
+                        {
+                            try
+                            {
+                                //月                  
+                                int month = Convert.ToInt32(GetLonger(Info[1].Substring(4, 3)));
+                                //日
+                                int day = Convert.ToInt32(Info[1].Substring(2, 2));
+
+                                #region 逐一比较月份,判断是否翻年;逐一比较三字码顶真,判断是否跑错机场
+                                if (j > 0)
+                                {
+                                    string[] Temp = CodeList[j - 1].Replace("\r\n", string.Empty).Replace("\\r\\n", string.Empty)
+                                                  .TrimStart().TrimEnd().Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+                                    Temp = Temp.Where(str => str != "").ToArray();
+                                    Temp = Temp.Where(str => str != " ").ToArray();
+                                    int monthTemp = Convert.ToInt32(GetLonger(Temp[1].Substring(4, 3)));
+                                    // 如果相邻月份之差小于0,则证明次一条年份需+1
+                                    if (month - monthTemp < 0)
+                                    {
+                                        year = year + 1;
+                                    }
+                                    //如果相邻代码三字码不顶真，提醒
+                                    string FootThree = Temp[2].Substring(3, 3);
+                                    string HeadThree = Info[2].Substring(0, 3);
+                                    if (FootThree != HeadThree)
+                                    {
+                                        //DelegationInfoService s = new DelegationInfoService();
+                                        //UsersService us = new UsersService();
+                                        //GroupsTaskAssignmentService gts = new GroupsTaskAssignmentService();
+
+                                        //77	行程
+                                        List<Grp_GroupsTaskAssignment> list2 = _dirRep._sqlSugar.Queryable<Grp_GroupsTaskAssignment>().Where(x => x.CTId == 77 && x.DIId == diid && x.IsDel == 0).ToList();
+                                        foreach (var temp in list2)
+                                        {
+                                            //if (temp.UId != 21)
+                                            //SendAndReturn(us.GetUsersByID(temp.UId).Email,
+                                            //    "黑屏代码提醒",
+                                            //   s.GetDelegationInfoByID(diid).TeamName + "的机票黑屏代码中，相邻航段的三字码不连续，请查看！");
+                                        }
+
+                                        //85	机票预订
+                                        List<Grp_GroupsTaskAssignment> list6 = _dirRep._sqlSugar.Queryable<Grp_GroupsTaskAssignment>().Where(x => x.CTId == 85 && x.DIId == diid && x.IsDel == 0).ToList();
+                                        foreach (var temp in list6)
+                                        {
+                                            //if (temp.UId != 21)
+                                            //SendAndReturn(us.GetUsersByID(temp.UId).Email,
+                                            //    "黑屏代码提醒",
+                                            //     s.GetDelegationInfoByID(diid).TeamName + "的机票黑屏代码中，相邻航段的三字码不连续，请查看！");
+                                        }
+                                    }
+
+                                }
+                                #endregion
+
+
+                                #region 判断到达日期是否需要加1
+                                if (Info[4].Contains("+"))
+                                {
+                                    //日期+1
+                                    day = day + 1;
+
+                                    //判断是否进入下一月
+                                    if (day > Convert.ToInt32(GetDaysByMonth(Info[1].Substring(4, 3), year)))
+                                    {
+                                        day = day - Convert.ToInt32(GetDaysByMonth(Info[1].Substring(4, 3), year));
+                                        month = month + 1;
+
+                                        //判断是否进入下一年
+                                        if (month > 12)
+                                        {
+                                            month = month - 12;
+                                            year = year + 1;
+                                        }
+                                    }
+
+                                    //月份整理格式
+                                    string monthTemp = month.ToString();
+                                    if (month < 10)
+                                    {
+                                        monthTemp = "0" + monthTemp;
+                                    }
+                                    //日期整理格式
+                                    string daytemp = day.ToString();
+                                    if (day < 10)
+                                    {
+
+                                        daytemp = "0" + daytemp;
+                                    }
+
+                                    string temp = Info[4].Split('+')[0];
+
+                                    //添加起飞数据
+                                    dt.Rows.Add(Info[0],
+                                       Info[1],
+                                       Info[2],
+                                       Info[3],
+                                       temp,
+                                       Info[5],
+                                       Info[6],
+                                       Info[7],
+                                       Info[8],
+                                       year + "-" + GetLonger(Info[1].Substring(4, 3)) + "-" + Info[1].Substring(2, 2),
+                                       year + "-" + monthTemp + "-" + daytemp,
+                                       "",
+                                       "0");
+                                    //加1天，添加到达数据
+                                    dt.Rows.Add(Info[0],
+                                       Info[1].Replace(Info[1].Substring(2, 2), daytemp),
+                                       Info[2],
+                                       Info[3],
+                                       temp,
+                                       Info[5],
+                                       Info[6],
+                                       Info[7],
+                                       Info[8],
+                                       year + "-" + monthTemp + "-" + daytemp,
+                                       year + "-" + monthTemp + "-" + daytemp,
+                                       "",
+                                       "1");
+                                }
+                                else
+                                {
+                                    //月份整理格式
+                                    string monthTemp = month.ToString();
+                                    if (month < 10)
+                                    {
+                                        monthTemp = "0" + monthTemp;
+                                    }
+                                    //日期整理格式
+                                    string daytemp = day.ToString();
+                                    if (day < 10)
+                                    {
+
+                                        daytemp = "0" + daytemp;
+                                    }
+
+                                    dt.Rows.Add(Info[0],
+                                        Info[1],
+                                        Info[2],
+                                        Info[3],
+                                        Info[4],
+                                        Info[5],
+                                        Info[6],
+                                        Info[7],
+                                        Info[8],
+                                        year + "-" + monthTemp + "-" + daytemp,
+                                        year + "-" + monthTemp + "-" + daytemp,
+                                        "",
+                                        "0");
+                                }
+                                #endregion
+                            }
+                            catch (Exception ex)
+                            {
+                                string exstr = ex.Message.ToString();
+                            }
+                        }
+
+                    }
+
+                    //排序
+                    dt.DefaultView.Sort = "Day asc";
+                    dt = dt.DefaultView.ToTable();
+                }
+            }
+
+            return dt;
+        }
+
+        /// <summary>
+        /// 根据星期,月份的缩写,转换成数字或者全称
+        /// 根据币种中文名称返回币种代码
+        /// 根据数字返回机型型号【2、3开头的就是空客，比如空客320，7开头的就是波音，比如波音777】
+        /// 20210903贾文滔
+        /// </summary>
+        /// <param name="startDate"></param>
+        /// <param name="endDate"></param>
+        /// <returns></returns>
+        public static string GetLonger(string temp)
+        {
+            string str = "";
+            switch (temp.ToUpper())
+            {
+                case "美元":
+                    str = "USD";
+                    break;
+                case "日元":
+                    str = "JPY";
+                    break;
+                case "英镑":
+                    str = "GBP";
+                    break;
+                case "欧元":
+                    str = "EUR";
+                    break;
+                case "港币":
+                    str = "HKD";
+                    break;
+                case "MO":
+                    str = "星期一";
+                    break;
+                case "TU":
+                    str = "星期二";
+                    break;
+                case "WE":
+                    str = "星期三";
+                    break;
+                case "TH":
+                    str = "星期四";
+                    break;
+                case "FR":
+                    str = "星期五";
+                    break;
+                case "SA":
+                    str = "星期六";
+                    break;
+                case "SU":
+                    str = "星期天";
+                    break;
+                case "JAN":
+                    str = "01";
+                    break;
+                case "FEB":
+                    str = "02";
+                    break;
+                case "MAR":
+                    str = "03";
+                    break;
+                case "APR":
+                    str = "04";
+                    break;
+                case "MAY":
+                    str = "05";
+                    break;
+                case "JUN":
+                    str = "06";
+                    break;
+                case "JUL":
+                    str = "07";
+                    break;
+                case "AUG":
+                    str = "08";
+                    break;
+                case "SEP":
+                    str = "09";
+                    break;
+                case "OCT":
+                    str = "10";
+                    break;
+                case "NOV":
+                    str = "11";
+                    break;
+                case "DEC":
+                    str = "12";
+                    break;
+                case "MONDAY":
+                    str = "星期一";
+                    break;
+                case "TUESDAY":
+                    str = "星期二";
+                    break;
+                case "WEDNESDAY":
+                    str = "星期三";
+                    break;
+                case "THURSDAY":
+                    str = "星期四";
+                    break;
+                case "FRIDAY":
+                    str = "星期五";
+                    break;
+                case "SATURDAY":
+                    str = "星期六";
+                    break;
+                case "SUNDAY":
+                    str = "星期日";
+                    break;
+                case "01":
+                    str = "JAN";
+                    break;
+                case "02":
+                    str = "FEB";
+                    break;
+                case "03":
+                    str = "MAR";
+                    break;
+                case "04":
+                    str = "APR";
+                    break;
+                case "05":
+                    str = "MAY";
+                    break;
+                case "06":
+                    str = "JUN";
+                    break;
+                case "07":
+                    str = "JUL";
+                    break;
+                case "08":
+                    str = "AUG";
+                    break;
+                case "09":
+                    str = "SEP";
+                    break;
+                case "10":
+                    str = "OCT";
+                    break;
+                case "11":
+                    str = "NOV";
+                    break;
+                case "12":
+                    str = "DEC";
+                    break;
+                case "2":
+                    str = "空客A";
+                    break;
+                case "3":
+                    str = "空客A";
+                    break;
+                case "7":
+                    str = "波音";
+                    break;
+            }
+
+            return str;
+        }
+
+        /// <summary>
+        /// 根据月份返回天数
+        /// </summary>
+        /// <param name="temp"></param>
+        /// <returns></returns>
+        public static string GetDaysByMonth(string Month, int year)
+        {
+            string str = "";
+            //判断是否是闰年
+            if (DateTime.IsLeapYear(year) == false)
+            {
+                switch (Month.ToUpper())
+                {
+                    case "JAN":
+                        str = "31";
+                        break;
+                    case "FEB":
+                        str = "28";
+                        break;
+                    case "MAR":
+                        str = "31";
+                        break;
+                    case "APR":
+                        str = "30";
+                        break;
+                    case "MAY":
+                        str = "31";
+                        break;
+                    case "JUN":
+                        str = "30";
+                        break;
+                    case "JUL":
+                        str = "31";
+                        break;
+                    case "AUG":
+                        str = "31";
+                        break;
+                    case "SEP":
+                        str = "30";
+                        break;
+                    case "OCT":
+                        str = "31";
+                        break;
+                    case "NOV":
+                        str = "30";
+                        break;
+                    case "DEC":
+                        str = "31";
+                        break;
+                    case "01":
+                        str = "31";
+                        break;
+                    case "02":
+                        str = "28";
+                        break;
+                    case "03":
+                        str = "31";
+                        break;
+                    case "04":
+                        str = "30";
+                        break;
+                    case "05":
+                        str = "31";
+                        break;
+                    case "06":
+                        str = "30";
+                        break;
+                    case "07":
+                        str = "31";
+                        break;
+                    case "08":
+                        str = "31";
+                        break;
+                    case "09":
+                        str = "30";
+                        break;
+                    case "10":
+                        str = "31";
+                        break;
+                    case "11":
+                        str = "30";
+                        break;
+                    case "12":
+                        str = "31";
+                        break;
+                }
+            }
+            else
+            {
+                switch (Month.ToUpper())
+                {
+                    case "JAN":
+                        str = "31";
+                        break;
+                    case "FEB":
+                        str = "29";
+                        break;
+                    case "MAR":
+                        str = "31";
+                        break;
+                    case "APR":
+                        str = "30";
+                        break;
+                    case "MAY":
+                        str = "31";
+                        break;
+                    case "JUN":
+                        str = "30";
+                        break;
+                    case "JUL":
+                        str = "31";
+                        break;
+                    case "AUG":
+                        str = "31";
+                        break;
+                    case "SEP":
+                        str = "30";
+                        break;
+                    case "OCT":
+                        str = "31";
+                        break;
+                    case "NOV":
+                        str = "30";
+                        break;
+                    case "DEC":
+                        str = "31";
+                        break;
+                    case "01":
+                        str = "31";
+                        break;
+                    case "02":
+                        str = "29";
+                        break;
+                    case "03":
+                        str = "31";
+                        break;
+                    case "04":
+                        str = "30";
+                        break;
+                    case "05":
+                        str = "31";
+                        break;
+                    case "06":
+                        str = "30";
+                        break;
+                    case "07":
+                        str = "31";
+                        break;
+                    case "08":
+                        str = "31";
+                        break;
+                    case "09":
+                        str = "30";
+                        break;
+                    case "10":
+                        str = "31";
+                        break;
+                    case "11":
+                        str = "30";
+                        break;
+                    case "12":
+                        str = "31";
+                        break;
+                }
+            }
+            return str;
+        }
 
         /// <summary>
         /// op行程单 团组 城市路径

OASystem/OASystem.Api/OAMethodLib/PayrollComputation.cs

@@ -64,6 +64,15 @@ namespace OASystem.API.OAMethodLib
                 return _result;
             }
 
+            //Task<QYWX_UserInfosView> GetUserInfosAsync()
+            //QYWX_UserInfosView usersView = await _qiYeWeChatApiService.GetUserInfosAsync();
+            //if (usersView.errcode != 0)
+            //{
+            //    _result.Msg = $"【企业微信】【打卡】【获取员工基础信息】【Msg】{userIdListView.errmsg}";
+            //    return _result;
+            //}
+
+
             List<string> qyWhchatIdList = new List<string>();
             qyWhchatIdList = userIdListView.dept_user.Select(it => it.userid).ToList();
             CheckInDayDataView checkInDayDataView = await _qiYeWeChatApiService.GetCheckInDayDataAsync(qyWhchatIdList, startDt, endDt);
@@ -138,6 +147,50 @@ namespace OASystem.API.OAMethodLib
             string _name = "";
             try
             {
+                #region 手动配置企业员工userid,通过userid 去匹配打卡数据
+                //Dictionary<string, string> wx_useridDic = new Dictionary<string, string>();
+                //wx_useridDic.Add("张海麟", "fred.chang@pan-american-intl.com");
+                //wx_useridDic.Add("罗诗怡", "lsyyyy");
+                //wx_useridDic.Add("赖红燕", "LaiHongYan");
+                //wx_useridDic.Add("刘一茹", "liuyiru");
+                //wx_useridDic.Add("李雯琪", "LiWenQi");
+                //wx_useridDic.Add("罗聪惠", "LuoCongHui");
+                //wx_useridDic.Add("肖俊杰", "20230410");
+                //wx_useridDic.Add("朱成梅", "amy.zhu@pan-american-intl.com");
+                //wx_useridDic.Add("伏虹瑾", "FuHongJin");
+                //wx_useridDic.Add("曾艳", "judy.zeng@pan-american-intl.com");
+                //wx_useridDic.Add("舒庆", "cilina.shu@pan-american-intl.com");
+                //wx_useridDic.Add("高媛媛", "GaoYuanYuan");
+                //wx_useridDic.Add("龙畑恬", "longtiantian");
+                //wx_useridDic.Add("叶琪琪", "YeQiQi");
+                //wx_useridDic.Add("王鸽", "ellisa.wang@pan-american-intl.com");
+                //wx_useridDic.Add("赵雅琪", "ZhaoYaQi");
+                //wx_useridDic.Add("陈思帆", "ChenSiFan");
+                //wx_useridDic.Add("廖文雅", "LiaoWenYa");
+                //wx_useridDic.Add("李敏", "annie.li@pan-american-intl.com");
+                //wx_useridDic.Add("李明华", "LiMingHua");
+                //wx_useridDic.Add("李文婷", "LiWenTing");
+                //wx_useridDic.Add("仇久龙", "rf");
+                //wx_useridDic.Add("宋夏雨", "songxiayu");
+                //wx_useridDic.Add("王思雨", "ysw");
+                //wx_useridDic.Add("汪燕平", "yime");
+                //wx_useridDic.Add("张海麟", "fred.chang@pan-american-intl.com");
+                //wx_useridDic.Add("张海麟", "fred.chang@pan-american-intl.com");
+                //wx_useridDic.Add("张海麟", "fred.chang@pan-american-intl.com");
+                //wx_useridDic.Add("张海麟", "fred.chang@pan-american-intl.com");
+                //wx_useridDic.Add("张海麟", "fred.chang@pan-american-intl.com");
+                //wx_useridDic.Add("张海麟", "fred.chang@pan-american-intl.com");
+                //wx_useridDic.Add("张海麟", "fred.chang@pan-american-intl.com");
+                //wx_useridDic.Add("张海麟", "fred.chang@pan-american-intl.com");
+                //wx_useridDic.Add("张海麟", "fred.chang@pan-american-intl.com");
+                //wx_useridDic.Add("张海麟", "fred.chang@pan-american-intl.com");
+                //wx_useridDic.Add("张海麟", "fred.chang@pan-american-intl.com");
+                //wx_useridDic.Add("张海麟", "fred.chang@pan-american-intl.com");
+                //wx_useridDic.Add("张海麟", "fred.chang@pan-american-intl.com");
+
+
+                #endregion
+
                 foreach (var pm_wsInfo in pm_WageSheetDattaSources)
                 {
                     _name = userNames.Find(it => it.Id == pm_wsInfo.UserId)?.CnName ?? "Unknown";
@@ -189,13 +242,16 @@ namespace OASystem.API.OAMethodLib
 
                     List<Root> userRoots = new List<Root>();
 
+                    string wx_userid = "";
+
+
                     if (_name == "蔡雯")
                     {
                         userRoots = workday_userRoots.Where(it => it.base_info.name == "蔡蔡" || it.base_info.name == "蔡雯").ToList(); //工作日日报 1-固定上下班；
                     }
                     else
                     {
-                        userRoots = workday_userRoots.Where(it => it.base_info.name == _name).ToList(); //工作日日报 1-固定上下班；
+                        userRoots = workday_userRoots.Where(it => it.base_info.name == _name || it.base_info.name.Contains(_name)).ToList(); //工作日日报 1-固定上下班；
                     } 
 
                     //userRoots = userRoots.Distinct().ToList();

OASystem/OASystem.Api/OAMethodLib/QiYeWeChatAPI/IQiYeWeChatApiService.cs

@@ -34,6 +34,12 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI
         /// <returns></returns>
         Task<UserIdListView> GetUserIdListAsync();
 
+        /// <summary>
+        /// 获取成员信息
+        /// </summary>
+        /// <returns></returns>
+        Task<QYWX_UserInfosView> GetUserInfosAsync();
+
         /// <summary>
         /// 获取企业所有打卡规则
         /// </summary>

OASystem/OASystem.Api/OAMethodLib/QiYeWeChatAPI/QiYeWeChatApiService.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Identity;
+using NPOI.Util;
 using OASystem.Domain.Dtos.QiYeWeChat;
 using OASystem.Domain.ViewModels.JuHeExchangeRate;
 using OASystem.Domain.ViewModels.QiYeWeChat;
@@ -175,6 +176,72 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI
             return userIdListView;
         }
 
+        /// <summary>
+        /// 获取成员信息
+        /// </summary>
+        /// <returns></returns>
+        public async Task<QYWX_UserInfosView> GetUserInfosAsync() {
+
+            QYWX_UserInfosView infoViews = new QYWX_UserInfosView();
+
+            //获取员工useridList
+            UserIdListView useridView = await GetUserIdListAsync();
+
+            if (useridView.errcode != 0 )
+            {
+                infoViews.errcode = useridView.errcode;
+                infoViews.errmsg = useridView.errmsg;
+                return infoViews;
+            }
+
+            Access_TokenView access_Token = await GetTokenAsync(4);
+            if (access_Token.errcode != 0)
+            {
+                infoViews.errcode = access_Token.errcode;
+                infoViews.errmsg = access_Token.errmsg;
+                return infoViews;
+            }
+
+            List<QYWX_UserInfo> items = new List<QYWX_UserInfo>();
+
+            string urlTitle = string.Format("/cgi-bin/user/get?access_token={0}", access_Token.access_token);
+
+            foreach (var item in useridView.dept_user)
+            {
+                if (!string.IsNullOrEmpty(item.userid))
+                {
+                    QYWX_UserInfoView _UserInfoView = new QYWX_UserInfoView();
+                    string url = string.Format("{0}&userid={1}", urlTitle, item.userid);
+                    var create_Req = await _httpClient.GetAsync(url);
+
+                    if (create_Req.IsSuccessStatusCode)
+                    {
+                        var stringResponse = await create_Req.Content.ReadAsStringAsync();
+
+                        _UserInfoView = System.Text.Json.JsonSerializer.Deserialize<QYWX_UserInfoView>(stringResponse,
+                            new JsonSerializerOptions() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase });
+                        if (_UserInfoView.errcode == 0)
+                        {
+                            items.Add(new QYWX_UserInfo()
+                            {
+                                userid = _UserInfoView.QYWX_User.userid,
+                                name = _UserInfoView.QYWX_User.name,
+                                mobile = _UserInfoView.QYWX_User.mobile,
+                                position = _UserInfoView.QYWX_User.position,
+                                email = _UserInfoView.QYWX_User.email,
+                                biz_mail = _UserInfoView.QYWX_User.biz_mail,
+                            });
+                        }
+                    }
+                }
+            }
+
+            infoViews.errcode = 0;
+            infoViews.errmsg = "操作成功!";
+            infoViews.QYWX_Users = items;
+            return infoViews;
+        }
+
         /// <summary>
         /// 获取部门列表
         /// </summary>

OASystem/OASystem.Domain/ViewModels/QiYeWeChat/UserIdListView.cs

@@ -39,4 +39,58 @@ namespace OASystem.Domain.ViewModels.QiYeWeChat
         /// </summary>
         public uint department { get; set; }
     }
+
+    /// <summary>
+    /// 成员信息
+    /// </summary>
+    public class QYWX_UserInfo
+    {
+        /// <summary>
+        /// userid
+        /// </summary>
+        public string userid { get; set; }
+
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string name { get; set; }
+
+        /// <summary>
+        /// 手机
+        /// </summary>
+        public string mobile { get; set; }
+
+        /// <summary>
+        /// 职位
+        /// </summary>
+        public string position { get; set; }
+
+        /// <summary>
+        /// 邮箱
+        /// </summary>
+        public string email { get; set; }
+
+        /// <summary>
+        /// 企业邮箱
+        /// </summary>
+        public string biz_mail { get; set; }
+    }
+
+
+    /// <summary>
+    /// 成员信息 View
+    /// </summary>
+    public class QYWX_UserInfoView : ResponseBase
+    {
+        public QYWX_UserInfo QYWX_User { get; set; }
+    }
+
+    /// <summary>
+    /// 成员信息 item View
+    /// </summary>
+    public class QYWX_UserInfosView : ResponseBase 
+    {
+        public List<QYWX_UserInfo> QYWX_Users { get; set; }
+    }
+
 }