1.学期加入是否当前学期

2.完善课程开课功能，以及修复一些bug

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseQuestionAnswerController.java

@@ -96,6 +96,7 @@ public class CourseQuestionAnswerController {
         Page<Map<String,Object>> page=questionAnswerService.queryList(param);
         List<Map<String,Object>> recordList=page.getRecords();
         List<String> recordIdList=  recordList.stream().map(map -> (String) map.get("id")).collect(Collectors.toList());
+
         param.clear();
         param.put("isPid", "0");
         param.put("pidList", recordIdList);
@@ -103,6 +104,8 @@ public class CourseQuestionAnswerController {
         List<Map<String,Object>> recordTwoList=questionAnswerService.queryMapList(param);
         // 1. 准备结果：为每个章节添加classHours字段
         for (Map<String, Object> record : recordList) {
+            //预留是否有子集字段，0否1是
+            String haveAnswer="0";
             if (record == null || record.get("id") == null) continue;
 
             String recordId = record.get("id").toString();
@@ -119,7 +122,8 @@ public class CourseQuestionAnswerController {
                     recordTwoList.remove(i);          // 从原列表删除（安全操作）
                 }
             }
-
+            if(recordChildList.size()>0)haveAnswer="1";
+            record.put("haveAnswer", haveAnswer);
             record.put("recordChildList", recordChildList);
         }
 
@@ -212,6 +216,14 @@ public class CourseQuestionAnswerController {
         Map param =new HashMap();
         param.put("id", req.getParameter("id"));
         Map<String,Object> result=questionAnswerService.queryInfo(param);
+        param.clear();
+        param.put("isPid", "0");
+        param.put("pid", req.getParameter("id"));
+        //查询二级评论问题
+        List<Map<String, Object>> recordChildList = new ArrayList<>();
+        List<Map<String,Object>> recordTwoList=questionAnswerService.queryMapList(param);
+        recordChildList.addAll(recordTwoList);
+        result.put("recordChildList", recordChildList);
         return CommonResult.data(result);
     }
 

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/domain/Semester.java

@@ -51,6 +51,10 @@ public class Semester {
     @ApiModelProperty(value = "起始时间止", position = 5)
     private String endTime;
 
+    /** 是否当前学期 */
+    @ApiModelProperty(value = "是否当前学期", position = 11)
+    private String isNow;
+
     /** DELETE_FLAG */
     @ApiModelProperty(value = "DELETE_FLAG", position = 6)
     @TableLogic

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/CourseOpenMapper.xml

@@ -7,19 +7,24 @@
             co.ID AS id,
             IFNULL(co.TEACHER_ID ,'') AS teacherid,
             IFNULL(co.GRADES_ID ,'') AS gradesId,
+            IFNULL (gr.grades_name,'') AS gradesIdName,
             IFNULL(co.COURSE_ID ,'') AS courseId,
+            IFNULL(ci.COURSE_NAME,'') as courseName,
             IFNULL(co.SEMESTER_ID ,'') AS semesterId,
+            IFNULL(s.NAME ,'') as semesterIdName,
             IFNULL(co.ROOM ,'') AS room,
             IFNULL(co.SCHEDULE_TIME ,'') AS scheduleTime,
             IFNULL(co.START_PERIOD ,'') AS startPeriod,
             IFNULL(co.END_PERIOD ,'') AS endPeriod,
             IFNULL(co.WEEK_TYPE ,'') AS weekType,
-            IFNULL(co.STATUS ,'') AS status
+            IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='COURSE_OPEN_WEEK_TYPE') )dd1 WHERE dd1.DICT_VALUE = TRIM(co.WEEK_TYPE) ),'') AS weekTypeName,
+            IFNULL(co.STATUS ,'') AS status,
+            IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='COURSE_OPEN_STATUS') )dd1 WHERE dd1.DICT_VALUE = TRIM(co.STATUS) ),'') AS weekTypeName
         FROM COURSE_OPEN co
-                 LEFT JOIN SYS_USER su ON co.TEACHER_ID =su.ID AND su.DELETE_FLAG ='NOT_DELETE'
-                 LEFT JOIN COURSE_INFO ci ON ci.COURSE_ID = co.COURSE_ID AND ci.DELETE_FLAG ='NOT_DELETE'
-                 LEFT JOIN grades gr ON co.GRADES_ID =gr.grades_id  AND gr.DELETE_FLAG ='NOT_DELETE'
-                 LEFT JOIN SEMESTER s ON s.ID =co.SEMESTER_ID AND s.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_USER su ON co.TEACHER_ID =su.ID AND su.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN COURSE_INFO ci ON ci.COURSE_ID = co.COURSE_ID AND ci.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN grades gr ON co.GRADES_ID =gr.grades_id  AND gr.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SEMESTER s ON s.ID =co.SEMESTER_ID AND s.DELETE_FLAG ='NOT_DELETE'
         WHERE co.DELETE_FLAG ='NOT_DELETE'
     </select>
     <select id="queryInfo" resultType="java.util.Map">
@@ -27,19 +32,24 @@
             co.ID AS id,
             IFNULL(co.TEACHER_ID ,'') AS teacherid,
             IFNULL(co.GRADES_ID ,'') AS gradesId,
+            IFNULL (gr.grades_name,'') AS gradesIdName,
             IFNULL(co.COURSE_ID ,'') AS courseId,
+            IFNULL(ci.COURSE_NAME,'') as courseName,
             IFNULL(co.SEMESTER_ID ,'') AS semesterId,
