From 364c9720a261d364114f511c966000b2522a74e3 Mon Sep 17 00:00:00 2001
From: wangpeng <wangpeng@zcloudchina.com>
Date: Mon, 25 Mar 2024 09:14:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86ClassCurriculumChapterMapper?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=87=8D=E5=91=BD=E5=90=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ClassCurriculumChapterMapper.java         |  4 +
 .../ClassCurriculumChapterMapper.java         | 12 ---
 .../eduStudy/impl/ClassPostServiceImpl.java   |  2 +-
 .../eduStudy/impl/ClassServiceImpl.java       |  1 -
 .../eduStudy/ClassCurriculumChapterMapper.xml | 81 +++++++++++++++++
 .../ClassCurriculumChapterMapper.xml          | 89 -------------------
 6 files changed, 86 insertions(+), 103 deletions(-)
 delete mode 100644 src/main/java/com/zcloud/mapper/dsno3/eduSystem/ClassCurriculumChapterMapper.java
 delete mode 100644 src/main/resources/mybatis/dsno3/eduSystem/ClassCurriculumChapterMapper.xml

diff --git a/src/main/java/com/zcloud/mapper/dsno3/eduStudy/ClassCurriculumChapterMapper.java b/src/main/java/com/zcloud/mapper/dsno3/eduStudy/ClassCurriculumChapterMapper.java
index 1e99615..842bce6 100644
--- a/src/main/java/com/zcloud/mapper/dsno3/eduStudy/ClassCurriculumChapterMapper.java
+++ b/src/main/java/com/zcloud/mapper/dsno3/eduStudy/ClassCurriculumChapterMapper.java
@@ -8,4 +8,8 @@ import java.util.List;
 public interface ClassCurriculumChapterMapper {
 
     List<PageData> getListByClass(PageData data);
+
+    List<PageData> listAll(PageData data);
+
+    void deleteByCur(PageData pd);
 }
diff --git a/src/main/java/com/zcloud/mapper/dsno3/eduSystem/ClassCurriculumChapterMapper.java b/src/main/java/com/zcloud/mapper/dsno3/eduSystem/ClassCurriculumChapterMapper.java
deleted file mode 100644
index 0ac2d31..0000000
--- a/src/main/java/com/zcloud/mapper/dsno3/eduSystem/ClassCurriculumChapterMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zcloud.mapper.dsno3.eduSystem;
-
-import com.zcloud.entity.PageData;
-
-import java.util.List;
-
-public interface ClassCurriculumChapterMapper {
-
-    List<PageData> listAll(PageData data);
-
-    void deleteByCur(PageData pd);
-}
diff --git a/src/main/java/com/zcloud/service/eduStudy/impl/ClassPostServiceImpl.java b/src/main/java/com/zcloud/service/eduStudy/impl/ClassPostServiceImpl.java
index 8803aad..a283f69 100644
--- a/src/main/java/com/zcloud/service/eduStudy/impl/ClassPostServiceImpl.java
+++ b/src/main/java/com/zcloud/service/eduStudy/impl/ClassPostServiceImpl.java
@@ -2,7 +2,7 @@ package com.zcloud.service.eduStudy.impl;
 
 import com.zcloud.entity.PageData;
 import com.zcloud.mapper.dsno3.eduStudy.*;
-import com.zcloud.mapper.dsno3.eduSystem.ClassCurriculumChapterMapper;
+import com.zcloud.mapper.dsno3.eduStudy.ClassCurriculumChapterMapper;
 import com.zcloud.service.eduStudy.ClassPostService;
 import com.zcloud.util.InitPageDataUtil;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/zcloud/service/eduStudy/impl/ClassServiceImpl.java b/src/main/java/com/zcloud/service/eduStudy/impl/ClassServiceImpl.java
index d3cf73d..db1e445 100644
--- a/src/main/java/com/zcloud/service/eduStudy/impl/ClassServiceImpl.java
+++ b/src/main/java/com/zcloud/service/eduStudy/impl/ClassServiceImpl.java
@@ -4,7 +4,6 @@ import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import com.zcloud.mapper.dsno3.eduBus.StrengthenStudentRelationMapper;
 import com.zcloud.mapper.dsno3.eduStudy.*;
-import com.zcloud.mapper.dsno3.eduSystem.ClassCurriculumChapterMapper;
 import com.zcloud.service.eduStudy.ClassService;
 import com.zcloud.util.DateUtil;
 import com.zcloud.util.Jurisdiction;
