From 523d9fa54b0df53f567d4be7b3716e64dd43a0b8 Mon Sep 17 00:00:00 2001
From: fkf <1475794025@qq.com>
Date: Mon, 8 May 2023 18:11:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A45-8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/api/sys_info/SysInfoFeign.java     |  5 ++
 .../system/api/sys_menu/SysMenuFeign.java     |  8 +-
 .../system/api/sys_score/SysScoreDto.java     |  1 -
 .../system/api/sys_score/SysScoreFeign.java   |  4 +-
 .../SysStudentScoreFeign.java                 |  4 -
 .../system/biz/sys_info/SysInfoMapper.java    |  2 +
 .../system/biz/sys_info/SysInfoMapper.xml     |  4 +
 .../demo/system/biz/sys_info/SysInfoRest.java |  5 ++
 .../system/biz/sys_info/SysInfoService.java   |  6 ++
 .../system/biz/sys_menu/SysMenuMapper.java    |  5 ++
 .../system/biz/sys_menu/SysMenuMapper.xml     | 16 ++++
 .../demo/system/biz/sys_menu/SysMenuRest.java | 15 +++-
 .../system/biz/sys_menu/SysMenuService.java   | 18 ++++-
 .../biz/sys_menu_role/SysMenuRoleMapper.java  |  4 +
 .../biz/sys_menu_role/SysMenuRoleMapper.xml   |  4 +
 .../biz/sys_menu_role/SysMenuRoleService.java |  7 ++
 .../system/biz/sys_plan/SysPlanMapper.xml     |  2 +-
 .../system/biz/sys_plan/SysPlanService.java   |  8 +-
 .../system/biz/sys_score/SysScoreMapper.java  |  3 +
 .../system/biz/sys_score/SysScoreMapper.xml   |  4 +
 .../system/biz/sys_score/SysScoreService.java |  4 +
 .../SysStudentScoreMapper.xml                 | 18 ++---
 .../SysStudentScoreRest.java                  |  5 --
 .../SysStudentScoreService.java               | 75 +++++++++++++------
 .../system/biz/sys_user/SysUserService.java   |  2 +-
 .../biz/sys_user_role/SysUserRoleMapper.java  |  8 +-
 .../biz/sys_user_role/SysUserRoleMapper.xml   |  8 ++
 .../biz/sys_user_role/SysUserRoleRest.java    |  1 -
 .../sys_user_role/SysUserRoleSerrvice.java    | 14 +++-
 29 files changed, 202 insertions(+), 58 deletions(-)

diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info/SysInfoFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info/SysInfoFeign.java
index 4b04d65..7832674 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info/SysInfoFeign.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info/SysInfoFeign.java
@@ -8,6 +8,7 @@ import com.yxt.demo.system.api.dict_type.DictTypeVo;
 import com.yxt.demo.system.api.sys_user.SysUserDto;
 import com.yxt.demo.system.utils.ResultBean;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.ibatis.annotations.Param;
