From f618f66c3dfbb761fc5ce4deda47eae6ca1b704c Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Fri, 13 Aug 2021 11:59:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/benyi/mathtermplanapproval/index.vue     |  2 +-
 .../src/views/benyi/thememonthplanapproval/index.vue   |  2 +-
 .../src/views/benyi/themetermplanapproval/index.vue    |  2 +-
 .../src/views/benyi/themeweekplanapproval/index.vue    |  2 +-
 ruoyi/src/main/resources/application-druid.yml         | 10 +++++-----
 .../src/main/resources/mybatis/benyi/ByChildMapper.xml |  1 +
 .../resources/mybatis/benyi/ByMathTermplanMapper.xml   |  2 +-
 .../resources/mybatis/benyi/ByThemeTermplanMapper.xml  |  2 +-
 8 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ruoyi-ui/src/views/benyi/mathtermplanapproval/index.vue b/ruoyi-ui/src/views/benyi/mathtermplanapproval/index.vue
index 66374c80d..03e405db1 100644
--- a/ruoyi-ui/src/views/benyi/mathtermplanapproval/index.vue
+++ b/ruoyi-ui/src/views/benyi/mathtermplanapproval/index.vue
@@ -97,7 +97,7 @@
       >
         <template slot-scope="scope">
           <router-link
-            :to="'/benyi_course/mathtermplan/data/' + scope.row.id"
+            :to="'/benyi_course/mathtermplanprint/table/' + scope.row.id"
             class="link-type"
           >
             <span>{{ scope.row.name }}</span>
diff --git a/ruoyi-ui/src/views/benyi/thememonthplanapproval/index.vue b/ruoyi-ui/src/views/benyi/thememonthplanapproval/index.vue
index 42d2ce72d..27ef7e9e7 100644
--- a/ruoyi-ui/src/views/benyi/thememonthplanapproval/index.vue
+++ b/ruoyi-ui/src/views/benyi/thememonthplanapproval/index.vue
@@ -121,7 +121,7 @@
       >
         <template slot-scope="scope">
           <router-link
-            :to="'/benyi_course/thememonthplan/data/' + scope.row.id"
+            :to="'/benyi_course/thememonthplanprint/table/' + scope.row.id"
             class="link-type"
           >
             <span>{{ scope.row.name }}</span>
diff --git a/ruoyi-ui/src/views/benyi/themetermplanapproval/index.vue b/ruoyi-ui/src/views/benyi/themetermplanapproval/index.vue
index ec36f6fc6..7ebc7103e 100644
--- a/ruoyi-ui/src/views/benyi/themetermplanapproval/index.vue
+++ b/ruoyi-ui/src/views/benyi/themetermplanapproval/index.vue
@@ -97,7 +97,7 @@
       >
         <template slot-scope="scope">
           <router-link
-            :to="'/benyi_course/themetermplan/data/' + scope.row.id"
+            :to="'/benyi_course/themetermplanprint/table/' + scope.row.id"
             class="link-type"
           >
             <span>{{ scope.row.name }}</span>
diff --git a/ruoyi-ui/src/views/benyi/themeweekplanapproval/index.vue b/ruoyi-ui/src/views/benyi/themeweekplanapproval/index.vue
index eb2e4f789..ec4c2d4f7 100644
--- a/ruoyi-ui/src/views/benyi/themeweekplanapproval/index.vue
+++ b/ruoyi-ui/src/views/benyi/themeweekplanapproval/index.vue
@@ -122,7 +122,7 @@
       >
         <template slot-scope="scope">
           <router-link
-            :to="'/benyi_course/themeweekplan/data/' + scope.row.id"
+            :to="'/benyi_course/themeweekplanprint/table/' + scope.row.id"
             class="link-type"
           >
             <span>{{ scope.row.name }}</span>
diff --git a/ruoyi/src/main/resources/application-druid.yml b/ruoyi/src/main/resources/application-druid.yml
index 50c10e495..77b806aad 100644
--- a/ruoyi/src/main/resources/application-druid.yml
+++ b/ruoyi/src/main/resources/application-druid.yml
@@ -6,12 +6,12 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://120.53.14.147:3306/benyi-vue-dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: tsbz2020!
-#                url: jdbc:mysql://192.144.133.123:3306/benyi-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://120.53.14.147:3306/benyi-vue-dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #                username: root
-#                password: msd5Ysql$%123
+#                password: tsbz2020!
+                url: jdbc:mysql://192.144.133.123:3306/benyi-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: msd5Ysql$%123
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByChildMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByChildMapper.xml
index b34803630..5a29a5038 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByChildMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByChildMapper.xml
@@ -181,6 +181,7 @@
             <if test="otherLanguage != null  and otherLanguage != ''">and other_language = #{otherLanguage}</if>
             <if test="createuserid != null ">and createuserid = #{createuserid}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectByCheckList" parameterType="ByChild" resultMap="ByChildResult">
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByMathTermplanMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByMathTermplanMapper.xml
index 6f57bf396..5db7eb880 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByMathTermplanMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByMathTermplanMapper.xml
@@ -40,7 +40,7 @@
             <if test="spyj != null  and spyj != ''">and spyj = #{spyj}</if>
             <if test="createuserid != null ">and createuserid = #{createuserid}</if>
         </where>
-        order by createtime desc
+        order by create_time desc
     </select>
 
     <select id="selectByMathTermplanById" parameterType="String" resultMap="ByMathTermplanResult">
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByThemeTermplanMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByThemeTermplanMapper.xml
index 92217f141..b1efe7e65 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByThemeTermplanMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByThemeTermplanMapper.xml
@@ -40,7 +40,7 @@
             <if test="sptime != null ">and sptime = #{sptime}</if>
             <if test="shyj != null  and shyj != ''">and shyj = #{shyj}</if>
         </where>
-        order by createtime desc
+        order by create_time desc
     </select>
 
     <select id="selectByThemeTermplanById" parameterType="String" resultMap="ByThemeTermplanResult">