diff --git a/src/main/resources/mybatis/dsno3/eduStudy/ClassCurriculumChapterMapper.xml b/src/main/resources/mybatis/dsno3/eduStudy/ClassCurriculumChapterMapper.xml
index 05d0c6a..26e97cd 100644
--- a/src/main/resources/mybatis/dsno3/eduStudy/ClassCurriculumChapterMapper.xml
+++ b/src/main/resources/mybatis/dsno3/eduStudy/ClassCurriculumChapterMapper.xml
@@ -4,6 +4,28 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zcloud.mapper.dsno3.eduStudy.ClassCurriculumChapterMapper">
 
+    <!--表名 -->
+    <sql id="tableName">
+        BUS_CLASS_CURRICULUM_CHAPTER
+    </sql>
+
+    <!-- 字段 -->
+    <sql id="Field">
+        f.CORPINFO_ID,
+		f.ENTERPRISE_ID,
+		f.CLASS_ID,
+		f.CURRICULUM_ID,
+		f.CREATOR,
+		f.CREATTIME,
+		f.OPERATOR,
+		f.OPERATTIME,
+		f.ISDELETE,
+		f.CHAPTER_ID,
+		f.VIDEOCOURSEWARE_ID,
+		f.CLASSCURRICULUM_ID,
+		f.CLASSCURRICULUMCHAPTER_ID
+    </sql>
+
     <select id="getListByClass" resultType="com.zcloud.entity.PageData">
         SELECT
         f.CORPINFO_ID,
@@ -63,4 +85,63 @@
         ORDER BY
         c.SORT
     </select>
+
+    <!-- 列表(全部) -->
+    <select id="listAll" parameterType="pd" resultType="pd">
+        select
+        <include refid="Field"></include>,
+        c.NAME,
+        c.SORT,
+        c.PARENT_ID,
+        c.COURSEWARENAME,
+        c.VIDEOFILES,
+        c.CLASSHOUR,
+        c.VIDEOTIME,
+        c.CHAPTER_ID_REMOTE,
+        cv.COURSEWARENAME,
+        t.NAME AS TEACHERNAME,
+        cv.COURSEWAREINTRODUCE,
+        pt.NAME POSTTYPE_NAME,
+        tt.NAME TRAININGTYPE_NAME,
+        iei.NAME INDUSTRY_END_NAME,
+        cu.INDUSTRY_ALL_NAME,
+        c.VIDEOCOURSEWARE_ID
+        from
+        <include refid="tableName"></include> f
+        LEFT JOIN BUS_CHAPTER c on c.CHAPTER_ID = f.CHAPTER_ID
+        left join bus_curriculum cu on f.CURRICULUM_ID = cu.CURRICULUM_ID
+        LEFT JOIN BUS_VIDEOCOURSEWARE cv on cv.VIDEOCOURSEWARE_ID = c.VIDEOCOURSEWARE_ID
+        LEFT JOIN bus_teacher t on t.TEACHER_ID = cv.SPEAKER
+        LEFT JOIN BUS_POST_TYPE pt on pt.POSTTYPE_ID = cv.POSTTYPE
+        LEFT JOIN BUS_TRAINING_TYPE tt on tt.TRAININGTYPE_ID = cv.TRAINTYPE
+        LEFT JOIN BUS_INDUSTRY_TYPE iei on iei.INDUSTRYTYPE_ID = cv.INDUSTRY_END_ID
+        where f.ISDELETE = '0'
+        and f.VIDEOCOURSEWARE_ID is not null
+        and f.VIDEOCOURSEWARE_ID != ''
+        <if test="CLASS_ID != null and CLASS_ID != ''"><!-- 关键词检索 -->
+            AND f.CLASS_ID = #{CLASS_ID}
+        </if>
+        <if test="CURRICULUM_ID != null and CURRICULUM_ID != ''"><!-- 关键词检索 -->
+            AND f.CURRICULUM_ID = #{CURRICULUM_ID}
+        </if>
+        <if test="PARENT_ID != null and PARENT_ID != ''">
+            AND c.PARENT_ID = #{PARENT_ID}
+        </if>
+        ORDER BY c.SORT
+    </select>
+
+    <!-- 删除班级下课程章节-->
+    <delete id="deleteByCur" parameterType="pd">
+        update
+        <include refid="tableName"></include>
+        set
+        ISDELETE = '1',
+        OPERATOR = #{OPERATOR},
+        OPERATTIME = #{OPERATTIME}
+        where
+        CURRICULUM_ID = #{CURRICULUM_ID}
+        and POST_ID = #{POST_ID}
+        and ISDELETE = '0'
+    </delete>
+
 </mapper>
