Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Repository/Exam/RB_Examination_PaperRepository.cs

@@ -59,23 +59,33 @@ WHERE 1=1
                 {
                     builder.AppendFormat(@" AND A.{0}>='{1} 23:59:59' ", nameof(RB_Examination_Paper_ViewModel.CreateTime), query.QEndTime);
                 }
-                //if (query.QExamineStatus > -1)
-                //{
-                //    //正常
-                //    if (query.QExamineStatus == 2)
-                //    {
-                //        builder.AppendFormat(@" AND A.{0} IN(2,5) ", nameof(RB_Examination_Paper_ViewModel.ExamineStatus));
-                //    }
-                //    //驳回
-                //    else if (query.QExamineStatus == 3)
-                //    {
-                //        builder.AppendFormat(@" AND A.{0} IN(3,4) ", nameof(RB_Examination_Paper_ViewModel.ExamineStatus));
-                //    }
-                //    else
-                //    {
-                //        builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Examination_Paper_ViewModel.ExamineStatus), query.QExamineStatus);
-                //    }
-                //}
+                if (query.QExamineStatus > -1)
+                {
+                    //正常
+                    if (query.QExamineStatus == 2)
+                    {
+                        builder.AppendFormat(@" AND A.{0} IN(2,5) AND A.PaperType=2 ", nameof(RB_Examination_Paper_ViewModel.ExamineStatus));
+                    }
+                    //驳回
+                    else if (query.QExamineStatus == 3)
+                    {
+                        builder.AppendFormat(@" AND A.{0} IN(3,4) AND A.PaperType=2 ", nameof(RB_Examination_Paper_ViewModel.ExamineStatus));
+                    }
+                    else
+                    {
+                        builder.AppendFormat(@" AND A.{0}={1} AND A.PaperType=2 ", nameof(RB_Examination_Paper_ViewModel.ExamineStatus), query.QExamineStatus);
+                    }
+                    if (query.ParentId > 0)
+                    {
+                        builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Examination_Paper_ViewModel.ParentId), query.ParentId);
+                    }
+                    if (query.CreateBy > 0)
+                    {
+                        builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Examination_Paper_ViewModel.CreateBy), query.CreateBy);
+                    }
+                }
+                else
+                {
                     //试卷管理员
                     if (query.IsPaperManager == 1)
                     {
@@ -107,6 +117,8 @@ WHERE 1=1
                         }
                     }
                 }
+
+            }
             builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Examination_Paper_ViewModel.PaperId));
             return GetPage<RB_Examination_Paper_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
@@ -155,7 +167,7 @@ WHERE 1=1
                 }
                 if (query.CreateBy > 0)
                 {
-                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Examination_Paper_ViewModel.CreateBy),query.CreateBy);
+                    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));
@@ -211,7 +223,7 @@ WHERE 1=1
         public int BatchSetIsOpenRepository(List<int> paperIds, int IsOpen)
         {
             StringBuilder builder = new StringBuilder();
-            builder.AppendFormat(" UPDATE RB_Examination_Paper SET IsOpen={0} WHERE PaperId IN({1}) ", IsOpen,string.Join(",",paperIds));
+            builder.AppendFormat(" UPDATE RB_Examination_Paper SET IsOpen={0} WHERE PaperId IN({1}) ", IsOpen, string.Join(",", paperIds));
             return base.Execute(builder.ToString());
         }
 

Edu.WebApi/appsettings.json

@@ -7,7 +7,9 @@
     "DataStatisticsConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_datastatistics;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "DataStatisticsConnectionPName": "MySql.Data.MySqlClient",
     "LogConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_sys;CharSet=utf8mb4; Convert Zero Datetime=true; ",
-    "LogConnectionPName": "MySql.Data.MySqlClient"
+    "LogConnectionPName": "MySql.Data.MySqlClient",
+    "MallConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_reborn_mall;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "MallConnectionPName": "MySql.Data.MySqlClient"
   },
   "Logging": {
     "LogLevel": {
@@ -100,5 +102,11 @@
   //是否是本地服务
   "IsLocal": "1",
   //临时Token
-  "TempToken": "47_oXN2xrKRE9InhFMtcCuFx_8Psl2i9TgCYhdHIsvuii5TweFkXvM1J0miUS1sLiRO5GggPOSQqCL1mfVK_ZR9HzV0JAn12TUKctzrBf2p6cFN0gzSUP88Q-iEA3yNgVkL9-DtNpzPL2stAfD7GTRaAIAANL"
+  "TempToken": "47_oXN2xrKRE9InhFMtcCuFx_8Psl2i9TgCYhdHIsvuii5TweFkXvM1J0miUS1sLiRO5GggPOSQqCL1mfVK_ZR9HzV0JAn12TUKctzrBf2p6cFN0gzSUP88Q-iEA3yNgVkL9-DtNpzPL2stAfD7GTRaAIAANL",
+  //学生请假流程编号
+  "StudentLeaveFlowId": 7,
+  //组卷审批流程编号
+  "ZuJuanFlowId": 8,
+  //考试申请流程编号
+  "ExamApplyFlowId": 9
 }
\ No newline at end of file