页面修改

Edu.Model/ViewModel/User/RB_Student_OrderGuest_ViewModel.cs

@@ -17,6 +17,11 @@ namespace Edu.Model.ViewModel.User
         /// </summary>
         public string QStudentIds { get; set; }
 
+        /// <summary>
+        /// 订单编号【查询使用】
+        /// </summary>
+        public string QOrderIds { get; set; }
+
         /// <summary>
         /// 班级名称
         /// </summary>
@@ -133,5 +138,10 @@ namespace Edu.Model.ViewModel.User
         /// 预约的次数
         /// </summary>
         public int AppointNum { get; set; }
+
+        /// <summary>
+        /// 订单创建时间
+        /// </summary>
+        public DateTime OrderCreateTime { get; set; }
     }
 }

Edu.Repository/Sell/RB_OrderRepository.cs

@@ -99,6 +99,14 @@ namespace Edu.Repository.Sell
             {
                 where += $@" and o.{nameof(RB_Order_ViewModel.LXConfirmDate)} >='{demodel.ConfirmSTime}'";
             }
+            if (!string.IsNullOrEmpty(demodel.StartTime))
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.CreateTime)} >='{demodel.StartTime}'";
+            }
+            if (!string.IsNullOrEmpty(demodel.EndTime))
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.CreateTime)} <='{demodel.EndTime} 23:59:59'";
+            }
             if (!string.IsNullOrEmpty(demodel.ConfirmETime))
             {
                 where += $@" and o.{nameof(RB_Order_ViewModel.LXConfirmDate)} <='{demodel.ConfirmETime} 23:59:59'";

Edu.Repository/User/RB_Student_OrderGuestRepository.cs

@@ -41,6 +41,10 @@ WHERE 1=1 AND C.OrderState<>3 AND D.Status=0
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.OrderId), query.OrderId);
                 }
+                if (!string.IsNullOrEmpty(query.QOrderIds))
+                {
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Student_OrderGuest_ViewModel.OrderId), query.QOrderIds);
+                }
                 if (query.GuestId > 0)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.GuestId), query.GuestId);
@@ -72,7 +76,8 @@ WHERE 1=1 AND C.OrderState<>3 AND D.Status=0
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@" 
 SELECT A.*,IFNULL(B.ClassName,'') AS ClassName,IFNULL(B.ClassNo,'') AS ClassNo,IFNULL(C.JoinType,0) AS StuJoinType,IFNULL(D.GuestState,0) AS StuGuestState
-       ,C.OrderState,IFNULL(D.TotalHours,0) AS TotalHours,IFNULL(D.CompleteHours,0) AS CompleteHours,IFNULL(B.ClassStatus,0) AS ClassStatus,IFNULL(D.RenewState,0) AS RenewState
+       ,C.OrderState,IFNULL(D.TotalHours,0) AS TotalHours,IFNULL(D.CompleteHours,0) AS CompleteHours,IFNULL(B.ClassStatus,0) AS ClassStatus
+       ,IFNULL(D.RenewState,0) AS RenewState,C.CreateTime AS OrderCreateTime
 FROM RB_Student_OrderGuest AS A INNER JOIN rb_order AS C  ON A.OrderId=C.OrderId
 	 INNER JOIN rb_order_guest AS D ON A.GuestId=D.Id
      LEFT JOIN rb_class AS B ON A.ClassId=B.ClassId
@@ -109,12 +114,13 @@ WHERE 1=1 AND C.OrderState<>3 AND D.Status=0
                 }
             }
             string sql = string.Format(@"
-SELECT A.Student_Id,A.OrderId,A.OrderState,A.RenewState FROM 
+SELECT A.Student_Id,A.OrderId,A.OrderState,A.RenewState,A.OrderCreateTime 
+FROM 
 (
-  {0}
+   {0}
 ) AS A
 GROUP BY A.Student_Id,A.OrderId
-",builder.ToString());
+", builder.ToString());
             return Get<RB_Student_OrderGuest_ViewModel>(sql).ToList();
         }
 

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -89,7 +89,7 @@ namespace Edu.WebApi.Controllers.Course
                     x.ClassStyle,
                     ClassStyleName = x.ClassStyle.ToName(),
                     OpenTime = x.OpenTime.ToString("yyyy年MM月dd日"),
