页面修改

Edu.Repository/Sell/RB_Order_GuestRepository.cs

@@ -911,7 +911,7 @@ WHERE  1=1 AND A.Status=0 AND class.Status=0 AND class.ClassStatus <>4  AND b.Or
             //查询快毕业的学生 HK 2022-05-09新增
             if (demodel.IsImmediatelyGraduate == 1)
             {
-                builder.AppendFormat(" AND A.GuestState<>7 AND (A.TotalHours-A.CompleteHours)<=100 ");
+                builder.AppendFormat(" AND A.GuestState<>7 AND (A.TotalHours-A.CompleteHours)<=20 ");
                 if (demodel.CreateBy > 0)
                 {
                     builder.AppendFormat(" AND(st.CreateBy = {0} OR  EXISTS(SELECT 1 FROM rb_student_assist WHERE StuId = st.StuId AND AssistId = {0})) ", demodel.CreateBy);

Edu.WebApi/Controllers/User/UserCenterController.cs

@@ -3438,28 +3438,13 @@ namespace Edu.WebApi.Controllers.User
         /// <returns></returns>
         public ApiResult NotBusinessBill()
         {
-            var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
+            var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
             var query = new EducationReceiptQuery()
             {
                 Group_Id = base.UserInfo.Group_Id,
-                StartTime = base.ParmJObj.GetStringValue("StartTime"),
-                EndTime = base.ParmJObj.GetStringValue("EndTime"),
-                Conditon = (EduReceiptConditionEnum)base.ParmJObj.GetInt("Conditon"),
-                ReceiptType = base.ParmJObj.GetInt("ReceiptType"),
-                Title = base.ParmJObj.GetStringValue("Title"),
-                RelationId = base.ParmJObj.GetInt("RelationId")
+                Conditon = EduReceiptConditionEnum.WaitAgree,
             };
-            if (!string.IsNullOrEmpty(base.ParmJObj.GetStringValue("VerifyStatus")))
-            {
-                query.VerifyStatus = base.ParmJObj.GetInt("VerifyStatus", -1);
-            }
-            var id = base.ParmJObj.GetInt("Id");
-            if (id > 0)
-            {
-                query.QIds = id.ToString();
-            }
-            query.CreateBy = 0;
-            //query.CreateBy = base.UserInfo.Id;
+            query.CreateBy = base.UserInfo.Id;
             var list = educationReceiptModule.GetEducationReceiptPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             pageModel.PageData = list;
             pageModel.Count = rowsCount;