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

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -20878,6 +20878,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>();
@@ -20999,7 +21006,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"]);
 
@@ -21023,6 +21030,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)
@@ -21038,6 +21077,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();
@@ -21061,9 +21114,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());
@@ -21125,7 +21178,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";

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -2050,7 +2050,7 @@ namespace OASystem.API.Controllers
         /// <param name="date"></param>
         /// <returns></returns>
         [HttpGet]
-        public IActionResult GetPerformanceList(int userid,string date)
+        public IActionResult GetPerformanceList(int userid,string date, int loginUser)
         {
             var jw = JsonView(false);
 
@@ -2142,7 +2142,11 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
             var rootNodeList = List.Where(x => x.ParentId == 0);
             var rootResult = rootNodeList.Select(x => BuildSubTree(x, List));
 
-            jw.Data = rootResult;
+            jw.Data = new
+            {
+                Root = rootResult,
+                IsLeader = IsLeader(userid,loginUser)
+            };
             jw.Code = 200;
             jw.Msg = "成功";
 
@@ -2360,6 +2364,16 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
                             .And(x => ids.Contains(x.AssessmentContentSettingId))
                             .And(x => x.HigherUpConfig == 0)
                             .ToExpression();
+
+                    if (IsLeader(dto.AssessmenUserId, dto.CreateUserId))
+                    {
+                        expressionWhere = Expressionable
+                            .Create<Per_AssessmentScore>()
+                            .And(x => x.YearMonth.Year == yearMonth_Dt.Year && x.YearMonth.Month == yearMonth_Dt.Month)
+                            .And(x => ids.Contains(x.AssessmentContentSettingId))
+                            .ToExpression();
+                    }
+
                     _sqlSugar.BeginTran();
                     _sqlSugar.Updateable<Per_AssessmentScore>()
                              .Where(expressionWhere)
@@ -2471,6 +2485,21 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
             return Ok(jw);
         }
 
+        private bool IsLeader(int userId, int higherUserId)
+        {
+            Dictionary <int,List<int>> keyValues = new Dictionary<int, List<int>>()
+            {
+                { 5 , new List<int>{ 258 , 235, 234, 233, 208 } }
+            };
+
+            if (keyValues.ContainsKey(userId))
+            {
+                return keyValues[userId].Contains(higherUserId);
+            }
+
+            return false;
+        }
+
         #endregion
 
         #region 企微Api测试

OASystem/OASystem.Domain/Dtos/PersonnelModule/TreeNode.cs

@@ -194,6 +194,12 @@ namespace OASystem.Domain.Dtos.PersonnelModule
         /// </summary>
         public string AssessmenData { get; set; }
 
+
+        /// <summary>
+        /// 被评估人id
+        /// </summary>
+        public int AssessmenUserId { get; set; }
+
         /// <summary>
         /// 绩效数据
         /// </summary>