1.修复课程中心因为多开课重复 2.修复课程的课时数量 3.修改统计数据返回格式

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

@@ -170,6 +170,7 @@ public class ResourceRecordController {
         param.put("majorId", req.getParameter("majorId"));
         param.put("resourceType", req.getParameter("resourceType"));
         param.put("resourceTwoType", req.getParameter("resourceTwoType"));
+        param.put("resourceThreeType", req.getParameter("resourceThreeType"));
         param.put("suffix", req.getParameter("suffix"));
         Page<Map<String,Object>> list=courseAuditRecordService.queryList(param);
         return CommonResult.data(list);
@@ -228,6 +229,7 @@ public class ResourceRecordController {
         param.put("collegeThreeId", req.getParameter("collegeThreeId"));
         param.put("resourceType", req.getParameter("resourceType"));
         param.put("resourceTwoType", req.getParameter("resourceTwoType"));
+        param.put("resourceThreeType", req.getParameter("resourceThreeType"));
         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/CourseInfoMapper.xml

@@ -220,7 +220,7 @@
     </select>
     <select id="queryCoursecentryPage" resultType="java.util.Map">
         select
-            ci.COURSE_ID as courseId,
+            distinct ci.COURSE_ID as courseId,
             IFNULL(ci.COURSE_NAME,'') as courseName,
             IFNULL(ci.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(ci.COURSE_TYPE) ),'') AS courseTypeName,
@@ -248,6 +248,38 @@
         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'
+        LEFT JOIN (
+            SELECT
+                courseHourCount.courseId AS courseId,
+                COUNT(courseHourCount.hourId) AS hourCount
+            FROM (
+                SELECT
+                    cch.ID AS hourId,
+                    cc.ID AS chapterId,
+                    ci.COURSE_ID AS courseId,
+                    hourRelate.realId AS relId
+                FROM COURSE_INFO ci
+                JOIN COURSE_CHAPTER cc ON ci.COURSE_ID =cc.COURSE_ID AND cc.DELETE_FLAG ='NOT_DELETE'
+                JOIN COURSE_CLASSHOUR cch ON cc.ID=cch.CHAPTER_ID AND cch.DELETE_FLAG ='NOT_DELETE'
+                JOIN(
+                    SELECT
+                        DISTINCT cr.MAIN_ID AS mainId,
+                        cr.ID AS realId
+                    FROM COURSE_RELATE cr
+                    LEFT JOIN RESOURCE_RECORD rr ON rr.ID =cr.RELATE_ID AND rr.DELETE_FLAG ='NOT_DELETE'
+                    WHERE cr.DELETE_FLAG ='NOT_DELETE'
+                    AND rr.VERIFY_STATUS='2'
+                    AND cr.FUNC_TYPE ='1'
+                    AND cr.CHAPTERHOUR_TYPE='1'
+                    AND cr.INFO_TYPE ='0'
+                )hourRelate ON hourRelate.mainId = cch.ID
+                WHERE ci.DELETE_FLAG ='NOT_DELETE'
+                AND cch.ID IS NOT NULL
+                AND cc.ID IS NOT NULL
+                AND ci.COURSE_ID IS NOT NULL
+            )courseHourCount
+            GROUP BY courseHourCount.courseId
+        )hc ON hc.courseId = ci.COURSE_ID
         WHERE ci.DELETE_FLAG ='NOT_DELETE'
         and ci.PUTAWAY_STATUS='1'
         <if test="param.userId !=null and param.userId != ''">
@@ -279,10 +311,10 @@
         </if>
         <if test="param.sortflag !=null and param.sortflag != ''">
             <if test=" param.sortflag == 0">
-                order by ci.CREATE_TIME desc
+                order by courseCreateTime desc
             </if>
             <if test=" param.sortflag == 1">
-                order by ci.VIEW_COUNT desc
+                order by viewCount desc
             </if>
         </if>
     </select>

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

@@ -705,7 +705,7 @@
         SELECT
             su.ID AS userId,
             IFNULL(su.NAME,'') AS stuName,
-            IFNULL(su.LAST_LOGIN_TIME,'') AS lastLoginTime
+            IFNULL( TO_CHAR(su.LAST_LOGIN_TIME, 'YYYY-MM-DD HH24:MI:SS'),'') AS lastLoginTime
         FROM (SELECT su1.* FROM SYS_USER su1 WHERE su1.DELETE_FLAG='NOT_DELETE' AND su1.EDU_IDENTITY='2' ) su
     </select>
     <select id="getWatchTimeAndCountStudyBehavior" resultType="java.util.Map">

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java

@@ -223,7 +223,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     @Override
     public List<SysOrg> getAllOrgList() {
         QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().orderByDesc(SysOrg::getSortCode);
+        queryWrapper.lambda().orderByAsc(SysOrg::getSortCode);
         return this.list(queryWrapper);
     }