1.资源管理修改字段等

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

@@ -95,7 +95,7 @@ public class CourseAuditRecordController {
         param.put("collegeTwoId", req.getParameter("collegeTwoId"));
         param.put("collegeThreeId", req.getParameter("collegeThreeId"));
         param.put("majorId", req.getParameter("majorId"));
-        param.put("courseType", req.getParameter("courseType"));
+        param.put("resourceType", req.getParameter("resourceType"));
         param.put("suffix", req.getParameter("suffix"));
         Page<Map<String,Object>> list=courseAuditRecordService.queryList(param);
         return CommonResult.data(list);
@@ -144,7 +144,7 @@ public class CourseAuditRecordController {
         param.put("collegeTwoId", req.getParameter("collegeTwoId"));
         param.put("collegeThreeId", req.getParameter("collegeThreeId"));
         param.put("majorId", req.getParameter("majorId"));
-        param.put("courseType", req.getParameter("courseType"));
+        param.put("resourceType", req.getParameter("resourceType"));
         param.put("suffix", req.getParameter("suffix"));
         Page<Map<String,Object>> list=courseAuditRecordService.queryResourceCentreList(param);
         return CommonResult.data(list);

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

@@ -18,6 +18,7 @@ import lombok.Getter;
 import lombok.Setter;
 import vip.xiaonuo.common.pojo.CommonEntity;
 
+import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -81,9 +82,9 @@ public class CourseAuditRecord extends CommonEntity {
     @ApiModelProperty(value = "三级院系ID", position = 7)
     private String collegeThreeId;
 
-    /** 课程类别ID */
-    @ApiModelProperty(value = "课程类别ID", position = 7)
-    private String courseType;
+    /** 资源类型*/
+    @ApiModelProperty(value = "资源类型", position = 7)
+    private String resourceType;
 
     /** 是否推荐 */
     @ApiModelProperty(value = "是否推荐，0否1是", position = 7)

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/dto/courseauditrecord/CourseAuditRecordAddParam.java

@@ -82,10 +82,10 @@ public class CourseAuditRecordAddParam {
     @NotBlank(message = "三级院系ID不能为空")
     private String collegeThreeId;
 
-    /** 课程类别ID */
-    @ApiModelProperty(value = "课程类别ID", position = 7)
-    @NotBlank(message = "课程类别ID不能为空")
-    private String courseType;
+    /** 资源类型 */
+    @ApiModelProperty(value = "资源类型", position = 7)
+    @NotBlank(message = "资源类型不能为空")
+    private String resourceType;
 
     /** 是否推荐 */
     @ApiModelProperty(value = "是否推荐，0否1是", position = 7)

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/dto/courseauditrecord/CourseAuditRecordEditParam.java

@@ -81,9 +81,9 @@ public class CourseAuditRecordEditParam {
     @ApiModelProperty(value = "三级院系ID", position = 7)
     private String collegeThreeId;
 
-    /** 课程类别ID */
-    @ApiModelProperty(value = "课程类别ID", position = 7)
-    private String courseType;
+    /** 资源类型 */
+    @ApiModelProperty(value = "资源类型", position = 7)
+    private String resourceType;
 
     /** 是否推荐 */
     @ApiModelProperty(value = "是否推荐，0否1是", position = 7)

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

@@ -22,8 +22,8 @@
             CONCAT(t4.NAME,',',t42.NAME,',',t43.NAME) AS collegeAllIdName,
             IFNULL (t1.MAJOR_ID,'') AS majorId,
             IFNULL (t5.major_name,'') AS majorIdName,
-            IFNULL (t1.COURSE_TYPE,'') AS courseType,
-            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_TYPE') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.COURSE_TYPE) ),'') AS courseTypeName,
+            IFNULL (t1.RESOURCE_TYPE,'') AS resourceType,
+            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='RESOURCE_TYPE') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.RESOURCE_TYPE) ),'') AS resourceTypeName,
             IFNULL (t1.COURSE_ID,'') as courseId,
             IFNULL (t3.COURSE_NAME,'') AS courseIdName
         FROM COURSE_AUDIT_RECORD t1
@@ -160,8 +160,8 @@
             CONCAT(t4.NAME,',',t42.NAME,',',t43.NAME) AS collegeAllIdName,
             IFNULL (t1.MAJOR_ID,'') AS majorId,
             IFNULL (t5.major_name,'') AS majorIdName,
-            IFNULL (t1.COURSE_TYPE,'') AS courseType,
-            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_TYPE') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.COURSE_TYPE) ),'') AS courseTypeName,
+            IFNULL (t1.RESOURCE_TYPE,'') AS resourceType,
+            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='RESOURCE_TYPE') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.RESOURCE_TYPE) ),'') AS resourceTypeName,
             IFNULL (t1.COURSE_ID,'') as courseId,
             IFNULL (t3.COURSE_NAME,'') AS courseIdName,
             IFNULL (t1.RESOURCE_DESC,'') AS resourceDesc,
@@ -197,8 +197,8 @@
             CONCAT(t4.NAME,',',t42.NAME,',',t43.NAME) AS collegeAllIdName,
             IFNULL (t1.MAJOR_ID,'') AS majorId,
             IFNULL (t5.major_name,'') AS majorIdName,
-            IFNULL (t1.COURSE_TYPE,'') AS courseType,
-            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_TYPE') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.COURSE_TYPE) ),'') AS courseTypeName
+            IFNULL (t1.RESOURCE_TYPE,'') AS resourceType,
+            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='RESOURCE_TYPE') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.RESOURCE_TYPE) ),'') AS resourceTypeName
         FROM COURSE_AUDIT_RECORD t1
         LEFT JOIN college t4 ON t1.COLLEGE_ID=t4.id AND t4.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN major t5 ON t1.MAJOR_ID=t5.id AND t5.DELETE_FLAG ='NOT_DELETE'