考试 新增考试日期 区间查询

Tiobon.Core.Common/Attribute/QueryFilter.cs

@@ -102,6 +102,13 @@ public class JsonParam
     public string operationKey { get; set; }
     public string token { get; set; }
 
+}
+public class JsonParam1
+{
+    public List<string> columnValue { get; set; }
+    public string operationKey { get; set; }
+    public string token { get; set; }
+
 }
 
 /// <summary>
@@ -180,7 +187,7 @@ public class QueryExportColumn
     public string elementType { get; set; }
     public string commentText { get; set; }
 
-    
+
 }
 
 public class QueryExportReturn

Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs

@@ -213,12 +213,14 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
         CardConfig.cardImage = "CoverUrl";
         CardConfig.column1 = "AfterHowLongLabel";
         CardConfig.column1Icon = "ghr-form-designer-deteSelect";
-        CardConfig.column2 = "CourseName";
+        CardConfig.column2 = "ExamPaperName";
         CardConfig.column2Icon = "ghr-exam-paper";
         CardConfig.column3 = "ExamModeLabel";
         CardConfig.column3Icon = "ghr-online-exam";
-        CardConfig.column4 = "OpenClassName";
-        CardConfig.column4Icon = "ghr-link-openClass";
+        //CardConfig.column4 = "OpenClassName";
+        //CardConfig.column4Icon = "ghr-link-openClass";
+        CardConfig.column4 = "";
+        CardConfig.column4Icon = "";
         CardConfig.column5 = "";
         CardConfig.column5Icon = "";
         CardConfig.column6 = "";
@@ -238,14 +240,20 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
     {
         RefAsync<int> totalCount = 0;
         string sql = @"SELECT *
-                    FROM (SELECT A.*,
-                                 B.CourseName,
-                                 C.Id CourseTypeId,
-                                 C.ClassName CourseType
-                          FROM Ghre_Exam A
-                               LEFT JOIN Ghre_Course B ON A.CourseId = B.Id
-                               LEFT JOIN Ghre_CourseClass C ON B.CourseClassId = C.Id
-                          WHERE A.IsEnable = 1) A";
+                        FROM (SELECT A.*,
+                                     CASE
+                                        WHEN A.LinkType = 'CourseId' THEN B.CourseName
+                                        WHEN A.LinkType = 'CourseSceneId' THEN D.SceneName
+                                     END CourseName,
+                                     C.Id CourseTypeId,
+                                     C.ClassName CourseType,
+                                     E.PaperName ExamPaperName
+                              FROM Ghre_Exam A
+                                   LEFT JOIN Ghre_Course B ON A.CourseId = B.Id
+                                   LEFT JOIN Ghre_CourseClass C ON B.CourseClassId = C.Id
+                                   LEFT JOIN Ghre_CourseScene D ON A.CourseSceneId = D.Id
+                                   LEFT JOIN Ghre_ExamPaper E ON A.ExamPaperId = E.Id
+                              WHERE A.IsEnable = 1) A";
 
         if (string.IsNullOrWhiteSpace(filter.orderBy))
             filter.orderBy = "CreateTime DESC";
@@ -259,6 +267,14 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
                 if (name == "page" || name == "pageSize")
                     continue;
 
+                if (name == "ExamDate")
+                {
+                    var jsonParam = JsonConvert.DeserializeObject<JsonParam1>(value);
+                    conditions += $" AND ((BeginTime BETWEEN '{jsonParam.columnValue[0]}' AND '{jsonParam.columnValue[1]}') OR (EndTime BETWEEN '{jsonParam.columnValue[0]}' AND '{jsonParam.columnValue[1]}'))";
+
+                    continue;
+                }
+
                 if (!string.IsNullOrWhiteSpace(value))
                 {
                     var jsonParam = JsonConvert.DeserializeObject<JsonParam>(value);
@@ -313,6 +329,13 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
                 x.canClose = 0;
                 x.canPreview = 0;
             }
+
+            if (x.DateType == "ExamDate")
+                x.AfterHowLongLabel = x.BeginTime.Value.ToString("yyyy-MM-dd") + " ~ " + x.EndTime.Value.ToString("yyyy-MM-dd");
+            else
+                x.AfterHowLongLabel = $"学完{x.AfterHowLong}天";
+
+            x.ExamModeLabel = x.ExamMode == "Online" ? "线上考试" : "线下实操";
         });
 
         return new ServicePageResult<Ghre_ExamDto>(filter.pageNum, totalCount, filter.pageSize, data);