提交代码

Edu.Module.EduTask/EducationReceiptModule.cs

@@ -1597,7 +1597,21 @@ namespace Edu.Module.EduTask
                             if (!string.IsNullOrEmpty(x.WorkUserId))
                             {
                                 var recipientPath = HttpUtility.UrlEncode($"/teacher/change-class-manager?tab=3&id={receiptModel.Id}");
-                                var content = $"待审通知 你有一张业务单据等待审核\n>**概要信息** \n>单据信息：<font color='comment'>{EnumHelper.ToName(receiptModel.ReceiptType)}单据 ({receiptModel.Id})</font>\n>创  建  人：<font color='comment'>{UserReidsCache.GetUserLoginInfo(receiptModel.CreateBy).AccountName}</font>\n>创建时间：<font color='comment'>{receiptModel.CreateTime.ToString("MM-dd HH-mm")}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={x.Id}&target={recipientPath})";
+                                string AccountName = "";
+                                if (receiptModel.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.LeaveClass)
+                                {
+
+                                    AccountName = studentLeaveRepository.GetStudentLeaveListRepository(new RB_Student_Leave_ViewModel()
+                                    {
+                                        Q_Student_Leave_Ids = receiptModel.RelationId.ToString(),
+                                    }).FirstOrDefault()?.Order_Guest_ViewModel?.GuestName ?? "";
+                                }
+                                else
+                                {
+                                    AccountName = UserReidsCache.GetUserLoginInfo(receiptModel.CreateBy)?.AccountName;
+                                }
+
+                                var content = $"待审通知 你有一张业务单据等待审核\n>**概要信息** \n>单据信息：<font color='comment'>{EnumHelper.ToName(receiptModel.ReceiptType)}单据 ({receiptModel.Id})</font>\n>创  建  人：<font color='comment'>{AccountName}</font>\n>创建时间：<font color='comment'>{receiptModel.CreateTime.ToString("MM-dd HH-mm")}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={x.Id}&target={recipientPath})";
                                 PushWorkChatHelper.PushToWorkChat(content, x.WorkUserId, "业务单据待审通知");
                             }
                         });

Edu.Repository/User/RB_StudentRepository.cs

@@ -159,7 +159,7 @@ where b.`Status`=0 and b.ClassStatus in(1,2) and  a.status=0 and  a.Account_Id={
             var parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat($@"
-SELECT s.*,sog.GuestId,o.OrderState,cou.CourseName,cou.CourseId,c.ClassName,c.ClassId,c.ClassStatus,sch.SName,sch.SId,t.TeacherName,o.EnterID,(og.TotalHours-og.CompleteHours) as SurplusHours  
+SELECT s.*,sog.GuestId,o.OrderState,cou.CourseName,cou.CourseId,c.ClassName,c.ClassId,c.ClassStatus,sch.SName,sch.SId,t.TeacherName,o.EnterID, if((og.ValidClassHours-og.CompleteHours)<0,0,(og.ValidClassHours-og.CompleteHours))  as SurplusHours  
 FROM rb_student as s LEFT JOIN rb_student_orderguest as sog on s.StuId=sog.Student_Id
     LEFT JOIN rb_order_guest as og on og.Id=sog.GuestId  
     LEFT JOIN rb_order as o on og.OrderId=o.OrderId

Edu.WebApi/Controllers/Applet/AppletIndexController.cs

@@ -67,7 +67,7 @@ namespace Edu.WebApi.Controllers.Applet
             var studentList = studentModule.GetStudentInfo(appletUserInfo.AccountId, appletUserInfo.Group_Id);
             if (studentList == null || !studentList.Any())
             {
-                return ApiResult.Failed(message: $"很抱歉，由于你已经退学，无法继续使用本系统", new { Error = 3 });
+                return ApiResult.Failed(message: $"很抱歉，由于你已经退学/已毕业，无法继续使用本系统", new { Error = 3 });
             }
 
             RB_Student_ViewModel studentModel = new RB_Student_ViewModel();
@@ -133,7 +133,7 @@ namespace Edu.WebApi.Controllers.Applet
                             {
                                 item.ExamStatusStr = "缺考";
                             }
-                            else if (item.ExamStatus == 1|| item.ExamStatus == 3)
+                            else if (item.ExamStatus == 1 || item.ExamStatus == 3)
                             {
                                 item.ExamStatusStr = "完成";
                             }
@@ -526,9 +526,9 @@ namespace Edu.WebApi.Controllers.Applet
                 {
                     item.ExamStatusStr = "未开始";
                 }
-                else if (item.ExamStartTime<System.DateTime.Now&& item.ExamEndTime > System.DateTime.Now)
+                else if (item.ExamStartTime < System.DateTime.Now && item.ExamEndTime > System.DateTime.Now)
                 {
-                    if (item.ExamStatus==2)
+                    if (item.ExamStatus == 2)
                     {
                         item.ExamStatusStr = "已开始";
                     }
@@ -537,7 +537,7 @@ namespace Edu.WebApi.Controllers.Applet
                         item.ExamStatusStr = "完成";
                     }
                 }
-                else if ( item.ExamEndTime < System.DateTime.Now)
+                else if (item.ExamEndTime < System.DateTime.Now)
                 {
                     if (item.ExamStatus == 2)
                     {
@@ -641,9 +641,9 @@ namespace Edu.WebApi.Controllers.Applet
                                     IsMutex = sObj.GetInt("IsMutex"),
                                     StundetDetailsId = sObj.GetInt("StundetDetailsId"),
                                     LevelType = (LevelTypeEnum)sObj.GetInt("LevelType"),
-                                    Answer=sObj.GetStringValue("Answer"),
-                                    StuPaperGroupId= jobj.GetInt("GId"),
-                                    Score=sObj.GetDecimal("Score"),
+                                    Answer = sObj.GetStringValue("Answer"),
+                                    StuPaperGroupId = jobj.GetInt("GId"),
+                                    Score = sObj.GetDecimal("Score"),
                                 };
                                 paperDetailsList.Add(detailModel);
                             }
@@ -654,9 +654,9 @@ namespace Edu.WebApi.Controllers.Applet
             int Group_Id = base.ParmJObj.GetInt("Group_Id");
             if (Group_Id <= 0)
             {
-                Group_Id =  base.AppletUserInfo.Group_Id;
+                Group_Id = base.AppletUserInfo.Group_Id;
             }
-            var result = paperModule.SetStuExamPaperDetailsModule(PublishId, GuestId,PaperId, Group_Id, paperDetailsList, Exam_Student_Id);
+            var result = paperModule.SetStuExamPaperDetailsModule(PublishId, GuestId, PaperId, Group_Id, paperDetailsList, Exam_Student_Id);
             return result ? ApiResult.Success("提交试卷成功") : ApiResult.Failed("提交试卷失败");
         }