1

Edu.Model/ViewModel/AI/RB_AI_AuthorizeStudent_ViewModel.cs

@@ -47,5 +47,10 @@ namespace Edu.Model.ViewModel.AI
         /// 应用ids
         /// </summary>
         public string ApplicationIds { get; set; }
+
+        /// <summary>
+        /// 学生ids
+        /// </summary>
+        public string StudentIds { get; set; }
     }
 }

Edu.Repository/AI/RB_AI_AuthorizeStudentRepository.cs

@@ -55,12 +55,17 @@ namespace Edu.Repository.AI
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_AI_AuthorizeStudent_ViewModel.ApplicationId), query.ApplicationId);
                 }
-                if (!string.IsNullOrWhiteSpace(query.ApplicationIds)) {
+                if (!string.IsNullOrWhiteSpace(query.ApplicationIds))
+                {
                     builder.AppendFormat(" AND A.{0} in ({1}) ", nameof(RB_AI_AuthorizeStudent_ViewModel.ApplicationId), query.ApplicationIds);
                 }
+                if (!string.IsNullOrWhiteSpace(query.StudentIds))
+                {
+                    builder.AppendFormat(" AND A.{0} in ({1}) ", nameof(RB_AI_AuthorizeStudent_ViewModel.StudentId), query.StudentIds);
+                }
                 if (query.IsEffective == 1)
                 {
-                    builder.AppendFormat(" AND (A.{0}=2 or (A.{0} =1   AND DATE_FORMAT('{1}','%y-%m-%d')>=DATE_FORMAT(A.{2},'%y-%m-%d')  AND DATE_FORMAT('{1}','%y-%m-%d')<=DATE_FORMAT(A.{3},'%y-%m-%d')) ) ", nameof(RB_AI_AuthorizeStudent_ViewModel.DateType), StringHelper.FormatDate(DateTime.Now), nameof(RB_AI_AuthorizeStudent_ViewModel.StartDate) , nameof(RB_AI_AuthorizeStudent_ViewModel.EndDate));
+                    builder.AppendFormat(" AND (A.{0}=2 or (A.{0} =1   AND DATE_FORMAT('{1}','%y-%m-%d')>=DATE_FORMAT(A.{2},'%y-%m-%d')  AND DATE_FORMAT('{1}','%y-%m-%d')<=DATE_FORMAT(A.{3},'%y-%m-%d')) ) ", nameof(RB_AI_AuthorizeStudent_ViewModel.DateType), StringHelper.FormatDate(DateTime.Now), nameof(RB_AI_AuthorizeStudent_ViewModel.StartDate), nameof(RB_AI_AuthorizeStudent_ViewModel.EndDate));
                 }
 
                 //if (!string.IsNullOrEmpty(query.StartTime))
@@ -72,6 +77,7 @@ namespace Edu.Repository.AI
                 //    where.AppendFormat(" AND DATE_FORMAT(A.{0},'%y-%m-%d')<=DATE_FORMAT('{1}','%y-%m-%d') ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.EndTime);
                 //}
             }
+            builder.AppendFormat(" order  by A.{0} desc", nameof(RB_AI_AuthorizeStudent_ViewModel.CreateTime));
             return Get<RB_AI_AuthorizeStudent_ViewModel>(builder.ToString(), parameters).ToList();
         }
         /// <summary>
@@ -134,7 +140,7 @@ namespace Edu.Repository.AI
             var parameters = new DynamicParameters();
             builder.AppendFormat(@"SELECT A.StudentId,A.ApplicationId,COUNT(*) as StunNum   FROM RB_AI_AuthorizeStudent as A  WHERE 1=1  ");
             builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_AI_AuthorizeStudent_ViewModel.Status), (int)DateStateEnum.Normal);
-        
+
             if (query != null)
             {
                 if (query.Group_Id > 0)
@@ -149,7 +155,7 @@ namespace Edu.Repository.AI
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_AI_AuthorizeStudent_ViewModel.School_Id), query.School_Id);
                 }
