1.修改课程加学期

2.学期下拉全量接口
3.课程全量按学期专业检索

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

@@ -120,6 +120,9 @@ public class CourseInfoController {
         {
             param.put("userId", StpLoginUserUtil.getLoginUser().getId());
         }
+        param.put("majorId", req.getParameter("majorId"));
+        param.put("semesterId", req.getParameter("semesterId"));
+        param.put("courseName", req.getParameter("courseName"));
         List<CourseInfo> list=courseInfoService.queryCourseInfoList(param);
         return CommonResult.data(list);
     }

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

@@ -90,10 +90,7 @@ public class SemesterController {
     @GetMapping("/disk/semester/downList")
     public CommonResult<List<Map<String,Object>>> downList(SemesterPageParam semesterPageParam, HttpServletRequest req) {
         Map param =new HashMap();
-        //是查年份下拉还是季度下拉，默认是0年度
-        String type="0";
-        if(StringUtils.isNotEmpty(req.getParameter("type")))type=req.getParameter("type");
-        param.put("type",type );
+        param.put("type",req.getParameter("type") );
 
         List<Map<String,Object>> list=semesterService.downList(param);
         return CommonResult.data(list);

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

@@ -139,6 +139,10 @@ public class CourseInfo {
     @ApiModelProperty(value = "上架状态", position = 7)
     private String putawayStatus;
 
+    /** 学期id */
+    @ApiModelProperty(value = "学期id", position = 7)
+    private String semesterId;
+
     /** 课时数量 */
     @ApiModelProperty(value = "课时数量", position = 7)
     private String hourCount;

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

@@ -28,12 +28,15 @@
         IFNULL(ci.START_TIME,'') as startTime,
         IFNULL(ci.END_TIME,'') as endTime,
         IFNULL(ci.VIEW_COUNT ,'') as viewCount,
+        IFNULL(ci.SEMESTER_ID ,'') as semesterId,
+        IFNULL(s.NAME ,'') as semesterIdName,
         IFNULL(ci.HOUR_COUNT ,'') as hourCount
         FROM COURSE_INFO ci
         LEFT JOIN SYS_ORG co ON ci.COLLEGE_ID=co.ID AND co.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN SYS_ORG co2 ON ci.COLLEGE_TWO_ID=co2.id AND co2.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN SYS_ORG co3 ON ci.COLLEGE_THREE_ID=co3.id AND co3.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN major ma ON ci.MAJOR_ID=ma.id AND ma.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SEMESTER s ON s.ID =ci.SEMESTER_ID AND s.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN SYS_USER su ON su.ID=ci.TEACHER_ID AND su.DELETE_FLAG ='NOT_DELETE'
         WHERE ci.DELETE_FLAG ='NOT_DELETE'
         <if test="param.collegeId !=null and param.collegeId != ''">
@@ -98,6 +101,8 @@
         IFNULL(ci.START_TIME,'') as startTime,
         IFNULL(ci.END_TIME,'') as endTime,
         IFNULL(ci.VIEW_COUNT ,'') as viewCount,
+        IFNULL(ci.SEMESTER_ID ,'') as semesterId,
+        IFNULL(s.NAME ,'') as semesterIdName,
         IFNULL(ci.HOUR_COUNT ,'') as hourCount
         FROM COURSE_INFO ci
         LEFT JOIN DEV_FILE df ON ci.COVER_IMAGE_ID =df.ID AND df.DELETE_FLAG ='NOT_DELETE'
@@ -105,6 +110,7 @@
         LEFT JOIN SYS_ORG co2 ON ci.COLLEGE_TWO_ID=co2.id AND co2.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN SYS_ORG co3 ON ci.COLLEGE_THREE_ID=co3.id AND co3.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN major ma ON ci.MAJOR_ID=ma.id AND ma.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SEMESTER s ON s.ID =ci.SEMESTER_ID AND s.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN SYS_USER su ON su.ID=ci.TEACHER_ID AND su.DELETE_FLAG ='NOT_DELETE'
         where 1=1
         <if test="courseId !=null and courseId != ''">
@@ -128,6 +134,8 @@
             IFNULL(ci.START_TIME,'') as startTime,
             IFNULL(ci.END_TIME,'') as endTime,
             IFNULL(ci.VIEW_COUNT ,'') as viewCount,
+            IFNULL(ci.SEMESTER_ID ,'') as semesterId,
+            IFNULL(s.NAME ,'') as semesterIdName,
             IFNULL(ci.HOUR_COUNT ,'') as hourCount
         FROM COURSE_INFO ci
         LEFT JOIN COURSE_STUDENT_RELATE csr ON ci.COURSE_ID = CSR.COURSE_ID AND CSR.DELETE_FLAG ='NOT_DELETE'
@@ -136,6 +144,7 @@
         LEFT JOIN college co2 ON ci.COLLEGE_TWO_ID=co2.id AND co2.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN college co3 ON ci.COLLEGE_THREE_ID=co3.id AND co3.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN major ma ON ci.MAJOR_ID=ma.id AND ma.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SEMESTER s ON s.ID =ci.SEMESTER_ID AND s.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN SYS_USER su ON su.ID=ci.TEACHER_ID AND su.DELETE_FLAG ='NOT_DELETE'
         WHERE ci.DELETE_FLAG ='NOT_DELETE'
         <if test="param.userId !=null and param.userId != ''">
@@ -191,6 +200,8 @@
             IFNULL(ci.START_TIME,'') as startTime,
             IFNULL(ci.END_TIME,'') as endTime,
             IFNULL(ci.VIEW_COUNT ,'') as viewCount,
+            IFNULL(ci.SEMESTER_ID ,'') as semesterId,
+            IFNULL(s.NAME ,'') as semesterIdName,
             IFNULL(ci.HOUR_COUNT ,'') as hourCount
         FROM COURSE_INFO ci
         LEFT JOIN DEV_FILE df ON ci.COVER_IMAGE_ID =df.ID AND df.DELETE_FLAG ='NOT_DELETE'
@@ -198,6 +209,7 @@
         LEFT JOIN college co2 ON ci.COLLEGE_TWO_ID=co2.id AND co2.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN college co3 ON ci.COLLEGE_THREE_ID=co3.id AND co3.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN major ma ON ci.MAJOR_ID=ma.id AND ma.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN SEMESTER s ON s.ID =ci.SEMESTER_ID AND s.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN SYS_USER su ON su.ID=ci.TEACHER_ID AND su.DELETE_FLAG ='NOT_DELETE'
         WHERE ci.DELETE_FLAG ='NOT_DELETE'
         <if test="courseId !=null and courseId != ''">

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

@@ -46,22 +46,35 @@
         <if test="id!=null and id != ''">
             and se.ID =#{id}
         </if>
+        order by se.ci.CREATE_TIME desc
     </select>
     <select id="downList" resultType="java.util.Map">
         SELECT
-            <if test=" param.type == 0">
+        <if test="type!=null and type != ''">
+            <if test=" type == 0">
                 IFNULL (se.MULTIYEAR ,'') AS mulityear
             </if>
-            <if test=" param.type == 1">
+            <if test=" type == 1">
                 IFNULL (se.QUATER  ,'') AS quater
             </if>
+        </if>
+        <if test="type ==null ">
+            se.ID AS id,
+            IFNULL (se.NAME,'') AS name,
+            IFNULL (se.MULTIYEAR ,'') AS mulityear,
+            IFNULL (se.QUATER  ,'') AS quater,
+            IFNULL (se.START_TIME ,'') AS starTime
+        </if>
         FROM SEMESTER se
         WHERE se.DELETE_FLAG ='NOT_DELETE'
-        <if test=" param.type == 0">
-            group by se.MULTIYEAR
-        </if>
-        <if test=" param.type == 1">
-            group by se.QUATER
+        <if test="type!=null and type != ''">
+            <if test=" type == 0">
+                group by se.MULTIYEAR
+            </if>
+            <if test=" type == 1">
+                group by se.QUATER
+            </if>
         </if>
+        order by se.ci.CREATE_TIME desc
     </select>
 </mapper>

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/courseInfo/CourseInfoAddParam.java

@@ -108,5 +108,9 @@ public class CourseInfoAddParam {
     @ApiModelProperty(value = "上架状态", position = 7)
     private String putawayStatus;
 
+    /** 学期id */
+    @ApiModelProperty(value = "学期id", position = 7)
+    private String semesterId;
+
 
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/courseInfo/CourseInfoEditParam.java

@@ -110,4 +110,8 @@ public class CourseInfoEditParam {
     @ApiModelProperty(value = "上架状态", position = 7)
     private String putawayStatus;
 
+    /** 学期id */
+    @ApiModelProperty(value = "学期id", position = 7)
+    private String semesterId;
+
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/CourseInfoServiceImpl.java

@@ -137,6 +137,18 @@ public class CourseInfoServiceImpl extends ServiceImpl<CourseInfoMapper, CourseI
                 queryWrapper.lambda().eq(CourseInfo::getCreateUser, param.get("userId"));
             }
         }
+        if(ObjectUtil.isNotEmpty( param.get("majorId")))
+        {
+            queryWrapper.lambda().eq(CourseInfo::getMajorId, param.get("majorId"));
+        }
+        if(ObjectUtil.isNotEmpty( param.get("semesterId")))
+        {
+            queryWrapper.lambda().eq(CourseInfo::getSemesterId, param.get("semesterId"));
+        }
+        if(ObjectUtil.isNotEmpty( param.get("courseName")))
+        {
+            queryWrapper.lambda().eq(CourseInfo::getCourseName, param.get("courseName"));
+        }
         return this.list(queryWrapper);
     }