@@ -40,4 +41,8 @@ public interface SysInfoFeign {
     @ApiOperation(value = "添加基本信息")
     @RequestMapping("/saveInfo")
     ResultBean saveInfo(@RequestBody SysInfo sysInfo);
+
+    @ApiOperation(value = "查询所有教师")
+    @RequestMapping("/selectTeacher")
+    ResultBean selectTeacher();
 }
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_menu/SysMenuFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_menu/SysMenuFeign.java
index fef4911..8de796e 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_menu/SysMenuFeign.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_menu/SysMenuFeign.java
@@ -18,9 +18,13 @@ public interface SysMenuFeign {
     @ApiOperation(value = "保存修改")
     ResultBean saveOrUpdates(@RequestBody SysMenuDto dto);
 
-    @PostMapping(value = "/list")
+    @PostMapping(value = "/list/{sid}")
     @ApiOperation(value = "列表")
-    ResultBean list();
+    ResultBean list(@PathVariable String sid);
+
+    @PostMapping(value = "/listList")
+    @ApiOperation(value = "列表")
+    ResultBean listList();
 
     @RequestMapping(value = "/deleteSysMenu/{sid}")
     @ApiOperation(value = "删除菜单")
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_score/SysScoreDto.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_score/SysScoreDto.java
index 7bd4dd4..0125d5f 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_score/SysScoreDto.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_score/SysScoreDto.java
@@ -17,7 +17,6 @@ public class SysScoreDto implements Dto {
     @NotBlank(message = "类别不能为空")
     private String type;
     @ApiModelProperty("类别Key")
-    @NotBlank(message = "类别Key不能为空")
     private String typeKey;
     @ApiModelProperty("成绩")
     private String score;
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_score/SysScoreFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_score/SysScoreFeign.java
index 9f15848..16730d1 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_score/SysScoreFeign.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_score/SysScoreFeign.java
@@ -31,8 +31,8 @@ public interface SysScoreFeign {
     ResultBean selectScore();
 
     @ApiOperation(value = "删除成绩")
-    @RequestMapping("/deleteScore")
-    ResultBean deleteScore(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid);
+    @RequestMapping("/deleteScore/{sid}")
+    ResultBean deleteScore(@PathVariable String sid);
 
     @ApiOperation(value = "查询科目")
     @RequestMapping("/selectScoreKM")
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_student_score/SysStudentScoreFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_student_score/SysStudentScoreFeign.java
index 52fe348..a6614ca 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_student_score/SysStudentScoreFeign.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_student_score/SysStudentScoreFeign.java
@@ -37,10 +37,6 @@ public interface SysStudentScoreFeign {
     @RequestMapping("/selectStudentScoreYIELD")
     ResultBean selectStudentScoreYIELD(@RequestBody SysStudentScoreYIELD sysStudentScoreYIELD);
 
-    @ApiOperation(value = "查询学生升学率、就业率、考公率")
-    @RequestMapping("/selectStudentRate")
-    ResultBean selectStudentRate(@RequestBody SysStudentScoreYIELD sysStudentScoreYIELD);
-
     @ApiOperation(value = "查询班级")
     @RequestMapping("/selectClass")
     ResultBean selectClass();
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoMapper.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoMapper.java
index 564e17f..4f3a535 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoMapper.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoMapper.java
@@ -39,4 +39,6 @@ public interface SysInfoMapper extends BaseMapper<SysInfo> {
     IPage<SysInfo> listPageVo(IPage<SysInfo> page, @Param(Constants.WRAPPER) QueryWrapper<SysInfo> qw);
 
     void updateInfoById(SysInfo sysInfo);
+
+    List<SysUser> selectTeacher();
 }
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoMapper.xml
index 279453e..432b89c 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoMapper.xml
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoMapper.xml
@@ -68,4 +68,8 @@
         </set>
         where id = #{id}
     </update>
+
+    <select id="selectTeacher" resultType="com.yxt.demo.system.api.sys_user.SysUser">
+        select * from sys_user where userName like '%js%' and type = 1
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoRest.java
index d6649de..ba55649 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoRest.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoRest.java
@@ -57,4 +57,9 @@ public class SysInfoRest implements SysInfoFeign {
     public ResultBean saveInfo(SysInfo sysInfo) {
         return sysInfoService.saveInfo(sysInfo);
     }
+
+    @Override
+    public ResultBean selectTeacher() {
+        return sysInfoService.selectTeacher();
+    }
 }
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoService.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoService.java
index 38c96bc..a3e039e 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoService.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoService.java
@@ -134,4 +134,10 @@ public class SysInfoService extends MybatisBaseService<SysInfoMapper, SysInfo> {
         SysInfo sysInfo = sysInfoMapper.selectInfoByUserSid(userSid);
         return sysInfo;
     }
+
+    public ResultBean selectTeacher() {
+        ResultBean rb = ResultBean.fireFail();
+        List<SysUser> sysInfos = sysInfoMapper.selectTeacher();
+        return rb.success().setData(sysInfos);
+    }
 }
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuMapper.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuMapper.java
index d046527..ff6bf3e 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuMapper.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.demo.system.api.sys_info.SysInfo;
 import com.yxt.demo.system.api.sys_menu.SysMenu;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -16,4 +17,8 @@ import java.util.List;
 public interface SysMenuMapper extends BaseMapper<SysMenu> {
 
     List<SysMenu> selectMenuList();
+
+    List<SysMenu> selectMenuListQX(@Param("sid") String sid);
+
+    List<SysMenu> selectMenuListByType(@Param("type") Integer type);
 }
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuMapper.xml
index 9e91a08..1963fe5 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuMapper.xml
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuMapper.xml
@@ -4,4 +4,20 @@
     <select id="selectMenuList" resultType="com.yxt.demo.system.api.sys_menu.SysMenu">
         select * from sys_menu
     </select>
+
+    <select id="selectMenuListQX" resultType="com.yxt.demo.system.api.sys_menu.SysMenu">
+        select m.* from sys_user u
+        inner join sys_user_role ur on u.sid = ur.userSid
+        inner join sys_role r on ur.roleSid = r.sid
+        inner join sys_menu_role mr on mr.roleSid = r.sid
+        inner join sys_menu m on m.sid = mr.menuSid
+        where u.sid = #{sid}
+    </select>
+
+    <select id="selectMenuListByType" resultType="com.yxt.demo.system.api.sys_menu.SysMenu">
+        select * from sys_menu m
+        inner join sys_menu_role mr on m.sid = mr.menuSid
+        inner join sys_role r on mr.roleSid = r.sid
+        where r.type = #{type}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuRest.java
index 1d6b205..288d441 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuRest.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuRest.java
@@ -1,6 +1,9 @@
 package com.yxt.demo.system.biz.sys_menu;
 
 import com.yxt.demo.system.api.sys_menu.*;
+import com.yxt.demo.system.api.sys_user.SysUser;
+import com.yxt.demo.system.biz.sys_user.SysUserMapper;
+import com.yxt.demo.system.biz.sys_user.SysUserService;
 import com.yxt.demo.system.utils.ResultBean;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,14 +22,22 @@ public class SysMenuRest implements SysMenuFeign {
 
     @Autowired
     private SysMenuService sysMenuService;
+    @Autowired
+    private SysUserMapper sysUserMapper;
     @Override
     public ResultBean saveOrUpdates(SysMenuDto dto) {
         return sysMenuService.saveOrUpdates(dto);
     }
 
     @Override
-    public ResultBean list() {
-        return sysMenuService.lists();
+    public ResultBean list(String sid) {
+        SysUser sysUser = sysUserMapper.selectUser(sid);
+        return sysMenuService.lists(sysUser);
+    }
+
+    @Override
+    public ResultBean listList() {
+        return sysMenuService.listList();
     }
 
     @Override
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuService.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuService.java
index 34723e6..ca92c6a 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuService.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuService.java
@@ -2,6 +2,7 @@ package com.yxt.demo.system.biz.sys_menu;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.yxt.demo.system.api.sys_user.SysUser;
 import com.yxt.demo.system.jdbc.service.MybatisBaseService;
 import com.yxt.demo.system.api.sys_menu.SysMenu;
 import com.yxt.demo.system.api.sys_menu.SysMenuDto;
@@ -43,7 +44,22 @@ public class SysMenuService extends MybatisBaseService<SysMenuMapper, SysMenu> {
         return rb.success();
     }
 
-    public ResultBean lists() {
+    public ResultBean lists(SysUser sysUser) {
+        ResultBean rb = ResultBean.fireFail();
+        List<SysMenu> sysMenus = null;
+        if (sysUser.getType() == 2){
+            sysMenus = sysMenuMapper.selectMenuList();
+        }else {
+            sysMenus = sysMenuMapper.selectMenuListQX(sysUser.getSid());
+            if (sysMenus.size() == 0){
+                sysMenus = sysMenuMapper.selectMenuListByType(sysUser.getType());
+            }
+        }
+
+        return rb.success().setData(sysMenus);
+    }
+
+    public ResultBean listList() {
         ResultBean rb = ResultBean.fireFail();
         List<SysMenu> sysMenus = sysMenuMapper.selectMenuList();
         return rb.success().setData(sysMenus);
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleMapper.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleMapper.java
index 8547255..2c69d87 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleMapper.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleMapper.java
@@ -1,8 +1,10 @@
 package com.yxt.demo.system.biz.sys_menu_role;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.demo.system.api.sys_menu.SysMenu;
 import com.yxt.demo.system.api.sys_menu_role.SysMenuRole;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -15,4 +17,6 @@ import java.util.List;
 public interface SysMenuRoleMapper extends BaseMapper<SysMenuRole> {
 
     List<SysMenuRole> selectMenuRoleList();
+
+    SysMenuRole selectMenuRoleByMenuSid(SysMenuRole sysMenuRole);
 }
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleMapper.xml
index a1e7082..299e3b3 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleMapper.xml
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleMapper.xml
@@ -4,4 +4,8 @@
     <select id="selectMenuRoleList" resultType="com.yxt.demo.system.api.sys_menu_role.SysMenuRole">
         select * from sys_menu_role
     </select>
+
+    <select id="selectMenuRoleByMenuSid" resultType="com.yxt.demo.system.api.sys_menu_role.SysMenuRole" parameterType="com.yxt.demo.system.api.sys_menu_role.SysMenuRole">
+        select * from sys_menu_role where menuSid = #{menuSid} and roleSid = #{roleSid}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleService.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleService.java
index 1b9a60d..ea076ca 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleService.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleService.java
@@ -22,6 +22,13 @@ public class SysMenuRoleService extends MybatisBaseService<SysMenuRoleMapper, Sy
 
     public ResultBean addSysMenuRole(SysMenuRole sysMenuRole){
         ResultBean rb = ResultBean.fireFail();
+        if (sysMenuRole.getMenuSid() == null && sysMenuRole.getRoleSid() == null){
+            return rb.setMsg("添加失败");
+        }
+        SysMenuRole sysMenuRole1 = sysMenuRoleMapper.selectMenuRoleByMenuSid(sysMenuRole);
+        if (sysMenuRole1 != null){
+            return rb.setMsg("该菜单已设置权限");
+        }
         int insert = baseMapper.insert(sysMenuRole);
         if (insert == 0){
             return rb.setMsg("添加失败");
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.xml
index 5658bb5..b3e0d54 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.xml
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.xml
@@ -31,7 +31,7 @@
     </select>
 
     <select id="selectSysPlanStudent" resultType="com.yxt.demo.system.api.sys_plan.SysPlan">
-        select * from sys_plan where teacherNo = #{teacherNo}
+        select * from sys_plan where teacherNo = #{teacherNo} and state != 0
     </select>
 
     <select id="selectSysPlan" resultType="com.yxt.demo.system.api.sys_plan.SysPlan">
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanService.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanService.java
index 4fbb1b0..0b74dde 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanService.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanService.java
@@ -29,6 +29,7 @@ public class SysPlanService extends MybatisBaseService<SysPlanMapper, SysPlan> {
         if (sysPlan.getPlanOpinion() != null){
             return rb.setMsg("学生不能自己填写反馈意见");
         }
+        sysPlan.setStateChinese("待提交");
         int insert = baseMapper.insert(sysPlan);
         if (insert == 0){
             return rb.setMsg("添加失败");
@@ -36,6 +37,7 @@ public class SysPlanService extends MybatisBaseService<SysPlanMapper, SysPlan> {
         SysPlanSchedule sysPlanSchedule = new SysPlanSchedule();
         sysPlanSchedule.setPlanSid(sysPlan.getSid());
         sysPlanSchedule.setPlanContent("0%");
+        sysPlanSchedule.setStateChinese("待反馈");
         sysPlanScheduleService.saveSysPlanSchedule(sysPlanSchedule);
         return rb.success();
     }
@@ -46,9 +48,11 @@ public class SysPlanService extends MybatisBaseService<SysPlanMapper, SysPlan> {
         if (sysPlan.getPlanOpinion() != null){
             sysPlan.setState(2);
             sysPlan.setStateChinese("已反馈");
-        }else {
-            return rb.setMsg("请填写反馈");
         }
+//        if (sysPlan.getStateChinese().equals("")){
+//            sysPlan.setStateChinese("待反馈");
+//            sysPlan.setState(1);
+//        }
         int i = baseMapper.updateById(sysPlan);
         if (i == 0){
             return rb.setMsg("修改失败");
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreMapper.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreMapper.java
index dfd224c..2504699 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreMapper.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.demo.system.api.sys_score.SysScore;
 import com.yxt.demo.system.api.sys_user.SysUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -18,4 +19,6 @@ public interface SysScoreMapper extends BaseMapper<SysScore> {
     List<SysScore> selectScoreList();
 
     List<SysScore> selectScoreKM();
+
+    SysScore selectScoreByType(@Param("type") String type);
 }
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreMapper.xml
index 66b56f1..6df8d7e 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreMapper.xml
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreMapper.xml
@@ -8,4 +8,8 @@
     <select id="selectScoreKM" resultType="com.yxt.demo.system.api.sys_score.SysScore">
         select type,id from sys_score
     </select>
+
+    <select id="selectScoreByType" resultType="com.yxt.demo.system.api.sys_score.SysScore">
+        select * from sys_score where type = #{type}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreService.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreService.java
index 7aa3ed9..dd7c951 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreService.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreService.java
@@ -26,6 +26,10 @@ public class SysScoreService extends MybatisBaseService<SysScoreMapper, SysScore
         ResultBean rb = ResultBean.fireFail();
         SysScore sysScore = new SysScore();
         BeanUtil.copyProperties(sysScoreDto, sysScore);
+        SysScore sysScore1 = sysScoreMapper.selectScoreByType(sysScore.getType());
+        if (sysScore1 != null){
+            return rb.setMsg("已有该科目成绩");
+        }
         baseMapper.insert(sysScore);
         return rb.success();
     }
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreMapper.xml
index 46f56e5..4b16522 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreMapper.xml
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreMapper.xml
@@ -9,7 +9,7 @@
         select i.calss,count(*) count,s.type name,count(*)/(select count(*) from sys_info where calss = #{calss} and infoId not like 'js%')*100 YIELD
         from (select type,score from sys_score where type = #{name}) s
         inner join sys_student_score ss on ss.fourScore >= s.score
-        inner join sys_info i on i.infoId = ss.studentNo
+        inner join sys_info i on i.infoId = ss.studentNo and i.calss = #{calss}
         group by i.calss
     </select>
 
@@ -17,7 +17,7 @@
         select i.calss,count(*) count,s.type name,count(*)/(select count(*) from sys_info where calss = #{calss} and infoId not like 'js%')*100 YIELD
         from (select type,score from sys_score where type = #{name}) s
         inner join sys_student_score ss on ss.sixScore >= s.score
-        inner join sys_info i on i.infoId = ss.studentNo
+        inner join sys_info i on i.infoId = ss.studentNo and i.calss = #{calss}
         group by i.calss
     </select>
 
@@ -25,30 +25,30 @@
         select i.calss,count(*) count,s.type name,count(*)/(select count(*) from sys_info where calss = #{calss} and infoId not like 'js%')*100 YIELD
         from (select type,score from sys_score where type = #{name}) s
         inner join sys_student_score ss on ss.computerScore >= s.score
-        inner join sys_info i on i.infoId = ss.studentNo
+        inner join sys_info i on i.infoId = ss.studentNo and i.calss = #{calss}
         group by i.calss
     </select>
 
     <select id="selectStudentScoreSchool" resultType="com.yxt.demo.system.api.sys_student_score.SysStudentScoreYIELD" parameterType="com.yxt.demo.system.api.sys_student_score.SysStudentScoreYIELD">
-        select i.calss,count(*) count,count(*)/(select count(*) from sys_info where calss = '8班' and infoId not like 'js%')*100 YIELD
+        select i.calss,count(*) count,count(*)/(select count(*) from sys_info where calss = #{calss} and infoId not like 'js%')*100 YIELD
         from  sys_student_score s
-        inner join sys_info i on i.infoId = s.studentNo
+        inner join sys_info i on i.infoId = s.studentNo and i.calss = #{calss}
         where s.enterSchool = '1'
         group by i.calss
     </select>
 
     <select id="selectStudentScoreEmployment" resultType="com.yxt.demo.system.api.sys_student_score.SysStudentScoreYIELD" parameterType="com.yxt.demo.system.api.sys_student_score.SysStudentScoreYIELD">
-        select i.calss,count(*) count,count(*)/(select count(*) from sys_info where calss = '8班' and infoId not like 'js%')*100 YIELD
+        select i.calss,count(*) count,count(*)/(select count(*) from sys_info where calss = #{calss} and infoId not like 'js%')*100 YIELD
         from  sys_student_score s
-        inner join sys_info i on i.infoId = s.studentNo
+        inner join sys_info i on i.infoId = s.studentNo and i.calss = #{calss}
         where s.employment = '1'
         group by i.calss
     </select>
 
     <select id="selectStudentScoreComputerKaoGong" resultType="com.yxt.demo.system.api.sys_student_score.SysStudentScoreYIELD" parameterType="com.yxt.demo.system.api.sys_student_score.SysStudentScoreYIELD">
-        select i.calss,count(*) count,count(*)/(select count(*) from sys_info where calss = '8班' and infoId not like 'js%')*100 YIELD
+        select i.calss,count(*) count,count(*)/(select count(*) from sys_info where calss = #{calss} and infoId not like 'js%')*100 YIELD
         from  sys_student_score s
-        inner join sys_info i on i.infoId = s.studentNo
+        inner join sys_info i on i.infoId = s.studentNo and i.calss = #{calss}
         where s.kaoGong = '1'
         group by i.calss
     </select>
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreRest.java
index 619cb7a..b7dfd94 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreRest.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreRest.java
@@ -54,11 +54,6 @@ public class SysStudentScoreRest implements SysStudentScoreFeign {
         return sysStudentScoreService.selectStudentScoreYIELD(sysStudentScoreYIELD);
     }
 
-    @Override
-    public ResultBean selectStudentRate(SysStudentScoreYIELD sysStudentScoreYIELD) {
-        return sysStudentScoreService.selectStudentRate(sysStudentScoreYIELD);
-    }
-
     @Override
     public ResultBean selectClass() {
         return sysStudentScoreService.selectClass();
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreService.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreService.java
index 17ffa83..5527f56 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreService.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreService.java
@@ -9,9 +9,7 @@ import com.yxt.demo.system.utils.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * @Author dimengzhe
@@ -52,53 +50,86 @@ public class SysStudentScoreService  extends MybatisBaseService<SysStudentScoreM
         SysStudentScoreYIELD ssy = null;
         if (name.equals("四级")){
             ssy = baseMapper.electStudentScoreYIELD(sysStudentScoreYIELD);
+            if (ssy == null){
+                SysStudentScoreYIELD ssyq = new SysStudentScoreYIELD();
+                ssyq.setName("四级");
+                ssyq.setCount(0);
+                ssyq.setYIELD("0");
+                Object [] a = new Object[1];
+                a[0] = ssyq;
+                return rb.success().setData(a);
+            }else {
+                ssy.setName("四级");
+            }
         }else if (name.equals("六级")){
             ssy = baseMapper.electStudentScoreSixYIELD(sysStudentScoreYIELD);
+            if (ssy == null){
+                SysStudentScoreYIELD ssyq = new SysStudentScoreYIELD();
+                ssyq.setName("六级");
+                ssyq.setCount(0);
+                ssyq.setYIELD("0");
+                Object [] a = new Object[1];
+                a[0] = ssyq;
+                return rb.success().setData(a);
+            }else {
+                ssy.setName("六级");
+            }
         }else if (name.equals("计算机")){
             ssy = baseMapper.electStudentScoreComputerYIELD(sysStudentScoreYIELD);
-        }
-        return rb.success().setData(ssy);
-    }
-
-    public ResultBean selectStudentRate(SysStudentScoreYIELD sysStudentScoreYIELD) {
-        ResultBean rb = ResultBean.fireFail();
-        String name = sysStudentScoreYIELD.getName();
-        SysStudentScoreYIELD ssy = new SysStudentScoreYIELD();
-        if (name.equals("升学率")){
+            if (ssy == null){
+                SysStudentScoreYIELD ssyq = new SysStudentScoreYIELD();
+                ssyq.setName("计算机");
+                ssyq.setCount(0);
+                ssyq.setYIELD("0");
+                Object [] a = new Object[1];
+                a[0] = ssyq;
+                return rb.success().setData(a);
+            }else {
+                ssy.setName("计算机");
+            }
+        }else if (name.equals("升学")){
             ssy = baseMapper.selectStudentScoreSchool(sysStudentScoreYIELD);
             if (ssy == null){
                 SysStudentScoreYIELD ssyq = new SysStudentScoreYIELD();
                 ssyq.setName("升学率");
                 ssyq.setCount(0);
                 ssyq.setYIELD("0");
-                return rb.success().setData(ssyq);
+                Object [] a = new Object[1];
+                a[0] = ssyq;
+                return rb.success().setData(a);
             }else {
                 ssy.setName("升学率");
             }
-        }else if (name.equals("就业率")){
+        }else if (name.equals("就业")){
             ssy = baseMapper.selectStudentScoreEmployment(sysStudentScoreYIELD);
             if (ssy == null){
                 SysStudentScoreYIELD ssyq = new SysStudentScoreYIELD();
                 ssyq.setName("就业率");
                 ssyq.setCount(0);
                 ssyq.setYIELD("0");
-                return rb.success().setData(ssyq);
+                Object [] a = new Object[1];
+                a[0] = ssyq;
+                return rb.success().setData(a);
             }else {
                 ssy.setName("就业率");
             }
-        }else if (name.equals("考公率")){
+        }else if (name.equals("考公")){
             ssy = baseMapper.selectStudentScoreComputerKaoGong(sysStudentScoreYIELD);
             if (ssy == null){
                 SysStudentScoreYIELD ssyq = new SysStudentScoreYIELD();
                 ssyq.setName("考公率");
                 ssyq.setCount(0);
                 ssyq.setYIELD("0");
-                return rb.success().setData(ssyq);
+                Object [] a = new Object[1];
+                a[0] = ssyq;
+                return rb.success().setData(a);
             }else {
                 ssy.setName("考公率");
             }
         }
-        return rb.success().setData(ssy);
+        Object [] a = new Object[1];
+        a[0] = ssy;
+        return rb.success().setData(a);
     }
 
     public ResultBean selectClass() {
@@ -107,10 +138,10 @@ public class SysStudentScoreService  extends MybatisBaseService<SysStudentScoreM
         int i = 1;
         List<Object> list = new ArrayList<>();
         for (int j = 0;j < sysInfos.size();j++) {
-            Object [] a = new Object[2];
-            a[0] = sysInfos.get(j);
-            a[1] = i++;
-            list.add(a);
+            Map<Object, Object> map = new HashMap<>();
+            map.put("calss",sysInfos.get(j));
+            map.put("id",i++);
+            list.add(map);
         }
         return rb.success().setData(list);
     }
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user/SysUserService.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user/SysUserService.java
index 7c0cc51..1759200 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user/SysUserService.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user/SysUserService.java
@@ -141,7 +141,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         ResultBean rb = ResultBean.fireFail();
         int i = sysUserMapper.updateById(sysUser);
         if (i != 0){
-            return rb.setMsg("修改密码成功");
+            return rb.success().setMsg("修改密码成功");
         }
         return rb.setMsg("修改失败,请重试！！！");
     }
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleMapper.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleMapper.java
index 447b89c..316866b 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleMapper.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleMapper.java
@@ -1,6 +1,8 @@
 package com.yxt.demo.system.biz.sys_user_role;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.demo.system.api.sys_role.SysRole;
+import com.yxt.demo.system.api.sys_user.SysUser;
 import com.yxt.demo.system.api.sys_user_role.SysUserRole;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -15,9 +17,13 @@ import java.util.List;
 @Mapper
 public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
 
-    List<SysUserRole> selectSysUserRole(String sid);
+    List<SysUserRole> selectSysUserRole(@Param("sid") String sid);
 
     List<SysUserRole> selectUserRoleList();
 
     SysUserRole selectUserRole(@Param("sid") String sid);
+
+    void updateUserType(SysUser sysUser);
+
+    void addUserRole(SysUserRole sysUserRole);
 }
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleMapper.xml
index 1ba1bee..a1f233e 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleMapper.xml
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleMapper.xml
@@ -15,4 +15,12 @@
         left join sys_role r on ur.roleSid = r.sid
         where ur.userSid = #{sid}
     </select>
+
+    <update id="updateUserType" parameterType="com.yxt.demo.system.api.sys_user.SysUser">
+        update sys_user set type = #{type} where sid = #{sid}
+    </update>
+
+    <insert id="addUserRole" parameterType="com.yxt.demo.system.api.sys_user_role.SysUserRole">
+        insert into sys_user_role (sid,userSid,roleSid) values (#{sid},#{userSid},#{roleSid})
+    </insert>
 </mapper>
\ No newline at end of file
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleRest.java
index 9b22829..74414b2 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleRest.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleRest.java
@@ -1,6 +1,5 @@
 package com.yxt.demo.system.biz.sys_user_role;
 
-import com.yxt.demo.system.api.sys_user.SysUser;
 import com.yxt.demo.system.api.sys_user_role.SysUserRole;
 import com.yxt.demo.system.api.sys_user_role.SysUserRoleFeign;
 import com.yxt.demo.system.utils.ResultBean;
diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleSerrvice.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleSerrvice.java
index abd3cb8..42aa978 100644
--- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleSerrvice.java
+++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleSerrvice.java
@@ -1,6 +1,8 @@
 package com.yxt.demo.system.biz.sys_user_role;
 
+import com.yxt.demo.system.api.sys_role.SysRole;
 import com.yxt.demo.system.api.sys_user.SysUser;
+import com.yxt.demo.system.biz.sys_role.SysRoleService;
 import com.yxt.demo.system.jdbc.service.MybatisBaseService;
 import com.yxt.demo.system.api.sys_user_role.SysUserRole;
 import com.yxt.demo.system.utils.ResultBean;
@@ -19,6 +21,8 @@ import java.util.List;
 public class SysUserRoleSerrvice extends MybatisBaseService<SysUserRoleMapper, SysUserRole> {
     @Autowired
     private SysUserRoleMapper sysUserRoleMapper;
+    @Autowired
+    private SysRoleService sysRoleService;
 
     public List<SysUserRole> selectSysUserRole(String sid){
         return sysUserRoleMapper.selectSysUserRole(sid);
@@ -26,10 +30,12 @@ public class SysUserRoleSerrvice extends MybatisBaseService<SysUserRoleMapper, S
 
     public ResultBean addUserRole(SysUserRole sysUserRole){
         ResultBean rb = ResultBean.fireFail();
-        int insert = sysUserRoleMapper.insert(sysUserRole);
-        if (insert == 0){
-            return rb.setMsg("新增失败");
-        }
+        sysUserRoleMapper.addUserRole(sysUserRole);
+        SysRole sysRole = sysRoleService.fetchBySid(sysUserRole.getRoleSid());
+        SysUser sysUser = new SysUser();
+        sysUser.setType(sysRole.getType());
+        sysUser.setSid(sysUserRole.getUserSid());
+        sysUserRoleMapper.updateUserType(sysUser);
         return rb.setSuccess(true).setMsg("新增成功");
     }