From 20f1d72420e11afd29bf582c03f586c334d3014c Mon Sep 17 00:00:00 2001
From: paidaxing444 <12qwaszx>
Date: Tue, 8 Sep 2020 10:35:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E6=9C=9F=E8=AE=A1=E5=88=92=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/router/index.js                  |  15 +
 .../src/views/benyi/themetermplan/index.vue   |  30 +-
 .../src/views/benyi/themetermplan/table.vue   | 277 ++++--------------
 .../controller/ByThemeTermplanController.java |  10 +-
 4 files changed, 97 insertions(+), 235 deletions(-)

diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index de4b9aec6..d340a0e06 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -337,6 +337,21 @@ export const constantRoutes = [{
       }
     }]
   },
+  {
+    path: '/benyi_course/themetermplanprint',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: 'table/:id',
+      component: () =>
+        import('@/views/benyi/themetermplan/table'),
+      name: 'Themetermplan2',
+      meta: {
+        title: '主题整合学期计划(表格)',
+        icon: ''
+      }
+    }]
+  },
   {
     path: '/benyi_course/math',
     component: Layout,
diff --git a/ruoyi-ui/src/views/benyi/themetermplan/index.vue b/ruoyi-ui/src/views/benyi/themetermplan/index.vue
index 01779407a..79baf1d64 100644
--- a/ruoyi-ui/src/views/benyi/themetermplan/index.vue
+++ b/ruoyi-ui/src/views/benyi/themetermplan/index.vue
@@ -70,7 +70,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="termplanList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" :selectable="isShow"/>
+      <el-table-column type="selection" width="55" align="center" :selectable="isShow" />
       <el-table-column label="班级名称" align="center" prop="classid" :formatter="classFormat" />
       <el-table-column label="计划名称" align="center" prop="name" :show-overflow-tooltip="true">
         <template slot-scope="scope">
@@ -118,6 +118,13 @@
             v-hasPermi="['benyi:themetermplan:edit']"
             v-show="isShow(scope.row)"
           >提交</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleView(scope.row)"
+            v-hasPermi="['benyi:themetermplan:query']"
+          >预览</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -375,15 +382,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm(
-        '是否确认删除主题整合学期计划数据项?',
-        "警告",
-        {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }
-      )
+      this.$confirm("是否确认删除主题整合学期计划数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
         .then(function () {
           return delTermplan(ids);
         })
@@ -414,6 +417,13 @@ export default {
         })
         .catch(function () {});
     },
+    /** 预览按钮操作 */
+    handleView(row) {
+      const id = row.id;
+      this.$router.push({
+        path: "/benyi_course/themetermplanprint/table/"+id,
+      });
+    },
   },
 };
 </script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/benyi/themetermplan/table.vue b/ruoyi-ui/src/views/benyi/themetermplan/table.vue
index dd4c8bca6..84da9ddde 100644
--- a/ruoyi-ui/src/views/benyi/themetermplan/table.vue
+++ b/ruoyi-ui/src/views/benyi/themetermplan/table.vue
@@ -17,7 +17,7 @@
           </td>
           <td>
             <b class="table-title">学期：</b>
-            {{month}}
+            {{xnxqFormat(xnxq)}}
           </td>
           <td class="w200">
             <b class="table-title">制定人：</b>
@@ -29,51 +29,16 @@
             <b>{{h.label}}</b>
           </td>
         </tr>
-        <tr v-for="item in bodyData.weekplanitemList" :key="item.daytime">
+        <tr v-for="item in bodyData.termplanitemList" :key="item.id">
           <td class="align-center">
             <span>{{item.month}}</span>
           </td>
