From d235b5367db473f9642b9ef0de496d87bed6e519 Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Mon, 16 Aug 2021 11:27:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E4=BF=A1=E6=81=AF=EF=BC=8C?=
 =?UTF-8?q?=E5=A4=9A=E8=A7=92=E8=89=B2=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/benyi/mathtermplan.js        |  9 +++++
 ruoyi-ui/src/api/benyi/thememonthplan.js      |  9 +++++
 ruoyi-ui/src/api/benyi/themetermplan.js       |  9 +++++
 ruoyi-ui/src/api/benyi/themeweekplan.js       |  9 +++++
 .../benyi/mathtermplanapproval/index.vue      |  4 +--
 .../benyi/thememonthplanapproval/index.vue    |  4 +--
 .../benyi/themetermplanapproval/index.vue     |  4 +--
 .../benyi/themeweekplanapproval/index.vue     |  4 +--
 .../controller/ByMathTermplanController.java  | 13 +++++++
 .../ByThemeMonthplanController.java           | 13 +++++++
 .../controller/ByThemeTermplanController.java | 13 +++++++
 .../controller/ByThemeWeekplanController.java | 15 ++++++++
 .../ruoyi/project/common/SchoolCommon.java    | 35 +++++++++++++++++++
 .../system/controller/ByClassController.java  |  6 ++++
 14 files changed, 139 insertions(+), 8 deletions(-)

diff --git a/ruoyi-ui/src/api/benyi/mathtermplan.js b/ruoyi-ui/src/api/benyi/mathtermplan.js
index 6d18ac341..5386bf8c1 100644
--- a/ruoyi-ui/src/api/benyi/mathtermplan.js
+++ b/ruoyi-ui/src/api/benyi/mathtermplan.js
@@ -9,6 +9,15 @@ export function listMathtermplan(query) {
     })
 }
 
