页面修改

Edu.Model/ViewModel/Exam/RB_Examination_Publish_ViewModel.cs

@@ -10,6 +10,11 @@ namespace Edu.Model.ViewModel.Exam
     /// </summary>
     public class RB_Examination_Publish_ViewModel : RB_Examination_Publish
     {
+        /// <summary>
+        /// 是否查询所有
+        /// </summary>
+        public int IsQueryAll { get; set; }
+
         /// <summary>
         /// 考试学员列表
         /// </summary>

Edu.Module.System/RoleModule.cs

@@ -92,8 +92,8 @@ namespace Edu.Module.System
                 foreach (var roleItem in model.RolePermissionList)
                 {
                     roleItem.Role_Id = model.RoleId;
-                    flag= rolePermissionRepository.Insert(roleItem) > 0;
                 }
+                flag = rolePermissionRepository.BatchInsertRolePermissionRepository(model.RolePermissionList);
             }
             //添加角色功能权限
             roleFunctionPermissionRepository.DeleteOne(new WhereHelper(nameof(RB_Role_FunctionPermission_ViewModel.Role_Id), model.RoleId));
@@ -102,8 +102,8 @@ namespace Edu.Module.System
                 foreach (var roleItem in model.RoleFunctionList)
                 {
                     roleItem.Role_Id = model.RoleId;
-                    flag = roleFunctionPermissionRepository.Insert(roleItem) > 0;
                 }
+                flag = roleFunctionPermissionRepository.BatchInsertRoleFunctionPermissionRepository(model.RoleFunctionList);
             }
             return flag;
         }

Edu.Repository/Exam/RB_Examination_PaperRepository.cs

@@ -66,14 +66,21 @@ WHERE 1=1
                 }
                 else
                 {
-                    if (query.CreateBy > 0)
-                    {
-                        builder.AppendFormat(@" AND (A.{0}={1} OR A.IsOpen=2) ", nameof(RB_Examination_Paper_ViewModel.CreateBy), query.CreateBy);
-                    }
                     if (query.ParentId > 0)
                     {
                         builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Examination_Paper_ViewModel.ParentId), query.ParentId);
                     }
+                    else
+                    {
+                        if (query.CreateBy > 0)
+                        {
+                            builder.AppendFormat(@" AND 
+                                (  
+                                    (A.{0}={1} AND A.ParentId=0) 
+                                 OR ( A.IsOpen=2 AND A.{0}<>{1})
+                                ) ", nameof(RB_Examination_Paper_ViewModel.CreateBy), query.CreateBy);
+                        }
+                    }
                     //else
                     //{
                     //    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Examination_Paper_ViewModel.ParentId), 0);
@@ -126,6 +133,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(@" AND A.{0}=1 ", nameof(RB_Examination_Paper_ViewModel.PaperType));
                 }
+                if (query.CreateBy > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Examination_Paper_ViewModel.CreateBy),query.CreateBy);
+                }
             }
             builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Examination_Paper_ViewModel.PaperId));
             return Get<RB_Examination_Paper_ViewModel>(builder.ToString(), parameters).ToList();

Edu.Repository/Exam/RB_Examination_PublishRepository.cs

@@ -43,6 +43,10 @@ WHERE 1=1
                     builder.AppendFormat(" AND B.{0} LIKE @PaperName ", nameof(RB_Examination_Publish_ViewModel.PaperName));
                     parameters.Add("PaperName", "%" + query.PaperName.Trim() + "%");
                 }
+                if (query.CreateBy > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Examination_Publish_ViewModel.CreateBy), query.CreateBy);
+                }
             }
             return GetPage<RB_Examination_Publish_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
         }

Edu.Repository/System/RB_Role_FunctionPermissionRepository.cs

@@ -42,5 +42,22 @@ WHERE 1=1
             }
             return Get<RB_Role_FunctionPermission_ViewModel>(builder.ToString()).ToList();
         }
+
+        /// <summary>
+        /// 批量插入功能权限
+        /// </summary>
+        /// <param name="functionPermissionList"></param>
+        /// <returns></returns>
+        public bool BatchInsertRoleFunctionPermissionRepository(List<RB_Role_FunctionPermission_ViewModel> functionPermissionList)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append("INSERT INTO RB_Role_FunctionPermission (Role_Id, Menu_Id,Action_Id,ActionName) VALUES");
+            functionPermissionList.ForEach(x =>
+            {
+                builder.Append($"({x.Role_Id},{x.Menu_Id},{x.Action_Id},'{x.ActionName}'),");
+            });
+            builder = builder.Remove(builder.Length - 1, 1);
+            return Execute(builder.ToString()) > 0;
+        }
     }
 }

Edu.Repository/System/RB_Role_PermissionRepository.cs

@@ -41,5 +41,22 @@ WHERE 1=1
             }
             return Get<RB_Role_Permission_ViewModel>(builder.ToString()).ToList();
         }
+
+        /// <summary>
+        /// 批量插入权限菜单
+        /// </summary>
+        /// <param name="RolePermissionList"></param>
+        /// <returns></returns>
+        public bool BatchInsertRolePermissionRepository(List<RB_Role_Permission_ViewModel> RolePermissionList)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append("INSERT INTO RB_Role_Permission (Role_Id, Menu_Id) VALUES");
+            RolePermissionList.ForEach(x =>
+            {
+                builder.Append($"({x.Role_Id},{x.Menu_Id}),");
+            });
+            builder = builder.Remove(builder.Length - 1, 1);
+            return Execute(builder.ToString()) > 0;
+        }
     }
 }
\ No newline at end of file

Edu.WebApi/Controllers/Exam/ExamController.cs

@@ -95,7 +95,7 @@ namespace Edu.WebApi.Controllers.Exam
                     item.IsOpen,
                     OpenStr = item.IsOpen == 1 ? "私有" : "公开",
                     item.ExamineStatus,
-                    ExamineStatusStr = item.PaperType == 2 ? (item.ExamineStatus == Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit ? "草稿" : EnumHelper.ToName(item.ExamineStatus)) : "",
+                    ExamineStatusStr = item.PaperType == 2 ? (paperModule.GetExamineStatusStr(item.ExamineStatus)) : "",
                     item.ExamineRemark,
                 });
             }
@@ -537,7 +537,12 @@ namespace Edu.WebApi.Controllers.Exam
             {
                 PaperId = base.ParmJObj.GetInt("PaperId"),
                 PaperName = base.ParmJObj.GetStringValue("PaperName"),
+                IsQueryAll=base.ParmJObj.GetInt("IsQueryAll"),
             };
+            if (query.IsQueryAll != 1)
+            {
+                query.CreateBy = base.UserInfo.Id;
+            }
             query.Group_Id = base.UserInfo.Group_Id;
             List<object> result = new List<object>();
             var list = paperModule.GetExaminationPublishPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);