-          <td>{{item.theme}}</td>
-          <td>{{item.info}}</td>
-        </tr>
-        <tr>
-          <td colspan="3">
-            <h2 class="title title2">下学期课程计划（2018年3月-2019年3月）</h2>
-          </td>
-        </tr>
-        <tr class="align-center">
-          <!-- <td v-for="h in headerData" :key="h.title">
-            <b class="table-title">{{h.title}}</b>
-            {{h.name}}
-          </td>-->
-          <td>
-            <b class="table-title">班级：</b>
-            {{classname}}
-          </td>
-          <td>
-            <b class="table-title">学期：</b>
-            {{month}}
-          </td>
-          <td>
-            <b class="table-title">制定人：</b>
-            {{tbr}}
-          </td>
-        </tr>
-        <tr class="align-center table-bg">
-          <td v-for="h in bodyData.title" :key="h.prop">
-            <b>{{h.label}}</b>
-          </td>
-        </tr>
-        <tr v-for="item in bodyData.weekplanitemList" :key="item.daytime">
-          <td class="align-center">
-            <span>{{item.month}}</span>
-          </td>
-          <td>{{item.theme}}</td>
-          <td>{{item.info}}</td>
+          <td class="align-center">{{themeFormat(item.themeconent)}}</td>
+          <td>{{item.remark}}</td>
         </tr>
         <tr>
           <td class="align-center">教学主管审批</td>
-          <td colspan="2">{{bz}}</td>
+          <td colspan="2">{{spyj}}</td>
         </tr>
       </table>
       <!-- <p
@@ -84,40 +49,30 @@
 </template>
 
 <script>
