报批行程++++

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -20943,6 +20943,13 @@ And (UnitName != '' Or UnitName != null) {sqlWhere}");
                     //var gwinfo = officialActivitiesArr.Where(x => DateTime.TryParse(x.Date, out DateTime gwData) && gwData.ToString("yyyy-MM-dd") == NewData.ToString("yyyy-MM-dd")).OrderBy(x => x.Time).ToList();
 
                     var tbSelect = dtBlack.Select(string.Format("Day = '{0}'", NewData.ToString("yyyy-MM-dd")));
+
+                    List<Tuple<int, string, string>> Times = new List<Tuple<int, string, string>>();
+                    Times.Add(new Tuple<int, string, string>(9, "9:00", "10:30"));
+                    Times.Add(new Tuple<int, string, string>(11, "11:00", "12:00"));
+                    Times.Add(new Tuple<int, string, string>(14, "14:00", "15:30"));
+                    Times.Add(new Tuple<int, string, string>(16, "16:00", "17:00"));
+
                     if (tbSelect.Length > 0)
                     {
                         List<string> threeCodeStr = new List<string>();
@@ -21064,7 +21071,7 @@ And (UnitName != '' Or UnitName != null) {sqlWhere}");
                             }
 
                             //从成都天府国际机场搭乘四川航空公司3U3961飞往东京
-                            trip += $"从{start_Object.AirPort}搭乘{aircompany.CnName}{flightcode}飞往{end_Object.City}。"; // \r\n（{start_Object.AirPort}/{end_Object.AirPort}  机型：{airModel}    飞行时间{flightTime}）；\r\n
+                            trip += $"从{start_Object.AirPort}搭乘{aircompany.CnName}{flightcode}飞往{end_Object.City}。\r\n（{start_Object.AirPort}/{end_Object.AirPort}  机型：{airModel}    飞行时间{flightTime}）；\r\n";
 
                             isTrade = Convert.ToBoolean(item["isTransitShipment"]);
 
@@ -21088,6 +21095,38 @@ And (UnitName != '' Or UnitName != null) {sqlWhere}");
                             Details = trip
                         });
 
+
+                        //添加乘车语句
+                        chiarr.Add(new Grp_ApprovalTravelDetails
+                        {
+                            Time = (fallToTime.AddHours(2.5).ToString("HH:mm") + "-" + fallToTime.AddHours(3).ToString("HH:mm")),
+                            CreateTime = DateTime.Now,
+                            CreateUserId = dto.Userid,
+                            ParentId = 0,
+                            Details = "乘车前往市区(约xx公里,大约需要xx分钟)"
+                        });
+
+                        if (i != timeArr.Count - 1)
+                        {
+                            fallToTime = fallToTime.AddHours(2.5);
+
+                            foreach (var item in Times)
+                            {
+                                //排列公务时间
+                                if (fallToTime.Hour < item.Item1)
+                                {
+                                    chiarr.Add(new Grp_ApprovalTravelDetails
+                                    {
+                                        Time = $"{item.Item2} - {item.Item3}",
+                                        CreateTime = DateTime.Now,
+                                        CreateUserId = dto.Userid,
+                                        ParentId = 0,
+                                        Details = "公务活动"
+                                    });
+                                }
+                            }
+                        }
+
                         var threeCodeList = _threeCodeRepository.QueryThreeCodeArray(threeCodeStr);
                         var last = threeCodeStr.Last();
                         foreach (var item in threeCodeStr)
@@ -21103,6 +21142,20 @@ And (UnitName != '' Or UnitName != null) {sqlWhere}");
 
 
                     }
+                    else
+                    {
+                        foreach (var item in Times)
+                        {
+                            chiarr.Add(new Grp_ApprovalTravelDetails
+                            {
+                                Time = $"{item.Item2} - {item.Item3}",
+                                CreateTime = DateTime.Now,
+                                CreateUserId = dto.Userid,
+                                ParentId = 0,
+                                Details = "公务活动"
+                            });
+                        }
+                    }
 
                     string week = Day[Convert.ToInt32(NewData.DayOfWeek.ToString("d"))].ToString();
                     Grp_ApprovalTravel appro = new Grp_ApprovalTravel();
@@ -21126,9 +21179,9 @@ And (UnitName != '' Or UnitName != null) {sqlWhere}");
                     //    chiarr.Add(chi);
                     //}
 
-                    if (chiarr.Count < 5)
+                    if (chiarr.Count < 6)
                     {
-                        for (int j = chiarr.Count; j < 5; j++)
+                        for (int j = chiarr.Count; j < 6; j++)
                         {
                             chiarr.Add(new
                                  Grp_ApprovalTravelDetails());
@@ -21190,7 +21243,7 @@ And (UnitName != '' Or UnitName != null) {sqlWhere}");
             else if (dto.FileIndex == 2)
             {
                 fileName = "省外办-报批.docx";
-                bold = true;
+                bold = false;
                 titleFont = "方正黑体简体";
                 timeFont = "Times New Roman";
                 contentFont = "方正仿宋_GBK";