企业课签到调整

Edu.Common/Config.cs

 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Configuration.Json;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
 
@@ -956,5 +957,29 @@ namespace Edu.Common
                 return ReadConfigKey("NewAchievementsEnable");
             }
         }
+
+        /// <summary>
+        /// 不验证学员状态，就可以签到的订单
+        /// </summary>
+        public static List<int> NoCheckOrderList
+        {
+            get
+            {
+                List<int> list = new List<int>();
+                try
+                {
+                    string noCheckOrdersStr = ReadConfigKey("NoCheckOrders");
+                    if (!string.IsNullOrEmpty(noCheckOrdersStr))
+                    {
+                        list = Common.ConvertHelper.StringToList(noCheckOrdersStr);
+                    }
+                }
+                catch
+                {
+                    list = new List<int>();
+                }
+                return list;
+            }
+        }
     }
 }
\ No newline at end of file

Edu.Module.Course/ClassModule.cs

@@ -2147,7 +2147,14 @@ namespace Edu.Module.Course
                         //已上课时>=有效课时，如果是，修改学员状态为停课，并且备注“有效课时消耗完毕，系统自动停课”
                         if (completeHours > guestModel.ValidClassHours)
                         {
-                            orderFileds.Add(nameof(RB_Order_Guest_ViewModel.GuestState), (int)GuestStateEnum.StopClasses);
+                            if (Common.Config.NoCheckOrderList.Count > 0 && Common.Config.NoCheckOrderList.Contains(guestModel.OrderId))
+                            {
+                                orderFileds.Add(nameof(RB_Order_Guest_ViewModel.GuestState), (int)GuestStateEnum.Normal);
+                            }
+                            else
+                            {
+                                orderFileds.Add(nameof(RB_Order_Guest_ViewModel.GuestState), (int)GuestStateEnum.StopClasses);
+                            }
                             orderFileds.Add(nameof(RB_Order_Guest_ViewModel.ChangeEffectTime), System.DateTime.Now);
                             orderFileds.Add(nameof(RB_Order_Guest_ViewModel.DropOutRemark), "有效课时消耗完毕，系统自动停课");
                             LogContent = guestModel.GuestName + "有效课时消耗完毕，系统自动停课!";

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -987,6 +987,17 @@ namespace Edu.WebApi.Controllers.Course
                 }
             }
             var orderGuestList = classModule.GetOrderGuestListModule(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = 0, ClassId = data.ClassId, QEffectStatus = 1 });
+            if (orderGuestList != null && orderGuestList.Count > 0 && Common.Config.NoCheckOrderList.Count > 0)
+            {
+                foreach (var item in orderGuestList)
+                {
+                    //商务日语听说班，月结，不验证学生状态
+                    if (Common.Config.NoCheckOrderList.Contains(item.OrderId) && item.GuestState == GuestStateEnum.StopClasses)
+                    {
+                        item.GuestState = GuestStateEnum.Normal;
+                    }
+                }
+            }
             var checkLogList = classModule.GetClassCheckList(new RB_Class_Check_ViewModel
             {
                 Group_Id = data.Group_Id,

Edu.WebApi/appsettings.json

@@ -122,5 +122,7 @@
   //甲鹤收款手续费
   "IncomeFeeRate": "0.0025,0.0054,0.006,0.04,0.004",
   //教师考核审批流程编号
-  "TeacherAssessmentFlowId":12
+  "TeacherAssessmentFlowId": 12,
+  //不验证学员状态的订单(1382：商务日语听说班【企业课】)
+  "NoCheckOrders": "1382"
 }
\ No newline at end of file