班级学生模块，获取班级年份动态

suser/src/main/java/com/xhkjedu/suser/service/gradeclass/GradeService.java

@@ -1,10 +1,10 @@
 package com.xhkjedu.suser.service.gradeclass;
 
 import com.xhkjedu.suser.mapper.gradeclass.GradeMapper;
-//import com.xhkjedu.suser.mapper.gradeclass.SchoolMapper;
+import com.xhkjedu.suser.mapper.gradeclass.SchoolMapper;
 import com.xhkjedu.suser.model.gradeclass.TGrade;
-import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.suser.vo.gradeclass.GradeVo;
+import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -13,15 +13,15 @@ import java.util.List;
 /**
  * @author ywx
  * @classname TGradeService
- * @description 
+ * @description
  * @date 2020/6/2 14:53
  **/
 @Service
 public class GradeService {
     @Resource
     private GradeMapper gradeMapper;
-    //@Resource
-    //private SchoolMapper schoolMapper;
+    @Resource
+    private SchoolMapper schoolMapper;
 
     //添加
     public Integer save(TGrade model) {
@@ -46,42 +46,40 @@ public class GradeService {
     }
 
     //获取列表
-    public List <TGrade> findAll(Integer schoolid) {
-        //Integer year = schoolMapper.getYearById(schoolid);
-        Integer year = 2021;
+    public List<TGrade> findAll(Integer schoolid) {
+        Integer year = schoolMapper.getYearById(schoolid);
         return gradeMapper.findAll(schoolid, year);
     }
 
     /**
      * 获取通知班级列表
+     *
+     * @return java.util.List<com.xhkjedu.suser.vo.gradeclass.GradeVo>
      * @Param [schoolid, year]
      * @Author ywx
      * @Date 2020/6/13 15:41
-     * @return java.util.List<com.xhkjedu.suser.vo.gradeclass.GradeVo>
      **/
-    public List<GradeVo> listClass(Integer schoolid,Integer classtype) {
-        //Integer year = schoolMapper.getYearById(schoolid);
-        Integer year = 2021;
-        return gradeMapper.listClass(schoolid, year,classtype);
+    public List<GradeVo> listClass(Integer schoolid, Integer classtype) {
+        Integer year = schoolMapper.getYearById(schoolid);
+        return gradeMapper.listClass(schoolid, year, classtype);
     }
 
     /**
      * 获取通知教师列表
+     *
+     * @return java.util.List<com.xhkjedu.suser.vo.gradeclass.GradeVo>
      * @Param [schoolid, year]
      * @Author ywx
      * @Date 2020/6/13 15:42
-     * @return java.util.List<com.xhkjedu.suser.vo.gradeclass.GradeVo>
      **/
     public List<GradeVo> listTeacher(Integer schoolid) {
-        //Integer year = schoolMapper.getYearById(schoolid);
-        Integer year = 2021;
+        Integer year = schoolMapper.getYearById(schoolid);
         return gradeMapper.listTeacher(schoolid, year);
     }
 
     //获取行政班和提高班
     public List<GradeVo> listClassForTeacher(Integer schoolid) {
-        //Integer year = schoolMapper.getYearById(schoolid);
-        Integer year = 2021;
-        return gradeMapper.listClassForTeacher(schoolid,year);
+        Integer year = schoolMapper.getYearById(schoolid);
+        return gradeMapper.listClassForTeacher(schoolid, year);
     }
 }

suser/src/main/resources/application.properties

@@ -1,16 +1,13 @@
 server.port=8083
-
 spring.application.name=suser
 #注册到我们本地的eureka注册中心，端口8081
 eureka.client.service-url.defaultZone=http://127.0.0.1:8081/eureka/
 #设置eureka输出日志级别
 logging.level.com.netflix=error
-
 spring.datasource.url=jdbc:mysql://dbtest.xhkjedu.com:13306/xhkjedu_school_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&rewriteBatchedStatements=true&allowMultiQueries=true
 spring.datasource.username=root
 spring.datasource.password=_xhkjedu!@#07
 spring.mvc.hiddenmethod.filter.enabled=true
-
 #数据库连接池配置
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #允许的最小空闲数
@@ -26,7 +23,6 @@ spring.datasource.hikari.max-lifetime=1800000
 spring.datasource.hikari.connection-timeout=20000
 # 测试连接是否可用的query 语句 在oracle是 select 1 from dual  36   28.26
 spring.datasource.hikari.connection-test-query=SELECT 1
-
 # 所有Entity别名类所在包
 mybatis.type-aliases-package=com.xhkjedu.suser.model,com.xhkjedu.suser.vo
 mybatis.mapper-Locations=classpath*:mapper/**/*.xml
@@ -36,7 +32,6 @@ mapper.identity=MYSQL
 logging.level.com.xhkjedu.suser.mapper=debug
 #分页
 spring.pagehelper.helper-dialect=mysql
-
 #redis配置
 spring.redis.host=cachetest.xhkjedu.com
 spring.redis.port=6379
@@ -59,6 +54,5 @@ zt.url=http://api.mix2.zthysms.com/
 signName=【河南星火燎原】
 #郑州管城大数据SSO认证鉴权接口
 ssourl=http://gcdsj.zzgcjy.cn/portal/sso/api/agent
-
 #版本号
-versionname=Test_v3.2.0
+versionname=Test_v3.2.1