+            IFNULL(s.NAME ,'') as semesterIdName,
             IFNULL(co.ROOM ,'') AS room,
             IFNULL(co.SCHEDULE_TIME ,'') AS scheduleTime,
             IFNULL(co.START_PERIOD ,'') AS startPeriod,
             IFNULL(co.END_PERIOD ,'') AS endPeriod,
             IFNULL(co.WEEK_TYPE ,'') AS weekType,
-            IFNULL(co.STATUS ,'') AS status
+            IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='COURSE_OPEN_WEEK_TYPE') )dd1 WHERE dd1.DICT_VALUE = TRIM(co.WEEK_TYPE) ),'') AS weekTypeName,
+            IFNULL(co.STATUS ,'') AS status,
+            IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='COURSE_OPEN_STATUS') )dd1 WHERE dd1.DICT_VALUE = TRIM(co.STATUS) ),'') AS weekTypeName
         FROM COURSE_OPEN co
-                 LEFT JOIN SYS_USER su ON co.TEACHER_ID =su.ID AND su.DELETE_FLAG ='NOT_DELETE'
-                 LEFT JOIN COURSE_INFO ci ON ci.COURSE_ID = co.COURSE_ID AND ci.DELETE_FLAG ='NOT_DELETE'
-                 LEFT JOIN grades gr ON co.GRADES_ID =gr.grades_id  AND gr.DELETE_FLAG ='NOT_DELETE'
-                 LEFT JOIN SEMESTER s ON s.ID =co.SEMESTER_ID AND s.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SYS_USER su ON co.TEACHER_ID =su.ID AND su.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN COURSE_INFO ci ON ci.COURSE_ID = co.COURSE_ID AND ci.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN grades gr ON co.GRADES_ID =gr.grades_id  AND gr.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SEMESTER s ON s.ID =co.SEMESTER_ID AND s.DELETE_FLAG ='NOT_DELETE'
         WHERE co.DELETE_FLAG ='NOT_DELETE'
     </select>
 

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/SemesterMapper.xml

@@ -8,7 +8,9 @@
             IFNULL (se.NAME,'') AS name,
             IFNULL (se.MULTIYEAR ,'') AS mulityear,
             IFNULL (se.QUATER  ,'') AS quater,
-            IFNULL (se.START_TIME ,'') AS starTime
+            IFNULL (se.START_TIME ,'') AS starTime,
+            IFNULL (se.IS_NOW ,'') AS isNow,
+            IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='SEMESTER_IS_NOW') )dd1 WHERE dd1.DICT_VALUE = TRIM(se.IS_NOW) ),'') AS isNowName
         FROM SEMESTER se
         WHERE se.DELETE_FLAG ='NOT_DELETE'
         <if test="param.name !=null and param.name != ''">
@@ -28,7 +30,9 @@
             IFNULL (se.NAME,'') AS name,
             IFNULL (se.MULTIYEAR ,'') AS mulityear,
             IFNULL (se.QUATER  ,'') AS quater,
-            IFNULL (se.START_TIME ,'') AS starTime
+            IFNULL (se.START_TIME ,'') AS starTime,
+            IFNULL (se.IS_NOW ,'') AS isNow,
+            IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='SEMESTER_IS_NOW') )dd1 WHERE dd1.DICT_VALUE = TRIM(se.IS_NOW) ),'') AS isNowName
         FROM SEMESTER se
         WHERE se.DELETE_FLAG ='NOT_DELETE'
         <if test="name!=null and name != ''">
@@ -42,7 +46,9 @@
             IFNULL (se.NAME,'') AS name,
             IFNULL (se.MULTIYEAR ,'') AS mulityear,
             IFNULL (se.QUATER  ,'') AS quater,
-            IFNULL (se.START_TIME ,'') AS starTime
+            IFNULL (se.START_TIME ,'') AS starTime,
+            IFNULL (se.IS_NOW ,'') AS isNow,
+            IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='SEMESTER_IS_NOW') )dd1 WHERE dd1.DICT_VALUE = TRIM(se.IS_NOW) ),'') AS isNowName
         FROM SEMESTER se
         WHERE 1=1
         <if test="id!=null and id != ''">
@@ -64,7 +70,9 @@
             IFNULL (se.NAME,'') AS name,
             IFNULL (se.MULTIYEAR ,'') AS mulityear,
             IFNULL (se.QUATER  ,'') AS quater,
-            IFNULL (se.START_TIME ,'') AS starTime
+            IFNULL (se.START_TIME ,'') AS starTime,
+            IFNULL (se.IS_NOW ,'') AS isNow,
+            IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='SEMESTER_IS_NOW') )dd1 WHERE dd1.DICT_VALUE = TRIM(se.IS_NOW) ),'') AS isNowName
         </if>
         FROM SEMESTER se
         WHERE se.DELETE_FLAG ='NOT_DELETE'

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/courseopen/CourseOpenEditParam.java

@@ -60,7 +60,7 @@ public class CourseOpenEditParam {
 
     /** 开始节次 */
     @ApiModelProperty(value = "开始节次", position = 8)
-    private String strartPeriod;
+    private String startPeriod;
 
     /** 结束节次 */
     @ApiModelProperty(value = "结束节次", position = 9)

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/semester/SemesterAddParam.java

@@ -46,4 +46,8 @@ public class SemesterAddParam {
     @ApiModelProperty(value = "学期名称", position = 11)
     private String name;
 
+    /** 是否当前学期 */
+    @ApiModelProperty(value = "是否当前学期", position = 11)
+    private String isNow;
+
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/semester/SemesterEditParam.java

@@ -53,4 +53,8 @@ public class SemesterEditParam {
     @ApiModelProperty(value = "学期名称", position = 11)
     private String name;
 
+    /** 是否当前学期 */
+    @ApiModelProperty(value = "是否当前学期", position = 11)
+    private String isNow;
+
 }