Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Common/Message/MessageHelper.cs

@@ -56,6 +56,8 @@ namespace Edu.Common.Message
                 message.ReceiveId,
                 message.JumpUrl,
                 message.CreateByName,
+                message.MsgSign,
+                message.MsgTemplateCode,
                 Status = 0,
                 CreateTime = DateTime.Now,
                 AppId = Common.Config.ReadConfigKey("PushAppId"),

Edu.Common/Message/PushMessageModel.cs

@@ -58,5 +58,15 @@ namespace Edu.Common.Message
 		/// 创建人姓名
 		/// </summary>
 		public string CreateByName { get; set; }
+
+		/// <summary>
+		/// 短信模板代码
+		/// </summary>
+		public string MsgTemplateCode { get; set; }
+
+		/// <summary>
+		/// 短信签名
+		/// </summary>
+		public string MsgSign { get; set; }
 	}
 }

Edu.Model/ViewModel/Course/RB_Class_Check_ViewModel.cs

@@ -21,9 +21,15 @@ namespace Edu.Model.ViewModel.Course
         /// ids
         /// </summary>
         public string Q_ClassIds { get; set; }
+
         /// <summary>
         /// 签到统计
         /// </summary>
         public int CheckNum { get; set; }
+
+        /// <summary>
+        /// 学员名称
+        /// </summary>
+        public string GuestName { get; set; }
     }
 }

Edu.Repository/Course/RB_Class_CheckRepository.cs

@@ -18,7 +18,10 @@ namespace Edu.Repository.Course
         public List<RB_Class_Check_ViewModel> GetClassCheckListRepository(RB_Class_Check_ViewModel query)
         {
             StringBuilder builder = new StringBuilder();
-            builder.AppendFormat(@" SELECT A.* FROM RB_Class_Check AS A WHERE 1=1  ");
+            builder.AppendFormat(@" 
+SELECT A.*,IFNULL(B.GuestName,'') AS GuestName 
+FROM RB_Class_Check AS A LEFT JOIN rb_order_guest AS B ON A.OrderGuestId=B.Id 
+WHERE 1=1  ");
             if (query != null)
             {
                 if (query.Group_Id > 0)

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -534,7 +534,16 @@ namespace Edu.WebApi.Controllers.Course
                     StudyNum = (checkLogList != null && checkLogList.Any()) ? checkLogList.Where(x => x.OrderGuestId == item.Id).FirstOrDefault()?.StudyNum ?? 0 : 0
                 });
             }
-            return ApiResult.Success(data: new { data.TeacherName, data.RoomName, TotalHour = Convert.ToInt32(totalMinutes / 60), ClassNum = Convert.ToInt32(totalMinutes / 45), ClassDate = data.ClassDate.ToString("yyyy-MM-dd"), GuestList = guestList });
+            return ApiResult.Success(data: new
+            {
+                data.TeacherName,
+                data.RoomName,
+                TotalHour = Convert.ToInt32(totalMinutes / 60),
+                ClassNum = Convert.ToInt32(totalMinutes / 45),
+                DefaultMinutes= totalMinutes,
+                ClassDate = data.ClassDate.ToString("yyyy-MM-dd"),
+                GuestList = guestList
+            });
         }
 
         /// <summary>
@@ -611,8 +620,9 @@ namespace Edu.WebApi.Controllers.Course
             foreach (var item in list)
             {
                 int totalNum = checkLogList.Where(x => x.ClassId == item.ClassId && x.ClassRoomId == item.ClassRoomId && x.Group_Id == item.Group_Id && x.School_Id == item.School_Id && x.ClassDate == item.ClassDate).Count();
-                int CheckNum = checkLogList.Where(x => x.CheckStatus == 0 && x.ClassId == item.ClassId && x.ClassRoomId == item.ClassRoomId && x.Group_Id == item.Group_Id && x.School_Id == item.School_Id && x.ClassDate == item.ClassDate).Count();
-                int NoCheckNum = checkLogList.Where(x => x.CheckStatus == 1 && x.ClassId == item.ClassId && x.ClassRoomId == item.ClassRoomId && x.Group_Id == item.Group_Id && x.School_Id == item.School_Id && x.ClassDate == item.ClassDate).Count();
+
+                var checkList = checkLogList.Where(x => x.CheckStatus == 0 && x.ClassId == item.ClassId && x.ClassRoomId == item.ClassRoomId && x.Group_Id == item.Group_Id && x.School_Id == item.School_Id && x.ClassDate == item.ClassDate).ToList();
+                var noCheckList = checkLogList.Where(x => x.CheckStatus == 1 && x.ClassId == item.ClassId && x.ClassRoomId == item.ClassRoomId && x.Group_Id == item.Group_Id && x.School_Id == item.School_Id && x.ClassDate == item.ClassDate).ToList();
                 var planCheckObj = new
                 {
                     item.TeacherName,
@@ -620,9 +630,11 @@ namespace Edu.WebApi.Controllers.Course
                     MonthStr = item.ClassDate.ToString("MM"),
                     DayStr = item.ClassDate.ToString("dd"),
                     YearStr = item.ClassDate.ToString("yyyy"),
-                    CheckNum,
-                    NoCheckNum,
-                    ColorType = item.TeacherId != item.Teacher_Id ? 1 : (totalNum == CheckNum ? 2 : 3),
+                    CheckNum= checkList.Count(),
+                    CheckList= checkList.Select(qitem => new { qitem.GuestName}),
+                    NoCheckNum= noCheckList.Count(),
+                    NoCheckList= noCheckList.Select(qitem => new { qitem.GuestName}),
+                    ColorType = item.TeacherId != item.Teacher_Id ? 1 : (totalNum == noCheckList.Count() ? 2 : 3),
                 };
                 resultList.Add(planCheckObj);
             }

Edu.WebApi/Controllers/User/LoginController.cs

@@ -211,7 +211,7 @@ namespace Edu.WebApi.Controllers.User
                             CoverImg = "",
                             CreateByName = userInfo.AccountName,
                             JumpUrl = "",
-                            ReceiveId = "1",
+                            ReceiveId = userInfo.Id.ToString(),
                             SendTime = DateTime.Now,
                             SendType = 0,
                             Title = DateTime.Now.ToString("yyyyMMdd HH:mm:ss fff") + "推送标题" + i.ToString(),
@@ -225,11 +225,14 @@ namespace Edu.WebApi.Controllers.User
                         else if (num % 4 == 2)
                         {
                             model.Platform = 2;
+                            model.ReceiveId = userInfo.Id.ToString();
                         }
                         //短信推送
                         else if (num % 4 == 3)
                         {
                             model.Platform = 3;
+                            model.MsgTemplateCode = "短信模板代码";
+                            model.MsgSign = "签名";
                             model.ReceiveId = "13551126755";
                         }
                         //邮件推送