-               
+
                 if (query.StudentId > 0)
                 {
                     builder.AppendFormat(" AND (A.{0}={1} or A.{0}= -1) ", nameof(RB_AI_AuthorizeStudent_ViewModel.StudentId), query.StudentId);

Edu.WebApi/Controllers/AI/AIController.cs

@@ -230,7 +230,7 @@ namespace Edu.WebApi.Controllers.AI
                 SupplierName = extModel?.SupplierName ?? "",
                 SupplierId = extModel?.SupplierId ?? 0,
                 Enable = extModel?.Enable ?? 0,
-                LanguageType= extModel?.LanguageType??0,
+                LanguageType = extModel?.LanguageType ?? 0,
                 CreateTime = StringHelper.FormatDateTimeStr(extModel.CreateTime),
             });
             return ApiResult.Success(data: pageModel);
@@ -522,6 +522,7 @@ namespace Edu.WebApi.Controllers.AI
         {
             int applicationId = base.ParmJObj.GetInt("ApplicationId", 0);
             string studentStr = base.ParmJObj.GetStringValue("StudentIdList");
+            int IsCover = base.ParmJObj.GetInt("IsCover", 0);//=1覆盖
             List<int> studentIdList = new List<int>();
             if (!string.IsNullOrEmpty(studentStr))
             {
@@ -562,8 +563,14 @@ namespace Edu.WebApi.Controllers.AI
                     return ApiResult.ParamIsNull("请选择时间有效范围");
                 }
             }
+            if ((studentIdList.Where(x => x == -1 && x > 0)?.Count() ?? 0) > 0)
+            {
+                return ApiResult.ParamIsNull("学员和全部不能重复选择");
+            }
+            //根据应用id获取所有授权信息
+            var oldStudentList = aiModule.GetAuthorizeStudentListModule(new RB_AI_AuthorizeStudent_ViewModel { ApplicationId = applicationId, Group_Id = this.UserInfo.Group_Id, StudentIds = string.Join(",", studentIdList.Select(x => x)) });
             List<RB_AI_AuthorizeStudent_ViewModel> list = new List<RB_AI_AuthorizeStudent_ViewModel>();
-            foreach (var item in studentIdList)
+            foreach (var item in studentIdList.Distinct())
             {
                 if (item == 0)
                 {
@@ -571,7 +578,7 @@ namespace Edu.WebApi.Controllers.AI
                 }
                 var extModel = new RB_AI_AuthorizeStudent_ViewModel
                 {
-                    ID = 0,
+                    ID = IsCover == 1 ? (oldStudentList?.FirstOrDefault(x => x.StudentId == item)?.ID ?? 0) : 0,
                     DateType = DateType,
                     EndDate = EndDate,
                     StartDate = StartDate,
@@ -587,7 +594,6 @@ namespace Edu.WebApi.Controllers.AI
                 extModel.Status = (DateStateEnum)base.ParmJObj.GetInt("Status");
                 list.Add(extModel);
             }
-
             bool flag = aiModule.BatchSetAuthorizeStudentModule(list);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }

Edu.WebApi/appsettings.json

@@ -36,7 +36,7 @@
   "MongoDBName": "Edu",
   "WkHtmlToPdfPath": "D:/Tools/wkhtmltopdf/bin/",
   "FinanceKey": "FinanceMallInsertToERPViitto2020",
-  "PaymentFinanceApi": "http://192.168.10.46/api/Mall/InsertFinanceBatchForMallOut",
+  "PaymentFinanceApi": "http://192.168.5.46/api/Mall/InsertFinanceBatchForMallOut",
   "IncomeFinanceApi": "http://192.168.5.214/api/Mall/InsertFinanceBatchForMallIn",
   "sTenpayNotifyUrl": "http://eduapi.oytour.com/api/WeChatPay/WxPayCallback", //�µ��ص���ַ
   "sTenpayNotifyRefundUrl": "http://eduapi.oytour.com/api/WeChatPay/Refunds", //�˿�ص���ַ