+// 查询游戏数学学期计划列表
+export function listMathtermplansp(query) {
+    return request({
+        url: '/benyi/mathtermplan/listsp',
+        method: 'get',
+        params: query
+    })
+}
+
 // 查询游戏数学学期计划详细
 export function getMathtermplan(id) {
     return request({
diff --git a/ruoyi-ui/src/api/benyi/thememonthplan.js b/ruoyi-ui/src/api/benyi/thememonthplan.js
index 784e0d05b..4772b88ef 100644
--- a/ruoyi-ui/src/api/benyi/thememonthplan.js
+++ b/ruoyi-ui/src/api/benyi/thememonthplan.js
@@ -9,6 +9,15 @@ export function listMonthplan(query) {
   })
 }
 
+// 查询主题整合月计划列表
+export function listMonthplansp(query) {
+  return request({
+    url: '/benyi/thememonthplan/listsp',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询主题整合月计划详细
 export function getMonthplan(id) {
   return request({
diff --git a/ruoyi-ui/src/api/benyi/themetermplan.js b/ruoyi-ui/src/api/benyi/themetermplan.js
index f1d8a0eef..05fd91048 100644
--- a/ruoyi-ui/src/api/benyi/themetermplan.js
+++ b/ruoyi-ui/src/api/benyi/themetermplan.js
@@ -9,6 +9,15 @@ export function listTermplan(query) {
   })
 }
 
+// 查询主题整合学期计划列表
+export function listTermplansp(query) {
+  return request({
+    url: '/benyi/themetermplan/listsp',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询主题整合学期计划详细
 export function getTermplan(id) {
   return request({
diff --git a/ruoyi-ui/src/api/benyi/themeweekplan.js b/ruoyi-ui/src/api/benyi/themeweekplan.js
index a0293bf73..5b41e4093 100644
--- a/ruoyi-ui/src/api/benyi/themeweekplan.js
+++ b/ruoyi-ui/src/api/benyi/themeweekplan.js
@@ -9,6 +9,15 @@ export function listWeekplan(query) {
   })
 }
 
+// 查询主题整合周计划（根据月计划明细）列表
+export function listWeekplansp(query) {
+  return request({
+    url: '/benyi/themeweekplan/listsp',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询主题整合周计划（根据月计划明细）详细
 export function getWeekplan(id) {
   return request({
diff --git a/ruoyi-ui/src/views/benyi/mathtermplanapproval/index.vue b/ruoyi-ui/src/views/benyi/mathtermplanapproval/index.vue
index 03e405db1..7bc29da08 100644
--- a/ruoyi-ui/src/views/benyi/mathtermplanapproval/index.vue
+++ b/ruoyi-ui/src/views/benyi/mathtermplanapproval/index.vue
@@ -236,7 +236,7 @@
 
 <script>
 import {
-  listMathtermplan,
+  listMathtermplansp,
   getMathtermplan,
   delMathtermplan,
   addMathtermplan,
@@ -323,7 +323,7 @@ export default {
     /** 查询游戏数学学期计划列表 */
     getList() {
       this.loading = true;
-      listMathtermplan(this.queryParams).then((response) => {
+      listMathtermplansp(this.queryParams).then((response) => {
         this.mathtermplanList = response.rows;
         this.total = response.total;
         this.loading = false;
diff --git a/ruoyi-ui/src/views/benyi/thememonthplanapproval/index.vue b/ruoyi-ui/src/views/benyi/thememonthplanapproval/index.vue
index 27ef7e9e7..a018eb0ad 100644
--- a/ruoyi-ui/src/views/benyi/thememonthplanapproval/index.vue
+++ b/ruoyi-ui/src/views/benyi/thememonthplanapproval/index.vue
@@ -270,7 +270,7 @@
 
 <script>
 import {
-  listMonthplan,
+  listMonthplansp,
   getMonthplan,
   updateMonthplan,
 } from "@/api/benyi/thememonthplan";
@@ -416,7 +416,7 @@ export default {
     /** 查询主题整合月计划列表 */
     getList() {
       this.loading = true;
-      listMonthplan(this.queryParams).then((response) => {
+      listMonthplansp(this.queryParams).then((response) => {
         this.monthplanList = response.rows;
         this.total = response.total;
         this.loading = false;
diff --git a/ruoyi-ui/src/views/benyi/themetermplanapproval/index.vue b/ruoyi-ui/src/views/benyi/themetermplanapproval/index.vue
index 7ebc7103e..d0583afcc 100644
--- a/ruoyi-ui/src/views/benyi/themetermplanapproval/index.vue
+++ b/ruoyi-ui/src/views/benyi/themetermplanapproval/index.vue
@@ -236,7 +236,7 @@
 
 <script>
 import {
-  listTermplan,
+  listTermplansp,
   getTermplan,
   updateTermplan,
 } from "@/api/benyi/themetermplan";
@@ -342,7 +342,7 @@ export default {
     /** 查询主题整合学期计划列表 */
     getList() {
       this.loading = true;
-      listTermplan(this.queryParams).then((response) => {
+      listTermplansp(this.queryParams).then((response) => {
         this.termplanList = response.rows;
         this.total = response.total;
         this.loading = false;
diff --git a/ruoyi-ui/src/views/benyi/themeweekplanapproval/index.vue b/ruoyi-ui/src/views/benyi/themeweekplanapproval/index.vue
index ec4c2d4f7..afdf65821 100644
--- a/ruoyi-ui/src/views/benyi/themeweekplanapproval/index.vue
+++ b/ruoyi-ui/src/views/benyi/themeweekplanapproval/index.vue
@@ -265,7 +265,7 @@
 
 <script>
 import {
-  listWeekplan,
+  listWeekplansp,
   getWeekplan,
   updateWeekplan,
 } from "@/api/benyi/themeweekplan";
@@ -373,7 +373,7 @@ export default {
     /** 查询主题整合周计划（根据月计划明细）列表 */
     getList() {
       this.loading = true;
-      listWeekplan(this.queryParams).then((response) => {
+      listWeekplansp(this.queryParams).then((response) => {
         this.weekplanList = response.rows;
         this.total = response.total;
         this.loading = false;
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 6638c7969..8ff0a91a7 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
@@ -66,6 +66,19 @@ public class ByMathTermplanController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询游戏数学学期计划列表
+     */
+    @PreAuthorize("@ss.hasPermi('benyi:mathtermplan:list')")
+    @GetMapping("/listsp")
+    public TableDataInfo listsp(ByMathTermplan byMathTermplan) {
+        byMathTermplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+        List<ByMathTermplan> list = null;
+        startPage();
+        list = byMathTermplanService.selectByMathTermplanList(byMathTermplan);
+        return getDataTable(list);
+    }
+
     /**
      * 导出游戏数学学期计划列表
      */
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java
index 7e7b5d04d..ab12c759b 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java
@@ -74,6 +74,19 @@ public class ByThemeMonthplanController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询主题整合月计划列表
+     */
+    @PreAuthorize("@ss.hasPermi('benyi:thememonthplan:list')")
+    @GetMapping("/listsp")
+    public TableDataInfo listsp(ByThemeMonthplan byThemeMonthplan) {
+        byThemeMonthplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+        List<ByThemeMonthplan> list = null;
+        startPage();
+        list = byThemeMonthplanService.selectByThemeMonthplanList(byThemeMonthplan);
+        return getDataTable(list);
+    }
+
     /**
      * 导出主题整合月计划列表
      */
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 435958507..e43e3f7b4 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
@@ -70,6 +70,19 @@ public class ByThemeTermplanController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询主题整合学期计划列表
+     */
+    @PreAuthorize("@ss.hasPermi('benyi:themetermplan:list')")
+    @GetMapping("/listsp")
+    public TableDataInfo listsp(ByThemeTermplan byThemeTermplan) {
+        byThemeTermplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+        List<ByThemeTermplan> list = null;
+        startPage();
+        list = byThemeTermplanService.selectByThemeTermplanList(byThemeTermplan);
+        return getDataTable(list);
+    }
+
     /**
      * 导出主题整合学期计划列表
      */
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeWeekplanController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeWeekplanController.java
index 9bc74d794..b001febef 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeWeekplanController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeWeekplanController.java
@@ -79,6 +79,21 @@ public class ByThemeWeekplanController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询主题整合周计划（根据月计划明细）列表
+     */
+    @PreAuthorize("@ss.hasPermi('benyi:themeweekplan:list')")
+    @GetMapping("/listsp")
+    public TableDataInfo listsp(ByThemeWeekplan byThemeWeekplan) {
+
+        byThemeWeekplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+        List<ByThemeWeekplan> list = null;
+        startPage();
+        list = byThemeWeekplanService.selectByThemeWeekplanList(byThemeWeekplan);
+
+        return getDataTable(list);
+    }
+
     /**
      * 导出主题整合周计划（根据月计划明细）列表
      */
diff --git a/ruoyi/src/main/java/com/ruoyi/project/common/SchoolCommon.java b/ruoyi/src/main/java/com/ruoyi/project/common/SchoolCommon.java
index ac2e7c7a9..ed35ac486 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/common/SchoolCommon.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/common/SchoolCommon.java
@@ -114,6 +114,7 @@ public class SchoolCommon {
     public String getClassId() {
 //        String strClassId = "-1";
         SysUser sysUser = getUser();
+
         ByClass byClass = new ByClass();
         //根据用户id来设置主班教师,配班教师,助理教师的教师id
         byClass.setZbjs(sysUser.getUserId());
@@ -148,6 +149,40 @@ public class SchoolCommon {
         return "";
     }
 
+    /**
+     * 判断当前用户是否拥有班级
+     **/
+    public String getClassIdOrSchoolAdmin() {
+        String strClassId = "";
+        SysUser sysUser = getUser();
+        List<SysRole> list = SecurityUtils.getLoginUser().getUser().getRoles();
+        System.out.println("roles:" + list.size());
+
+        if (list != null && list.size() > 0) {
+            for (int i = 0; i < list.size(); i++) {
+                String strKey = list.get(i).getRoleKey();
+                if (strKey.equals("school_admin") || strKey.equals("school_director")) {
+                    strClassId = "~";
+                }
+            }
+        }
+        ByClass byClass = new ByClass();
+        //根据用户id来设置主班教师,配班教师,助理教师的教师id
+        byClass.setZbjs(sysUser.getUserId());
+        byClass.setPbjs(sysUser.getUserId());
+        byClass.setZljs(sysUser.getUserId());
+        //新的返回byclassNew返回整条数据
+        ByClass byClassNew = byClassService.selectByClassByUserId(byClass);
+        //System.out.println("--------------------" + byClassNew);
+        if (byClassNew != null) {
+            //如果实体byclassnew不为空,那么取出它的班级编号
+            strClassId = strClassId + byClassNew.getBjbh();
+            return strClassId;
+        } else {
+        }
+        return "";
+    }
+
     public String getCurrentXnXq() {
         Calendar date = Calendar.getInstance();
         Integer iYear = date.get(Calendar.YEAR);
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/ByClassController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/ByClassController.java
index c2678f4ed..1e02af11a 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/ByClassController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/ByClassController.java
@@ -50,9 +50,15 @@ public class ByClassController extends BaseController {
     public TableDataInfo list(ByClass byClass) {
         List<ByClass> list = null;
         String classId = schoolCommon.getClassId();
+        String classIdAndschoolAdmin=schoolCommon.getClassIdOrSchoolAdmin();
         //如果是幼儿园教师 只显示当前班级
         if (schoolCommon.isSchool() && !schoolCommon.isStringEmpty(classId)) {
             byClass.setBjbh(classId);
+            //如果包含～ 说明是班级教师和管理员角色
+            if(classIdAndschoolAdmin.contains("~")){
+                System.out.println("多角色");
+                byClass.setBjbh("");
+            }
         } else {
         }
         startPage();