页面修改

Edu.Model/ViewModel/Contract/RB_Education_Contract_ViewModel.cs

@@ -196,9 +196,6 @@ namespace Edu.Model.ViewModel.Contract
             }
         }
 
-
-
-
         /// <summary>
         /// 学员生日字符串
         /// </summary>
@@ -234,7 +231,6 @@ namespace Edu.Model.ViewModel.Contract
             }
         }
 
-
         /// <summary>
         /// 第二期-支付日期
         /// </summary>
@@ -518,10 +514,19 @@ namespace Edu.Model.ViewModel.Contract
         /// </summary>
         public string SchoolStatusStr { get; set; }
 
-
         /// <summary>
         /// 行政审核状态
         /// </summary>
         public string AdminStatusStr { get; set; }
+
+        /// <summary>
+        /// 是否查询所有
+        /// </summary>
+        public int IsQueryAll { get; set; }
+
+        /// <summary>
+        /// 查询合同人员
+        /// </summary>
+        public int QCreateBy { get; set; }
     }
 }

Edu.Repository/Contract/RB_Education_ContractRepository.cs

@@ -91,22 +91,29 @@ namespace Edu.Repository.Contract
                     where += $@" AND {nameof(RB_Education_Contract_ViewModel.Status)} NOT IN(0,4) ";
                 }
             }
+            if (demodel.IsQueryAll == 1)
+            {
+                if (demodel.QCreateBy > 0)
+                {
+                    where += $@" AND {nameof(RB_Education_Contract_ViewModel.CreateBy)} ={demodel.QCreateBy}";
+                }
+            }
             else
             {
                 if (demodel.CreateBy > 0)
                 {
                     where += $@" AND {nameof(RB_Education_Contract_ViewModel.CreateBy)} ={demodel.CreateBy}";
                 }
-                if (demodel.Status >= 0)
+            }
+            if (demodel.Status >= 0)
+            {
+                if (demodel.Status == 5)
                 {
-                    if (demodel.Status == 5)
-                    {
-                        where += $@" AND {nameof(RB_Education_Contract_ViewModel.Status)} in(2,5)";
-                    }
-                    else
-                    {
-                        where += $@" AND {nameof(RB_Education_Contract_ViewModel.Status)} ={demodel.Status}";
-                    }
+                    where += $@" AND {nameof(RB_Education_Contract_ViewModel.Status)} in(2,5)";
+                }
+                else
+                {
+                    where += $@" AND {nameof(RB_Education_Contract_ViewModel.Status)} ={demodel.Status}";
                 }
             }
             string sql = $@" SELECT * FROM RB_Education_Contract WHERE {where} ORDER BY Id DESC ";

Edu.WebApi/Controllers/Course/EducationContractController.cs

@@ -108,10 +108,15 @@ namespace Edu.WebApi.Controllers.Course
                 CType = (ContractTypeEnum)base.ParmJObj.GetInt("CType"),
                 Status = base.ParmJObj.GetInt("Status"),
                 StudentName = base.ParmJObj.GetStringValue("StudentName"),
-                IsAduit = base.ParmJObj.GetInt("IsAduit")
+                IsAduit = base.ParmJObj.GetInt("IsAduit"),
+                IsQueryAll=base.ParmJObj.GetInt("IsQueryAll"),
+                QCreateBy=base.ParmJObj.GetInt("QCreateBy"),
             };
             dmodel.Group_Id = userInfo.Group_Id;
-            dmodel.CreateBy = userInfo.Id;
+            if (dmodel.IsQueryAll == 0)
+            {
+                dmodel.CreateBy = userInfo.Id;
+            }
             var list = educationContractModule.GetEducationContractPageListModule_V3(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
             pageModel.Count = Convert.ToInt32(count);
             pageModel.PageData = list.Select(x => new