Merge remote-tracking branch 'origin/dev' into dev

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

@@ -116,7 +116,7 @@ public class CourseAuditRecordController {
         param.put("collegeThreeId", req.getParameter("collegeThreeId"));
         param.put("majorId", req.getParameter("majorId"));
         param.put("resourceType", req.getParameter("resourceType"));
-        param.put("resourceType", req.getParameter("resourceType"));
+        param.put("resourceTwoType", req.getParameter("resourceTwoType"));
         param.put("suffix", req.getParameter("suffix"));
         Page<Map<String,Object>> list=courseAuditRecordService.queryList(param);
         return CommonResult.data(list);
@@ -167,6 +167,7 @@ public class CourseAuditRecordController {
         param.put("collegeThreeId", req.getParameter("collegeThreeId"));
         param.put("majorId", req.getParameter("majorId"));
         param.put("resourceType", req.getParameter("resourceType"));
+        param.put("resourceTwoType", req.getParameter("resourceTwoType"));
         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/mapper/mapping/CourseAuditRecordMapper.xml

@@ -8,7 +8,7 @@
             t1.USERFILE_ID AS fileId,
             t2.FILE_NAME AS fileName,
             rf.FILE_URL AS fileUrl,
-            t2.CREATE_TIME as uploadTime,
+            t1.CREATE_TIME as uploadTime,
             t2.EXTEND_NAME AS suffix,
             IFNULL (t1.VERIFY_STATUS,'') as verifyStatus,
             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_VERIFY_STATUS') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.VERIFY_STATUS) ),'') AS verifyStatusName,
@@ -86,7 +86,7 @@
         t1.ID as id,
         t1.USERFILE_ID AS fileId,
         t2.FILE_NAME AS fileName,
-        t2.CREATE_TIME as uploadTime,
+        t1.CREATE_TIME as uploadTime,
         IFNULL (t1.VERIFY_STATUS,'') as verifyStatus,
         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_VERIFY_STATUS') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.VERIFY_STATUS) ),'') AS verifyStatusName,
         IFNULL (t1.COLLEGE_ID,'') AS collegeId,
@@ -161,7 +161,7 @@
             rf.FILE_URL AS fileUrl,
             rf.PRIVIEW_FILE_URL as priviewFileUrl,
             rf.FILE_SIZE AS fileSize,
-            t2.CREATE_TIME as uploadTime,
+            t1.CREATE_TIME as uploadTime,
             t2.EXTEND_NAME AS suffix,
             IFNULL (t1.VERIFY_STATUS,'') as verifyStatus,
             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_VERIFY_STATUS') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.VERIFY_STATUS) ),'') AS verifyStatusName,