-                    EndOrderTime =Common.ConvertHelper.FormatDate2(x.EndOrderTime),
+                    EndOrderTime = Common.ConvertHelper.FormatDate2(x.EndOrderTime),
                     IsCanApply = x.EndOrderTime >= Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd")) && x.ClassPersion > x.OrderStudentCount ? 1 : 0,
                     OriginalPrice = x.CourseOriginalPrice,
                     SellPrice = x.CourseSellPrice,
@@ -466,11 +466,11 @@ namespace Edu.WebApi.Controllers.Course
             {
                 ClassId = parms.GetInt("ClassId", 0),
                 OrderId = parms.GetInt("OrderId"),
-                SourceId=parms.GetInt("SourceId"),
+                SourceId = parms.GetInt("SourceId"),
                 Group_Id = base.UserInfo.Group_Id,
                 OrderState = OrderStateEnum.Normal
             };
-            if (query.ClassId <= 0&&query.SourceId<=0)
+            if (query.ClassId <= 0 && query.SourceId <= 0)
             {
                 return ApiResult.ParamIsNull();
             }
@@ -493,7 +493,8 @@ namespace Edu.WebApi.Controllers.Course
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetOrderGuestRenewState() {
+        public ApiResult GetOrderGuestRenewState()
+        {
             var userInfo = base.UserInfo;
             string StuIds = base.ParmJObj.GetStringValue("StuIds");
             if (string.IsNullOrEmpty(StuIds))
@@ -534,7 +535,7 @@ namespace Edu.WebApi.Controllers.Course
                 HelpEnterId = base.ParmJObj.GetInt("HelpEnterId"),
                 GeneralOccupation = base.ParmJObj.GetStringValue("GeneralOccupation"),
                 EduOccupation = base.ParmJObj.GetStringValue("EduOccupation"),
-     
+
                 OrderNature = (OrderNatureEnum)base.ParmJObj.GetInt("OrderNature"),
                 OldPreferPrice = base.ParmJObj.GetDecimal("OldPreferPrice"),
                 CourseId = base.ParmJObj.GetInt("CourseId"),
@@ -581,17 +582,21 @@ namespace Edu.WebApi.Controllers.Course
             {
                 return ApiResult.ParamIsNull("请传递选择客户");
             }
-            if (demodel.OrderIdentify == 2 && !string.IsNullOrEmpty(demodel.StuIds)) {
+            if (demodel.OrderIdentify == 2 && !string.IsNullOrEmpty(demodel.StuIds))
+            {
                 //验证学生是否已有其他订单
                 var vlist = orderModule.ValidataStuOrder(demodel.StuIds, userInfo.Group_Id);
-                if (vlist.Any()) {
+                if (vlist.Any())
+                {
                     var vmodel = vlist.FirstOrDefault();
                     return ApiResult.Tip("学员" + vmodel.GuestName + "存在有效未付款订单" + vmodel.OrderId + "，请取消该订单后再试", vmodel.OrderId);
                 }
             }
-            if (!string.IsNullOrEmpty(demodel.StuIds)) {
+            if (!string.IsNullOrEmpty(demodel.StuIds))
+            {
                 int gNum = JsonHelper.DeserializeObject<List<int>>("[" + demodel.StuIds + "]").Count();
-                if (demodel.GuestNum != gNum) {
+                if (demodel.GuestNum != gNum)
+                {
                     return ApiResult.ParamIsNull("客人数量不正确");
                 }
             }
@@ -600,7 +605,7 @@ namespace Edu.WebApi.Controllers.Course
             demodel.School_Id = userInfo.School_Id;
             demodel.Dept_Id = userInfo.DeptId;
             demodel.OrderForm = OrderFormEnum.Computer;
-            if (demodel.OrderType== OrderTypeEnum.CourseOrder && demodel.OrderIdentify != 2)
+            if (demodel.OrderType == OrderTypeEnum.CourseOrder && demodel.OrderIdentify != 2)
             {
                 demodel.EnterID = userInfo.Id;  //由前端传递了， 可能会不存在 （此字段为市场人员）
             }
@@ -992,7 +997,7 @@ namespace Edu.WebApi.Controllers.Course
         public ApiResult GetGuestEducationEnumList()
         {
             var list = EnumHelper.EnumToList(typeof(GuestEducationEnum));
-            return ApiResult.Success(data:list);
+            return ApiResult.Success(data: list);
         }
 
         /// <summary>
@@ -1128,7 +1133,7 @@ namespace Edu.WebApi.Controllers.Course
             {
                 OrderId = base.ParmJObj.GetInt("OrderId"),
                 ClassId = base.ParmJObj.GetInt("ClassId"),
-                GuestState =(GuestStateEnum)base.ParmJObj.GetInt("GuestState"),
+                GuestState = (GuestStateEnum)base.ParmJObj.GetInt("GuestState"),
                 GuestName = base.ParmJObj.GetStringValue("GuestName"),
                 SourceId = base.ParmJObj.GetInt("SourceId"),
             };
@@ -1145,7 +1150,7 @@ namespace Edu.WebApi.Controllers.Course
                 SexStr = x.Sex == 1 ? "男" : "女",
                 x.Age,
                 BirthDate = Common.ConvertHelper.FormatDate(x.BirthDate),
-                Mobile=x.StuTel,
+                Mobile = x.StuTel,
                 x.Basics,
                 x.Education,
                 EducationName = x.Education.ToName(),
@@ -1189,7 +1194,7 @@ namespace Edu.WebApi.Controllers.Course
                 x.ValidClassHours,
                 x.CompleteHours,
                 x.MakeUpHours,
-                SurplusHours=x.TotalHours-x.CompleteHours,
+                SurplusHours = x.TotalHours - x.CompleteHours,
                 x.GuestState,
                 x.GuestStateStr,
                 GraduationTime = Common.ConvertHelper.FormatDate(x.GraduationTime),
@@ -1302,15 +1307,18 @@ namespace Edu.WebApi.Controllers.Course
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult SetMyStudentToGuest() {
+        public ApiResult SetMyStudentToGuest()
+        {
             var userInfo = base.UserInfo;
             JObject parms = JObject.Parse(base.RequestParm.Msg.ToString());
             int OrderId = parms.GetInt("OrderId", 0);//订单
             string StuIds = parms.GetStringValue("StuIds");//学生Ids
-            if (OrderId <= 0) {
+            if (OrderId <= 0)
+            {
                 return ApiResult.ParamIsNull("订单不存在");
             }
-            if (string.IsNullOrEmpty(StuIds)) {
+            if (string.IsNullOrEmpty(StuIds))
+            {
                 return ApiResult.ParamIsNull("请选择学生");
             }
 
@@ -1319,7 +1327,8 @@ namespace Edu.WebApi.Controllers.Course
             {
                 return ApiResult.Success();
             }
-            else {
+            else
+            {
                 return ApiResult.Failed(msg);
             }
         }
@@ -1352,7 +1361,7 @@ namespace Edu.WebApi.Controllers.Course
                 Q_OrderState = base.ParmJObj.GetInt("Q_OrderState"),
                 Q_OrderBy = base.ParmJObj.GetInt("Q_OrderBy"),
                 PlatformTax = base.ParmJObj.GetDecimal("PlatformTax"),
-                CourseSubject=base.ParmJObj.GetInt("CourseSubject"),
+                CourseSubject = base.ParmJObj.GetInt("CourseSubject"),
             };
             demodel.Group_Id = userInfo.Group_Id;
             demodel.CreateBy = userInfo.Id;
@@ -1551,7 +1560,7 @@ namespace Edu.WebApi.Controllers.Course
                 ClassNo = base.ParmJObj.GetStringValue("ClassNo"),
                 CourseSubject = base.ParmJObj.GetInt("CourseSubject"),
                 CustomerId = base.ParmJObj.GetInt("CustomerId", 0),
-                CategoryId=base.ParmJObj.GetInt("CategoryId"),
+                CategoryId = base.ParmJObj.GetInt("CategoryId"),
             };
             demodel.Group_Id = userInfo.Group_Id;
 
@@ -2433,7 +2442,7 @@ namespace Edu.WebApi.Controllers.Course
         #endregion
 
         #region 获取学员状态列表
-        
+
         /// <summary>
         /// 获取学员状态列表
         /// </summary>

Edu.WebApi/Controllers/User/LoginController.cs

@@ -68,8 +68,7 @@ namespace Edu.WebApi.Controllers.User
         [AllowAnonymous]
         public ApiResult Test()
         {
-            //courseModule.RunWordsUrlModule();
-           
+            new OrderModule().RunStudentadvisorModule();
             return ApiResult.Success();
         }
 

Edu.WebApi/Controllers/User/UserController.cs

@@ -813,7 +813,7 @@ namespace Edu.WebApi.Controllers.User
         public FileContentResult DownLoadStudent()
         {
             List<ExcelDataSource> slist = new List<ExcelDataSource>();
-           
+
             var query = new RB_Student_ViewModel()
             {
                 StuName = base.ParmJObj.GetStringValue("StuName"),
@@ -831,17 +831,39 @@ namespace Edu.WebApi.Controllers.User
                 StuType = base.ParmJObj.GetInt("StuType"),
                 ExistCourseConsultant = base.ParmJObj.GetInt("ExistCourseConsultant"),
                 CategoryId = base.ParmJObj.GetInt("CategoryId"),
+                QStudentStatus = base.ParmJObj.GetInt("QStudentStatus"),
+                AdvisorStatus = base.ParmJObj.GetInt("AdvisorStatus"),
+                StuChannel = base.ParmJObj.GetInt("StuChannel"),
+                CreateType = (StuCreateTypeEnum)base.ParmJObj.GetInt("CreateType"),
+                StuSourceId = base.ParmJObj.GetInt("StuSourceId"),
             };
             if (query.IsQueryMyStu == 1)
             {
                 query.CreateBy = base.UserInfo.Id;
             }
-
             string CreateIds = base.ParmJObj.GetStringValue("CreateIds");
             if (!string.IsNullOrEmpty(CreateIds))
             {
                 query.CreateIds = Common.Plugin.JsonHelper.DeserializeObject<List<int>>(CreateIds);
             }
+            if (query.BelongType == 1)
+            {
+                var tempList = okrPeriodModule.GetOKRPersonalDimensionListModule(base.UserInfo.Group_Id, base.UserInfo.Id, base.UserInfo.DeptId);
+                string QCreateBys = "";
+                if (tempList != null && tempList.Count > 0)
+                {
+                    foreach (var jItem in tempList)
+                    {
+                        JObject jObj = JObject.Parse(JsonHelper.Serialize(jItem));
+                        QCreateBys += jObj.GetStringValue("Id") + ",";
+                    }
+                }
+                if (!string.IsNullOrEmpty(QCreateBys))
+                {
+                    query.QCreateBys = QCreateBys.TrimStart(',').TrimEnd(',');
+                }
+            }
+
 
             int PlanId = base.ParmJObj.GetInt("PlanId");
             if (PlanId > 0)