diff --git a/src/main/resources/mybatis/dsno3/eduSystem/ClassCurriculumChapterMapper.xml b/src/main/resources/mybatis/dsno3/eduSystem/ClassCurriculumChapterMapper.xml
deleted file mode 100644
index de6925e..0000000
--- a/src/main/resources/mybatis/dsno3/eduSystem/ClassCurriculumChapterMapper.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zcloud.mapper.dsno3.eduSystem.ClassCurriculumChapterMapper">
-
-    <!--表名 -->
-    <sql id="tableName">
-        BUS_CLASS_CURRICULUM_CHAPTER
-    </sql>
-
-    <!-- 字段 -->
-    <sql id="Field">
-        f
-        .
-        CORPINFO_ID
-        ,
-		f.ENTERPRISE_ID,
-		f.CLASS_ID,
-		f.CURRICULUM_ID,
-		f.CREATOR,
-		f.CREATTIME,
-		f.OPERATOR,
-		f.OPERATTIME,
-		f.ISDELETE,
-		f.CHAPTER_ID,
-		f.VIDEOCOURSEWARE_ID,
-		f.CLASSCURRICULUM_ID,
-		f.CLASSCURRICULUMCHAPTER_ID
-    </sql>
-
-    <!-- 列表(全部) -->
-    <select id="listAll" parameterType="pd" resultType="pd">
-        select
-        <include refid="Field"></include>,
-        c.NAME,
-        c.SORT,
-        c.PARENT_ID,
-        c.COURSEWARENAME,
-        c.VIDEOFILES,
-        c.CLASSHOUR,
-        c.VIDEOTIME,
-        c.CHAPTER_ID_REMOTE,
-        cv.COURSEWARENAME,
-        t.NAME AS TEACHERNAME,
-        cv.COURSEWAREINTRODUCE,
-        pt.NAME POSTTYPE_NAME,
-        tt.NAME TRAININGTYPE_NAME,
-        iei.NAME INDUSTRY_END_NAME,
-        cu.INDUSTRY_ALL_NAME,
-        c.VIDEOCOURSEWARE_ID
-        from
-        <include refid="tableName"></include> f
-        LEFT JOIN BUS_CHAPTER c on c.CHAPTER_ID = f.CHAPTER_ID
-        left join bus_curriculum cu on f.CURRICULUM_ID = cu.CURRICULUM_ID
-        LEFT JOIN BUS_VIDEOCOURSEWARE cv on cv.VIDEOCOURSEWARE_ID = c.VIDEOCOURSEWARE_ID
-        LEFT JOIN bus_teacher t on t.TEACHER_ID = cv.SPEAKER
-        LEFT JOIN BUS_POST_TYPE pt on pt.POSTTYPE_ID = cv.POSTTYPE
-        LEFT JOIN BUS_TRAINING_TYPE tt on tt.TRAININGTYPE_ID = cv.TRAINTYPE
-        LEFT JOIN BUS_INDUSTRY_TYPE iei on iei.INDUSTRYTYPE_ID = cv.INDUSTRY_END_ID
-        where f.ISDELETE = '0'
-        and f.VIDEOCOURSEWARE_ID is not null
-        and f.VIDEOCOURSEWARE_ID != ''
-        <if test="CLASS_ID != null and CLASS_ID != ''"><!-- 关键词检索 -->
-            AND f.CLASS_ID = #{CLASS_ID}
-        </if>
-        <if test="CURRICULUM_ID != null and CURRICULUM_ID != ''"><!-- 关键词检索 -->
-            AND f.CURRICULUM_ID = #{CURRICULUM_ID}
-        </if>
-        <if test="PARENT_ID != null and PARENT_ID != ''">
-            AND c.PARENT_ID = #{PARENT_ID}
-        </if>
-        ORDER BY c.SORT
-    </select>
-
-    <!-- 删除班级下课程章节-->
-    <delete id="deleteByCur" parameterType="pd">
-        update
-        <include refid="tableName"></include>
-        set
-        ISDELETE = '1',
-        OPERATOR = #{OPERATOR},
-        OPERATTIME = #{OPERATTIME}
-        where
-        CURRICULUM_ID = #{CURRICULUM_ID}
-        and POST_ID = #{POST_ID}
-        and ISDELETE = '0'
-    </delete>
-</mapper>