From 794fb7ee1124615a843ef99171221c7801918da5 Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Mon, 2 Nov 2020 17:20:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B8=B8=E6=88=8F=E6=95=B0?=
 =?UTF-8?q?=E5=AD=A6=E5=AD=A6=E6=9C=9F=E8=AE=A1=E5=88=92=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/router/index.js                      | 15 +++++++++++++++
 ruoyi-ui/src/views/benyi/mathtermplan/data.vue    |  2 +-
 .../controller/ByMathTermplanController.java      | 10 +++++++++-
 .../controller/ByThemeTermplanController.java     |  3 ++-
 .../project/benyi/domain/ByMathTermplanitem.java  |  4 ++--
 5 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index f7cfc69d2..033d3a594 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -289,6 +289,21 @@ export const constantRoutes = [{
             }
         }]
     },
+    {
+        path: '/benyi_course/mathtermplanprint',
+        component: Layout,
+        hidden: true,
+        children: [{
+            path: 'table/:id',
+            component: () =>
+                import ('@/views/benyi/mathtermplan/table'),
+            name: 'Mathtermplan2',
+            meta: {
+                title: '游戏数学学期计划(表格)',
+                icon: ''
+            }
+        }]
+    },
     {
         path: '/benyi_course/themetermplan',
         component: Layout,
diff --git a/ruoyi-ui/src/views/benyi/mathtermplan/data.vue b/ruoyi-ui/src/views/benyi/mathtermplan/data.vue
index 95321d314..7ff5cea0e 100644
--- a/ruoyi-ui/src/views/benyi/mathtermplan/data.vue
+++ b/ruoyi-ui/src/views/benyi/mathtermplan/data.vue
@@ -345,7 +345,7 @@ export default {
       });
       return actions.join("");
     },
-    // 主题--字典状态字典翻译
+    // 游戏数学方案--字典状态字典翻译
     mathFaFormat(row, column) {
       if (row.mathconent != null) {
         var ilength = row.mathconent.split(";").length - 1;
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java
index 54b9684d6..e387787f3 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java
@@ -8,6 +8,7 @@ import com.ruoyi.project.benyi.domain.ByMathTermplanitem;
 import com.ruoyi.project.benyi.service.IByMathTermplanitemService;
 import com.ruoyi.project.common.SchoolCommon;
 import com.ruoyi.project.system.service.IByClassService;
+import com.ruoyi.project.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -45,6 +46,8 @@ public class ByMathTermplanController extends BaseController
     private IByClassService byClassService;
     @Autowired
     private IByMathTermplanitemService byMathTermplanitemService;
+    @Autowired
+    private ISysUserService userService;
 
 /**
  * 查询游戏数学学期计划列表
@@ -84,7 +87,12 @@ public class ByMathTermplanController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
     {
-        return AjaxResult.success(byMathTermplanService.selectByMathTermplanById(id));
+        AjaxResult ajax = AjaxResult.success();
+        ByMathTermplan byMathTermplan = byMathTermplanService.selectByMathTermplanById(id);
+        ajax.put(AjaxResult.DATA_TAG, byMathTermplan);
+        ajax.put("classname", byClassService.selectByClassById(byMathTermplan.getClassid()).getBjmc());
+        ajax.put("createusername", userService.selectUserById(byMathTermplan.getCreateuserid()).getNickName());
+        return ajax;
     }
 
     /**
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanController.java
index cca3f4e93..25459b46a 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanController.java
@@ -86,7 +86,8 @@ public class ByThemeTermplanController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('benyi:themetermplan:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") String id) {
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
         AjaxResult ajax = AjaxResult.success();
         ByThemeTermplan byThemeTermplan = byThemeTermplanService.selectByThemeTermplanById(id);
         ajax.put(AjaxResult.DATA_TAG, byThemeTermplan);
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByMathTermplanitem.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByMathTermplanitem.java
index 2aceb20da..632ebdc95 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByMathTermplanitem.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByMathTermplanitem.java
@@ -31,8 +31,8 @@ public class ByMathTermplanitem extends BaseEntity {
     /**
      * 月份
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "月份", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
+    @Excel(name = "月份", width = 30, dateFormat = "yyyy-MM")
     private Date month;
 
     /**