签证团组时间部分完善

OASystem/OASystem.Api/OAMethodLib/QiYeWeChatAPI/AppNotice/Config.cs

@@ -517,6 +517,22 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
 
             return result;
         }
+
+        public static string GroupDateTime_ToVisaUser(GroupDateTime_ToVisaUser info)
+        {
+            string result = string.Format(@" `团组时间通知`  
+
+<font color='info'>详细时间</font>
+
+>团组名称：{0}
+>更新时间：<font color='warning'>{1}</font>
+><font color='comment'>开始时间：{2}</font>
+><font color='comment'>结束时间：{3}</font>
+
+ ", info.TeamName, info.RefreshDate, info.StartTime, info.EndTime);
+
+            return result;
+        }
     }
 
 
@@ -636,6 +652,16 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
         public string RefreshDate { get; set; }
     }
 
+    public class GroupDateTime_ToVisaUser
+    {
+        public string TeamName { get; set; }
+        public string RefreshDate { get; set; }
+
+        public string StartTime { get; set; }
+
+        public string EndTime { get; set; }
+    }
+
     #endregion
 
 }

OASystem/OASystem.Api/OAMethodLib/QiYeWeChatAPI/AppNotice/Library.cs

@@ -1080,6 +1080,10 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
         {
             Grp_DelegationInfo groupInfo = _grpDeleRep.Query<Grp_DelegationInfo>(s => s.Id == diId).First();
 
+            var visaUser =  _grpDeleRep.Query<Sys_Users>(x => x.IsDel == 0 && x.JobPostId == 26)
+                .Select(x => x.Id)
+                .ToList();
+
             List<string> userIds = new List<string>() { "235" };
             List<string> qwUserIdList = GetQiyeChatUserIdList(userIds);
 

OASystem/OASystem.Infrastructure/Repositories/Resource/TicketBlackCodeRepository.cs

@@ -316,11 +316,11 @@ namespace OASystem.Infrastructure.Repositories.Resource
                                     data.Add(threeCodeList[i]);
                                     try
                                     {
-                                        info.Add($@"{code.Country} 抵达时间:{threeCodeList[i].endTime.ToString("yyyy-MM-dd HH:mm")}  离开时间:{threeCodeList[i + 1].startTime.ToString("yyyy-MM-dd HH:mm")} ");
+                                        info.Add($@"{code.Country} 抵达:{threeCodeList[i].endTime.ToString("yyyy-MM-dd HH:mm")}  离开:{threeCodeList[i + 1].startTime.ToString("yyyy-MM-dd HH:mm")} ");
                                     }
                                     catch (Exception)
                                     {
-                                        info.Add($@"{code.Country} 抵达时间:{threeCodeList[i].endTime.ToString("yyyy-MM-dd HH:mm")}  离开时间: 未知 ");
+                                        info.Add($@"{code.Country} 抵达:{threeCodeList[i].endTime.ToString("yyyy-MM-dd HH:mm")}  离开: 未知 ");
                                     }
                                    
                                 }