+import { listTermplan, getTermplan } from "@/api/benyi/themetermplan";
 import {
-  listWeekplanitem,
-  getWeekplanitem,
-} from "@/api/benyi/themeweekplanitem";
-
-import { listWeekplan, getWeekplan } from "@/api/benyi/themeweekplan";
-import { listActivityByThemeId } from "@/api/benyi/activity";
-import { listMonthplan } from "@/api/benyi/thememonthplan";
-import { listMonthplanitem } from "@/api/benyi/thememonthplanitem";
-import { listThemeByIds, listThemeByActivityIds } from "@/api/benyi/theme";
+  listTermplanitem,
+  getTermplanitem,
+} from "@/api/benyi/themetermplanitem";
+import { listTheme } from "@/api/benyi/theme";
 
 export default {
   name: "TermTable",
   data() {
     return {
-      tableData: [],
-      title: "主题整合课程学期教学计划表",
-      zc: "",
-      month: "",
-      classname: "中二班",
+      //学年学期
+      xnxqOptions: [],
+      //主题
+      themeOptions: [],
+      title: "",
+      xnxq: "",
+      classname: "",
       tbr: "",
-      monththeme: "",
-      bz: "",
       spyj: "",
-      //根据活动id获取的theme名称
-      themenamebyactivityids: "",
-      //分组性质
-      fzxzOptions: [],
-      //主题活动
-      themeactivityOptions: [],
       bodyData: {
         title: [
           {
-            label: "月时间",
+            label: "月份",
             prop: "theme",
           },
           {
@@ -129,197 +84,71 @@ export default {
             prop: "help",
           },
         ],
-        weekplanitemList: [
-          {
-            month: '1月',
-            theme: "春天的颜色",
-            info: '时代峰峻的斯洛伐克'
-          },
-          // {
-          //   day: "周二",
-          //   name: "活动",
-          //   term: "同质",
-          // },
-          // {
-          //   day: "周三",
-          //   name: "活动",
-          //   term: "同质",
-          // },
-          // {
-          //   day: "周四",
-          //   name: "活动",
-          //   term: "同质",
-          // },
-          // {
-          //   day: "周五",
-          //   name: "活动",
-          //   term: "同质",
-          // },
-        ],
+        termplanitemList: [],
       },
       // 查询参数
       queryParams: {
-        wpid: undefined,
-      },
-      // 查询参数
-      queryParams_MonPlan: {
-        xnxq: undefined,
-        month: undefined,
-        status: "2",
-      },
-      queryParams_MonPlanItem: {
-        mpid: undefined,
-        zc: undefined,
+        tpid: undefined,
       },
     };
   },
   created() {
-    const themeweekplanid = this.$route.params && this.$route.params.id;
-    this.getThemeWeekPlan(themeweekplanid);
-    this.getDicts("sys_dm_fzxz").then((response) => {
-      this.fzxzOptions = response.data;
+    const themetermplanid = this.$route.params && this.$route.params.id;
+    this.queryParams.tpid = themetermplanid;
+    this.getThemeTermPlan(themetermplanid);
+    this.getThemeList();
+    this.getDicts("sys_xnxq").then((response) => {
+      this.xnxqOptions = response.data;
     });
   },
   methods: {
-    //主题翻译
-    async themeFormat(themeids) {
-      var themename = "";
-      var ids = themeids.split(";");
-      var array = [];
-      //console.log(ids);
-      ids.forEach(function (value, key, arr) {
-        //console.log(value); // 结果依次为1，2，3
-        if (value != "") {
-          array.push(parseInt(value));
-        }
-      });
-
-      if (array.length > 0) {
-        await listThemeByIds(array).then((response) => {
-          response.rows.forEach(function (value1, key1, arr1) {
-            themename = themename + value1.name + ";";
-          });
-        });
-        //(themename);
-        this.monththeme = themename;
-      }
+    // 学年学期类型--字典状态字典翻译
+    xnxqFormat(xnxq) {
+      return this.selectDictLabel(this.xnxqOptions, xnxq);
     },
     // 主题--字典状态字典翻译
-    themeactivityFormat(activityid) {
-      if (activityid != null) {
-        var ilength = activityid.split(";").length - 1;
+    themeFormat(themeids) {
+      if (themeids != "") {
+        var ilength = themeids.split(";").length - 1;
         var names = "";
         for (var i = 1; i < ilength; i++) {
           names =
             names +
-            this.selectMoeDictLabel(
-              this.themeactivityOptions,
-              activityid.split(";")[i]
-            ) +
-            "；";
+            this.selectMoeDictLabel(this.themeOptions, themeids.split(";")[i]) +
+            " ";
         }
         //this.selectDictLabel(this.scopeOptions, row.xnxq);
         return names;
       }
       return "";
     },
-    // 分组性质类型--字典状态字典翻译
-    fzxzFormat(fzxz) {
-      return this.selectDictLabel(this.fzxzOptions, fzxz);
-    },
-    //主题活动
-    getThemeActivityList(themeid) {
-      listActivityByThemeId(themeid).then((response) => {
+    //主题
+    getThemeList() {
+      listTheme(null).then((response) => {
         //console.log(response.rows);
-        this.themeactivityOptions = response.rows;
+        this.themeOptions = response.rows;
       });
     },
-    //获取周教学计划详情
-    getThemeWeekPlan(themeweekplanid) {
-      getWeekplan(themeweekplanid).then((response) => {
-        //(response);
-        this.queryParams.wpid = response.data.id;
+    //获取教学学期计划
+    getThemeTermPlan(themetermplanid) {
+      getTermplan(themetermplanid).then((response) => {
+        console.log(response.data);
         this.title = response.data.name;
-        this.zc = response.data.zc;
-        this.month = response.data.month;
-        this.classname = response.classname;
         this.tbr = response.createusername;
-        this.bz = response.data.remark;
+        this.classname = response.classname;
+        this.xnxq = response.data.xnxq;
         this.spyj = response.data.shyj;
-
-        //查找活动id
-        this.queryParams_MonPlan.month = response.data.month;
-        this.queryParams_MonPlan.xnxq = response.data.xnxq;
-        listMonthplan(this.queryParams_MonPlan).then((resMonPlan) => {
-          //console.log(resMonPlan.rows);
-          //获取的月主题
-          var monththemeids = resMonPlan.rows[0].themes;
-
-          this.themeFormat(monththemeids);
-
-          this.queryParams_MonPlanItem.mpid = resMonPlan.rows[0].id;
-          this.queryParams_MonPlanItem.zc = response.data.zc;
-          listMonthplanitem(this.queryParams_MonPlanItem).then(
-            (resMonPlanItem) => {
-              //console.log(resMonPlanItem.rows);
-              var activityids = resMonPlanItem.rows[0].activityid.split(";");
-              var array = [];
-              //console.log(arr);
-              activityids.forEach(function (value, key, arr) {
-                //console.log(value); // 结果依次为1，2，3
-                if (value != "") {
-                  array.push(parseInt(value));
-                }
-              });
-              this.getThemeActivityList(array);
-            }
-          );
-        });
-
-        this.getList();
+      });
+      this.getThemeTermItemPlan();
+    },
+    //获取学期月份详细计划
+    getThemeTermItemPlan() {
+      listTermplanitem(this.queryParams).then((response) => {
+        console.log(response.rows);
+        this.bodyData.termplanitemList = response.rows;
       });
     },
-    /** 查询主题整合周计划明细列表 */
-    async getList() {
-      //console.log(this.queryParams.wpid);
-      await listWeekplanitem(this.queryParams).then((response) => {
-        this.bodyData.weekplanitemList = response.rows;
-
-        //获取所有的活动id
-        var activityIds = "";
-        response.rows.forEach(function (value, key, arr) {
-          if (value.activityid != null) {
-            activityIds = activityIds + value.activityid + ";";
-          }
-        });
-        var array = [];
-        activityIds.split(";").forEach(function (value, key, arr) {
-          if (value != "") {
-            array.push(parseInt(value));
-          }
-        });
-        //获取所有的活动id截止
-        this.getThemeByActivityIds(array);
-      });
-    },
-    //根据活动id获取theme列表
-    async getThemeByActivityIds(array) {
-      if (array.length > 0) {
-        var themename = "";
-        await listThemeByActivityIds(array).then((response) => {
-          response.rows.forEach(function (value, key, arr) {
-            themename = themename + value.name + ";";
-          });
-        });
-        //console.log(themename);
-        this.themenamebyactivityids = themename;
-      }
-
-      this.bodyData.weekplanitemList[0].theme =
-        this.themenamebyactivityids == ""
-          ? "未设置"
-          : this.themenamebyactivityids;
-    },
+    //打印
     prints() {
       //console.log(this.$refs.printMe);
       this.$print(this.$refs.printMe);
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 2858b37bd..cca3f4e93 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
@@ -11,6 +11,7 @@ import com.ruoyi.project.benyi.domain.ByThemeTermplanitem;
 import com.ruoyi.project.benyi.service.IByThemeTermplanitemService;
 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;
@@ -47,6 +48,8 @@ public class ByThemeTermplanController extends BaseController {
     private IByClassService byClassService;
     @Autowired
     private IByThemeTermplanitemService byThemeTermplanitemService;
+    @Autowired
+    private ISysUserService userService;
 
     /**
      * 查询主题整合学期计划列表
@@ -84,7 +87,12 @@ public class ByThemeTermplanController extends BaseController {
     @PreAuthorize("@ss.hasPermi('benyi:themetermplan:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id) {
-        return AjaxResult.success(byThemeTermplanService.selectByThemeTermplanById(id));
+        AjaxResult ajax = AjaxResult.success();
+        ByThemeTermplan byThemeTermplan = byThemeTermplanService.selectByThemeTermplanById(id);
+        ajax.put(AjaxResult.DATA_TAG, byThemeTermplan);
+        ajax.put("classname", byClassService.selectByClassById(byThemeTermplan.getClassid()).getBjmc());
+        ajax.put("createusername", userService.selectUserById(byThemeTermplan.getCreateuserid()).getNickName());
+        return ajax;
     }
 
     /**