12.22修改教师电子档案

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentController.java

@@ -4,9 +4,15 @@ import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.ISysDeptService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,16 +28,15 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.core.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
-import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessment;
-import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentReq;
-import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentVo;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.*;
 import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAclassTeacherAssessmentService;
+import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
 
 import javax.servlet.http.HttpServletResponse;
 
 /**
  * 班主任考核Controller
- * 
+ *
  * @author ruoyi
  * @date 2023-12-12
  */
@@ -42,6 +47,10 @@ public class SchoolAclassTeacherAssessmentController extends BaseController
     @Autowired
     private ISchoolAclassTeacherAssessmentService schoolAclassTeacherAssessmentService;
     private Logger log = LoggerFactory.getLogger(SchoolAworkloadController.class);
+    @Autowired
+    private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
+    @Autowired
+    private ISysDeptService sysDeptService;
 
     /**
      * 查询班主任考核列表
@@ -49,9 +58,37 @@ public class SchoolAclassTeacherAssessmentController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(SchoolAclassTeacherAssessmentReq req)
     {
-        startPage();
-        List<SchoolAclassTeacherAssessmentVo> list = schoolAclassTeacherAssessmentService.selectSchoolAclassTeacherAssessmentList(req);
-        return getDataTable(list);
+
+        //获取当前登陆人信息
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        //获取当前登陆人的角色信息
+        List<SysRole> roles = user.getRoles();
+        if (user.isAdmin()){
+            startPage();
+            List<SchoolAclassTeacherAssessmentVo> list = schoolAclassTeacherAssessmentService.selectSchoolAclassTeacherAssessmentList(req);
+            return getDataTable(list);
+        }
+        for (SysRole role : roles) {
+            //教师电子档案超级管理员和班主任考核管理员可以看全部数据
+            if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("bzrkh_admin")){
+                startPage();
+                List<SchoolAclassTeacherAssessmentVo> list = schoolAclassTeacherAssessmentService.selectSchoolAclassTeacherAssessmentList(req);
+                return getDataTable(list);
+            }else if (role.getRoleKey().equals("jsdnzj_admin")){
+                //教师电子档案中级管理员只能看本部门及以下的数据
+                //获取当前登陆人的部门信息
+                SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+                //获取当前登陆人部门下所有人的身份证号
+                List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
+                if (deptUserIdCards.size() > 0){
+                    req.setIdCards(deptUserIdCards);
+                }
+                startPage();
+                List<SchoolAclassTeacherAssessmentVo> list = schoolAclassTeacherAssessmentService.selectSchoolAclassTeacherAssessmentList(req);
+                return getDataTable(list);
+            }
+        }
+        return getDataTable(new ArrayList<>());
     }
 
 
@@ -147,9 +184,59 @@ public class SchoolAclassTeacherAssessmentController extends BaseController
      */
     @PostMapping("/export")
     public void export(HttpServletResponse response, SchoolAclassTeacherAssessmentReq req ) throws Exception{
-        List<SchoolAclassTeacherAssessment> schoolAclassTeacherAssessmentVos = schoolAclassTeacherAssessmentService.selectSchoolList(req);
-        ExcelUtil<SchoolAclassTeacherAssessment> util = new ExcelUtil<>(SchoolAclassTeacherAssessment.class);
-        util.exportExcel(response, schoolAclassTeacherAssessmentVos, "老师考核");
+
+        //获取当前登陆人信息
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        //获取当前登陆人的角色信息
+        List<SysRole> roles = user.getRoles();
+        if (user.isAdmin()){
+            List<SchoolAclassTeacherAssessment> schoolAclassTeacherAssessmentVos = schoolAclassTeacherAssessmentService.selectSchoolList(req);
+            List<SchoolAclassTeacherAssessmentExport> list = new ArrayList<>();
+            for (SchoolAclassTeacherAssessment schoolAclassTeacherAssessmentVo : schoolAclassTeacherAssessmentVos) {
+                SchoolAclassTeacherAssessmentExport schoolAclassTeacherAssessmentExport = new SchoolAclassTeacherAssessmentExport();
+                BeanUtils.copyProperties(schoolAclassTeacherAssessmentVo,schoolAclassTeacherAssessmentExport);
+                list.add(schoolAclassTeacherAssessmentExport);
+            }
+            ExcelUtil<SchoolAclassTeacherAssessmentExport> util = new ExcelUtil<>(SchoolAclassTeacherAssessmentExport.class);
+            util.exportExcel(response, list, "老师考核");
+        }else {
+            for (SysRole role : roles) {
+                //教师电子档案超级管理员和班主任考核管理员可以看全部数据
+                if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("bzrkh_admin")){
+                    List<SchoolAclassTeacherAssessment> schoolAclassTeacherAssessmentVos = schoolAclassTeacherAssessmentService.selectSchoolList(req);
+                    List<SchoolAclassTeacherAssessmentExport> list = new ArrayList<>();
+                    for (SchoolAclassTeacherAssessment schoolAclassTeacherAssessmentVo : schoolAclassTeacherAssessmentVos) {
+                        SchoolAclassTeacherAssessmentExport schoolAclassTeacherAssessmentExport = new SchoolAclassTeacherAssessmentExport();
+                        BeanUtils.copyProperties(schoolAclassTeacherAssessmentVo,schoolAclassTeacherAssessmentExport);
+                        list.add(schoolAclassTeacherAssessmentExport);
+                    }
+                    ExcelUtil<SchoolAclassTeacherAssessmentExport> util = new ExcelUtil<>(SchoolAclassTeacherAssessmentExport.class);
+                    util.exportExcel(response, list, "老师考核");
+                }else if (role.getRoleKey().equals("jsdnzj_admin")){
+                    //教师电子档案中级管理员只能看本部门及以下的数据
+                    //获取当前登陆人的部门信息
+                    SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+                    //获取当前登陆人部门下所有人的身份证号
+                    List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
+                    if (deptUserIdCards.size() > 0){
+                        req.setIdCards(deptUserIdCards);
+                    }
+                    List<SchoolAclassTeacherAssessment> schoolAclassTeacherAssessmentVos = schoolAclassTeacherAssessmentService.selectSchoolList(req);
+                    List<SchoolAclassTeacherAssessmentExport> list = new ArrayList<>();
+                    for (SchoolAclassTeacherAssessment schoolAclassTeacherAssessmentVo : schoolAclassTeacherAssessmentVos) {
+                        SchoolAclassTeacherAssessmentExport schoolAclassTeacherAssessmentExport = new SchoolAclassTeacherAssessmentExport();
+                        BeanUtils.copyProperties(schoolAclassTeacherAssessmentVo,schoolAclassTeacherAssessmentExport);
+                        list.add(schoolAclassTeacherAssessmentExport);
+                    }
+                    ExcelUtil<SchoolAclassTeacherAssessmentExport> util = new ExcelUtil<>(SchoolAclassTeacherAssessmentExport.class);
+                    util.exportExcel(response, list, "老师考核");
+                }else {
+                    ExcelUtil<SchoolAclassTeacherAssessmentExport> util = new ExcelUtil<>(SchoolAclassTeacherAssessmentExport.class);
+                    util.exportExcel(response, new ArrayList<>(), "老师考核");
+                }
+            }
+        }
+
     }
 
 

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolAworkloadController.java

@@ -5,7 +5,12 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.ISysDeptService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -24,14 +29,13 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.core.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
-import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkload;
-import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadExport;
-import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.*;
 import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAworkloadService;
+import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
 
 /**
  * 工作量信息Controller
- * 
+ *
  * @author ruoyi
  * @date 2023-12-11
  */
@@ -42,16 +46,48 @@ public class SchoolAworkloadController extends BaseController
     @Autowired
     private ISchoolAworkloadService schoolAworkloadService;
     private Logger log = LoggerFactory.getLogger(SchoolAworkloadController.class);
+    @Autowired
+    private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
+    @Autowired
+    private ISysDeptService sysDeptService;
 
     /**
      * 查询工作量信息列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(SchoolAworkload schoolAworkload)
+    public TableDataInfo list(SchoolAworkloadVo schoolAworkloadVo)
     {
-        startPage();
-        List<SchoolAworkloadVo> list = schoolAworkloadService.selectSchoolAworkloadList(schoolAworkload);
-        return getDataTable(list);
+
+        //获取当前登陆人信息
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        //获取当前登陆人的角色信息
+        List<SysRole> roles = user.getRoles();
+        if (user.isAdmin()){
+            startPage();
+            List<SchoolAworkloadVo> list = schoolAworkloadService.selectSchoolAworkloadList(schoolAworkloadVo);
+            return getDataTable(list);
+        }
+        for (SysRole role : roles) {
+            //教师电子档案超级管理员和工作量信息管理员可以看全部数据
+            if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("gzl_admin")){
+                startPage();
+                List<SchoolAworkloadVo> list = schoolAworkloadService.selectSchoolAworkloadList(schoolAworkloadVo);
+                return getDataTable(list);
+            }else if (role.getRoleKey().equals("jsdnzj_admin")){
+                //教师电子档案中级管理员只能看本部门及以下的数据
+                //获取当前登陆人的部门信息
+                SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+                //获取当前登陆人部门下所有人的身份证号
+                List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
+                if (deptUserIdCards.size() > 0){
+                    schoolAworkloadVo.setIdCards(deptUserIdCards);
+                }
+                startPage();
+                List<SchoolAworkloadVo> list = schoolAworkloadService.selectSchoolAworkloadList(schoolAworkloadVo);
+                return getDataTable(list);
+            }
+        }
+        return getDataTable(new ArrayList<>());
     }
 
 
@@ -146,10 +182,60 @@ public class SchoolAworkloadController extends BaseController
      * @return
      */
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SchoolAworkload schoolAworkload ) throws Exception{
-        List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadService.selectAworkloadList(schoolAworkload);
-        ExcelUtil<SchoolAworkloadExport> util = new ExcelUtil<>(SchoolAworkloadExport.class);
-        util.exportExcel(response, schoolAworkloadVos, "工作量内容");
+    public void export(HttpServletResponse response, SchoolAworkloadVo schoolAworkloadVo ) throws Exception{
+
+        //获取当前登陆人信息
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        //获取当前登陆人的角色信息
+        List<SysRole> roles = user.getRoles();
+        if (user.isAdmin()){
+            List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadService.selectAworkloadList(schoolAworkloadVo);
+            List<SchoolAworkloadDc> list =  new ArrayList<>();
+            for (SchoolAworkloadExport aworkloadVo : schoolAworkloadVos) {
+                SchoolAworkloadDc schoolAworkloadDc = new SchoolAworkloadDc();
+                BeanUtils.copyProperties(aworkloadVo,schoolAworkloadDc);
+                list.add(schoolAworkloadDc);
+            }
+            ExcelUtil<SchoolAworkloadDc> util = new ExcelUtil<>(SchoolAworkloadDc.class);
+            util.exportExcel(response, list, "工作量内容");
+        }else {
+            for (SysRole role : roles) {
+                //教师电子档案超级管理员和教师基础信息管理员可以看全部数据
+                if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("gzl_admin")){
+                    List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadService.selectAworkloadList(schoolAworkloadVo);
+                    List<SchoolAworkloadDc> list =  new ArrayList<>();
+                    for (SchoolAworkloadExport aworkloadVo : schoolAworkloadVos) {
+                        SchoolAworkloadDc schoolAworkloadDc = new SchoolAworkloadDc();
+                        BeanUtils.copyProperties(aworkloadVo,schoolAworkloadDc);
+                        list.add(schoolAworkloadDc);
+                    }
+                    ExcelUtil<SchoolAworkloadDc> util = new ExcelUtil<>(SchoolAworkloadDc.class);
+                    util.exportExcel(response, list, "工作量内容");
+                }else if (role.getRoleKey().equals("jsdnzj_admin")){
+                    //教师电子档案中级管理员只能看本部门及以下的数据
+                    //获取当前登陆人的部门信息
+                    SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+                    //获取当前登陆人部门下所有人的身份证号
+                    List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
+                    if (deptUserIdCards.size() > 0){
+                        schoolAworkloadVo.setIdCards(deptUserIdCards);
+                    }
+                    List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadService.selectAworkloadList(schoolAworkloadVo);
+                    List<SchoolAworkloadDc> list =  new ArrayList<>();
+                    for (SchoolAworkloadExport aworkloadVo : schoolAworkloadVos) {
+                        SchoolAworkloadDc schoolAworkloadDc = new SchoolAworkloadDc();
+                        BeanUtils.copyProperties(aworkloadVo,schoolAworkloadDc);
+                        list.add(schoolAworkloadDc);
+                    }
+                    ExcelUtil<SchoolAworkloadDc> util = new ExcelUtil<>(SchoolAworkloadDc.class);
+                    util.exportExcel(response, list, "工作量内容");
+                }else {
+                    ExcelUtil<SchoolAworkloadDc> util = new ExcelUtil<>(SchoolAworkloadDc.class);
+                    util.exportExcel(response, new ArrayList<>(), "工作量内容");
+                }
+            }
+        }
+
     }
 
 

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolGkAchievementController.java

 package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
 
+import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,10 +29,12 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolGkAchievement;
 import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolGkAchievementVo;
 import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolGkAchievementService;
+import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
+import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXcomprehensiveHonorsVo;
 
 /**
  * 高考成绩Controller
- * 
+ *
  * @author ruoyi
  * @date 2023-12-13
  */
@@ -37,16 +44,47 @@ public class SchoolGkAchievementController extends BaseController
 {
     @Autowired
     private ISchoolGkAchievementService schoolGkAchievementService;
+    @Autowired
+    private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
+    @Autowired
+    private ISysDeptService sysDeptService;
 
     /**
      * 查询高考成绩列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(SchoolGkAchievement schoolGkAchievement)
+    public TableDataInfo list(SchoolGkAchievementVo schoolGkAchievementVo)
     {
-        startPage();
-        List<SchoolGkAchievementVo> list = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievement);
-        return getDataTable(list);
+
+        //获取当前登陆人信息
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        //获取当前登陆人的角色信息
+        List<SysRole> roles = user.getRoles();
+        if (user.isAdmin()) {
+            startPage();
+            List<SchoolGkAchievementVo> list = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievementVo);
+            return getDataTable(list);
+        }
+        for (SysRole role : roles) {
+            if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("gkcj_admin")){
+                startPage();
+                List<SchoolGkAchievementVo> list = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievementVo);
+                return getDataTable(list);
+            }else if (role.getRoleKey().equals("jsdnzj_admin")){
+                //教师电子档案中级管理员只能查看本部门及部门以下的数据
+                //根据用户部门id查询用户部门信息
+                SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+                //查询本部门下所有教师的id
+                List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
+                if (deptUserIds.size() > 0){
+                    schoolGkAchievementVo.setUserIds(deptUserIds);
+                }
+                startPage();
+                List<SchoolGkAchievementVo> list = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievementVo);
+                return getDataTable(list);
+            }
+        }
+        return getDataTable(new ArrayList<>());
     }
 
 
@@ -55,9 +93,9 @@ public class SchoolGkAchievementController extends BaseController
      */
 
     @GetMapping("/teacher/list")
-    public TableDataInfo teacherList(SchoolGkAchievement schoolGkAchievement){
+    public TableDataInfo teacherList(SchoolGkAchievementVo schoolGkAchievementVo){
         startPage();
-        List<SchoolGkAchievement> list = schoolGkAchievementService.selectSchoolGkAchievementList(schoolGkAchievement);
+        List<SchoolGkAchievement> list = schoolGkAchievementService.selectSchoolGkAchievementList(schoolGkAchievementVo);
         return getDataTable(list);
     }
 
@@ -107,10 +145,41 @@ public class SchoolGkAchievementController extends BaseController
      */
     @Log(title = "高考成绩", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SchoolGkAchievement schoolGkAchievement)
+    public void export(HttpServletResponse response, SchoolGkAchievementVo schoolGkAchievementVo)
     {
-        List<SchoolGkAchievement> list = schoolGkAchievementService.selectSchoolGkAchievementList(schoolGkAchievement);
-        ExcelUtil<SchoolGkAchievement> util = new ExcelUtil<SchoolGkAchievement>(SchoolGkAchievement.class);
-        util.exportExcel(response, list, "高考成绩数据");
+
+        //获取当前登陆人信息
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        //获取当前登陆人的角色信息
+        List<SysRole> roles = user.getRoles();
+        if (user.isAdmin()) {
+            List<SchoolGkAchievement> list = schoolGkAchievementService.selectSchoolGkAchievementList(schoolGkAchievementVo);
+            ExcelUtil<SchoolGkAchievement> util = new ExcelUtil<SchoolGkAchievement>(SchoolGkAchievement.class);
+            util.exportExcel(response, list, "高考成绩数据");
+        }else {
+            for (SysRole role : roles) {
+                if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("gkcj_admin")){
+                    List<SchoolGkAchievement> list = schoolGkAchievementService.selectSchoolGkAchievementList(schoolGkAchievementVo);
+                    ExcelUtil<SchoolGkAchievement> util = new ExcelUtil<SchoolGkAchievement>(SchoolGkAchievement.class);
+                    util.exportExcel(response, list, "高考成绩数据");
+                }else if (role.getRoleKey().equals("jsdnzj_admin")){
+                    //教师电子档案中级管理员只能查看本部门及部门以下的数据
+                    //根据用户部门id查询用户部门信息
+                    SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+                    //查询本部门下所有教师的id
+                    List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
+                    if (deptUserIds.size() > 0){
+                        schoolGkAchievementVo.setUserIds(deptUserIds);
+                    }
+                    List<SchoolGkAchievement> list = schoolGkAchievementService.selectSchoolGkAchievementList(schoolGkAchievementVo);
+                    ExcelUtil<SchoolGkAchievement> util = new ExcelUtil<SchoolGkAchievement>(SchoolGkAchievement.class);
+                    util.exportExcel(response, list, "高考成绩数据");
+                }else {
+                    ExcelUtil<SchoolGkAchievement> util = new ExcelUtil<SchoolGkAchievement>(SchoolGkAchievement.class);
+                    util.exportExcel(response, new ArrayList<>(), "高考成绩数据");
+                }
+            }
+        }
+
     }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationController.java

@@ -9,10 +9,15 @@ import com.itextpdf.text.pdf.PdfPTable;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.pdf.PDFUtil;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.service.impl.SysDictDataServiceImpl;
 import org.slf4j.Logger;
@@ -24,6 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
 import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
 import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.*;
 import yangtz.cs.liu.campus.service.impl.teacherFiles.IdCardNumberUtils;
+import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
 import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.SchoolTeacherBasichlnformationService;
 import yangtz.cs.liu.campus.vo.fudao.FudaoStudentVo;
 import yangtz.cs.liu.campus.vo.fudao.FudaoTeacherVo;
@@ -45,6 +51,10 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
 
     @Autowired
     private SysDictDataServiceImpl sysDictDataService;
+    @Autowired
+    private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
+    @Autowired
+    private ISysDeptService sysDeptService;
 
     /**
      * 获取老师基本信息列表
@@ -53,9 +63,37 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
      */
     @GetMapping("/list")
     public TableDataInfo list(SchoolTeacherBasicInformationVo information) throws  Exception{
-        startPage();
-        List<SchoolTeacherBasicInformationVo> list = basichlnformationService.list(information);
-        return getDataTable(list);
+
+        //获取当前登陆人信息
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        //获取当前登陆人的角色信息
+        List<SysRole> roles = user.getRoles();
+        if (user.isAdmin()){
+            startPage();
+            List<SchoolTeacherBasicInformationVo> list = basichlnformationService.list(information);
+            return getDataTable(list);
+        }
+        for (SysRole role : roles) {
+            //教师电子档案超级管理员和教师基础信息管理员可以看全部数据
+            if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jsjcxj_admin")){
+                startPage();
+                List<SchoolTeacherBasicInformationVo> list = basichlnformationService.list(information);
+                return getDataTable(list);
+            }else if (role.getRoleKey().equals("jsdnzj_admin")){
+                //教师电子档案中级管理员只能看本部门及以下的数据
+                //获取当前登陆人的部门信息
+                SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+                //获取当前登陆人部门下所有人的身份证号
+                List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
+                if (deptUserIdCards.size() > 0){
+                    information.setIdCards(deptUserIdCards);
+                }
+                startPage();
+                List<SchoolTeacherBasicInformationVo> list = basichlnformationService.list(information);
+                return getDataTable(list);
+            }
+        }
+        return getDataTable(new ArrayList<>());
     }
 
     /**
@@ -167,15 +205,50 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
      */
    @PostMapping("/export")
     public void export(HttpServletResponse response, SchoolTeacherBasicInformationVo export ) throws Exception{
-        ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class);
-//            //查询出来结果复制
-            List<SchoolTeacherBasicInformationVo> list1 = basichlnformationService.list(export);
-//            list1.forEach(date->{
-//                SchoolTeacherBasiclnExport schoolTeacherBasiclnExport = new SchoolTeacherBasiclnExport();
-//                BeanUtils.copyProperties(date,schoolTeacherBasiclnExport);
-//                exportList.add(schoolTeacherBasiclnExport);
-//            });
-            util.exportExcel(response, list1, "教师基本信息");
+
+       //获取当前登陆人信息
+       SysUser user = SecurityUtils.getLoginUser().getUser();
+       //获取当前登陆人的角色信息
+       List<SysRole> roles = user.getRoles();
+       if (user.isAdmin()){
+           List<SchoolTeacherBasicInformationVo> list1 = basichlnformationService.list(export);
+           ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class);
+           util.exportExcel(response, list1, "教师基本信息");
+       }else{
+           for (SysRole role : roles) {
+               //教师电子档案超级管理员和教师基础信息管理员可以看全部数据
+               if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jsjcxj_admin")){
+                   List<SchoolTeacherBasicInformationVo> list1 = basichlnformationService.list(export);
+                   ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class);
+                   util.exportExcel(response, list1, "教师基本信息");
+               }else if (role.getRoleKey().equals("jsdnzj_admin")){
+                   //教师电子档案中级管理员只能看本部门及以下的数据
+                   //获取当前登陆人的部门信息
+                   SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+                   //获取当前登陆人部门下所有人的身份证号
+                   List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
+                   if (deptUserIdCards.size() > 0){
+                       export.setIdCards(deptUserIdCards);
+                   }
+                   List<SchoolTeacherBasicInformationVo> list1 = basichlnformationService.list(export);
+                   ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class);
+                   util.exportExcel(response, list1, "教师基本信息");
+               }else {
+                   List<SchoolTeacherBasicInformationVo> list1 = basichlnformationService.list(export);
+                   ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class);
+                   util.exportExcel(response, list1, "教师基本信息");
+               }
+           }
+       }
+//        ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class);
+////            //查询出来结果复制
+//            List<SchoolTeacherBasicInformationVo> list1 = basichlnformationService.list(export);
+////            list1.forEach(date->{
+////                SchoolTeacherBasiclnExport schoolTeacherBasiclnExport = new SchoolTeacherBasiclnExport();
+////                BeanUtils.copyProperties(date,schoolTeacherBasiclnExport);
+////                exportList.add(schoolTeacherBasiclnExport);
+////            });
+//            util.exportExcel(response, list1, "教师基本信息");
     }
 
 

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXacademicWorksController.java

@@ -147,38 +147,40 @@ public class SchoolXacademicWorksController extends BaseController
             }
             ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class);
             util.exportExcel(response, list, "论文著作数据");
-        }
-        for (SysRole role : roles) {
-            if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("lwlz_admin")){
-                List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
-                for (SchoolXacademicWorksVo xacademicWorksVo : list) {
-                    i ++;
-                    xacademicWorksVo.setXh(i);
-                    xacademicWorksVo.setGrowthType("论文论著");
+        }else {
+            for (SysRole role : roles) {
+                if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("lwlz_admin")){
+                    List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
+                    for (SchoolXacademicWorksVo xacademicWorksVo : list) {
+                        i ++;
+                        xacademicWorksVo.setXh(i);
+                        xacademicWorksVo.setGrowthType("论文论著");
+                    }
+                    ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class);
+                    util.exportExcel(response, list, "论文著作数据");
+                }else if (role.getRoleKey().equals("jsdnzj_admin")){
+                    //教师电子档案中级管理员只能查看本部门及部门以下的数据
+                    //根据用户部门id查询用户部门信息
+                    SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+                    //查询本部门下所有教师的id
+                    List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
+                    if (deptUserIds.size() > 0){
+                        schoolXacademicWorksVo.setUserIds(deptUserIds);
+                    }
+                    List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
+                    for (SchoolXacademicWorksVo xacademicWorksVo : list) {
+                        i ++;
+                        xacademicWorksVo.setXh(i);
+                        xacademicWorksVo.setGrowthType("论文论著");
+                    }
+                    ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class);
+                    util.exportExcel(response, list, "论文著作数据");
+                }else {
+                    ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class);
+                    util.exportExcel(response, new ArrayList<>(), "论文著作数据");
                 }
-                ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class);
-                util.exportExcel(response, list, "论文著作数据");
-            }else if (role.getRoleKey().equals("jsdnzj_admin")){
-                //教师电子档案中级管理员只能查看本部门及部门以下的数据
-                //根据用户部门id查询用户部门信息
-                SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
-                //查询本部门下所有教师的id
-                List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
-                if (deptUserIds.size() > 0){
-                    schoolXacademicWorksVo.setUserIds(deptUserIds);
-                }
-                List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
-                for (SchoolXacademicWorksVo xacademicWorksVo : list) {
-                    i ++;
-                    xacademicWorksVo.setXh(i);
-                    xacademicWorksVo.setGrowthType("论文论著");
-                }
-                ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class);
-                util.exportExcel(response, list, "论文著作数据");
             }
         }
-        ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class);
-        util.exportExcel(response, new ArrayList<>(), "论文著作数据");
     }
 
     /**

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXcomprehensiveHonorsController.java

@@ -146,38 +146,40 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
             }
             ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class);
             util.exportExcel(response, list, "综合荣誉数据");
-        }
-        for (SysRole role : roles) {
-            if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("zhry_admin")){
-                List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
-                for (SchoolXcomprehensiveHonorsVo xcomprehensiveHonorsVo : list) {
-                    i ++;
-                    xcomprehensiveHonorsVo.setXh(i);
-                    xcomprehensiveHonorsVo.setGrowthType("综合荣誉");
-                }
-                ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class);
-                util.exportExcel(response, list, "综合荣誉数据");
-            }else if (role.getRoleKey().equals("jsdnzj_admin")){
-                //教师电子档案中级管理员只能查看本部门及部门以下的数据
-                //根据用户部门id查询用户部门信息
-                SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
-                //查询本部门下所有教师的id
-                List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
-                if (deptUserIds.size() > 0){
-                    schoolXcomprehensiveHonorsVo.setUserIds(deptUserIds);
-                }
-                List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
-                for (SchoolXcomprehensiveHonorsVo xcomprehensiveHonorsVo : list) {
-                    i ++;
-                    xcomprehensiveHonorsVo.setXh(i);
-                    xcomprehensiveHonorsVo.setGrowthType("综合荣誉");
+        }else {
+            for (SysRole role : roles) {
+                if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("zhry_admin")){
+                    List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
+                    for (SchoolXcomprehensiveHonorsVo xcomprehensiveHonorsVo : list) {
+                        i ++;
+                        xcomprehensiveHonorsVo.setXh(i);
+                        xcomprehensiveHonorsVo.setGrowthType("综合荣誉");
+                    }
+                    ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class);
+                    util.exportExcel(response, list, "综合荣誉数据");
+                }else if (role.getRoleKey().equals("jsdnzj_admin")){
+                    //教师电子档案中级管理员只能查看本部门及部门以下的数据
+                    //根据用户部门id查询用户部门信息
+                    SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+                    //查询本部门下所有教师的id
+                    List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
+                    if (deptUserIds.size() > 0){
+                        schoolXcomprehensiveHonorsVo.setUserIds(deptUserIds);
+                    }
+                    List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
+                    for (SchoolXcomprehensiveHonorsVo xcomprehensiveHonorsVo : list) {
+                        i ++;
+                        xcomprehensiveHonorsVo.setXh(i);
+                        xcomprehensiveHonorsVo.setGrowthType("综合荣誉");
+                    }
+                    ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class);
+                    util.exportExcel(response, list, "综合荣誉数据");
+                }else {
+                    ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class);
+                    util.exportExcel(response, new ArrayList<>(), "综合荣誉数据");
                 }
-                ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class);
-                util.exportExcel(response, list, "综合荣誉数据");
             }
         }
-        ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class);
-        util.exportExcel(response, new ArrayList<>(), "综合荣誉数据");
     }
 
     /**

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXlectureAwardsController.java

@@ -147,38 +147,41 @@ public class SchoolXlectureAwardsController extends BaseController
             }
             ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class);
             util.exportExcel(response, list, "讲课获奖数据");
-        }
-        for (SysRole role : roles) {
-            if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jkhj_admin")){
-                List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
-                for (SchoolXlectureAwardsVo xlectureAwardsVo : list) {
-                    i ++;
-                    xlectureAwardsVo.setXh(i);
-                    xlectureAwardsVo.setGrowthType("讲课获奖");
+        }else {
+            for (SysRole role : roles) {
+                if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jkhj_admin")){
+                    List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
+                    for (SchoolXlectureAwardsVo xlectureAwardsVo : list) {
+                        i ++;
+                        xlectureAwardsVo.setXh(i);
+                        xlectureAwardsVo.setGrowthType("讲课获奖");
+                    }
+                    ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class);
+                    util.exportExcel(response, list, "讲课获奖数据");
+                }else if (role.getRoleKey().equals("jsdnzj_admin")){
+                    //教师电子档案中级管理员只能查看本部门及部门以下的数据
+                    //根据用户部门id查询用户部门信息
+                    SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+                    //查询本部门下所有教师的id
+                    List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
+                    if (deptUserIds.size() > 0){
+                        schoolXlectureAwardsVo.setUserIds(deptUserIds);
+                    }
+                    List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
+                    for (SchoolXlectureAwardsVo xlectureAwardsVo : list) {
+                        i ++;
+                        xlectureAwardsVo.setXh(i);
+                        xlectureAwardsVo.setGrowthType("讲课获奖");
+                    }
+                    ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class);
+                    util.exportExcel(response, list, "讲课获奖数据");
+                }else {
+                    ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class);
+                    util.exportExcel(response, new ArrayList<>(), "讲课获奖数据");
                 }
-                ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class);
-                util.exportExcel(response, list, "讲课获奖数据");
-            }else if (role.getRoleKey().equals("jsdnzj_admin")){
-                //教师电子档案中级管理员只能查看本部门及部门以下的数据
-                //根据用户部门id查询用户部门信息
-                SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
-                //查询本部门下所有教师的id
-                List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
-                if (deptUserIds.size() > 0){
-                    schoolXlectureAwardsVo.setUserIds(deptUserIds);
-                }
-                List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
-                for (SchoolXlectureAwardsVo xlectureAwardsVo : list) {
-                    i ++;
-                    xlectureAwardsVo.setXh(i);
-                    xlectureAwardsVo.setGrowthType("讲课获奖");
-                }
-                ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class);
-                util.exportExcel(response, list, "讲课获奖数据");
             }
         }
-        ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class);
-        util.exportExcel(response, new ArrayList<>(), "讲课获奖数据");
+
     }
 
     /**

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXprojectResearchController.java

@@ -142,38 +142,41 @@ public class SchoolXprojectResearchController extends BaseController {
             }
             ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class);
             util.exportExcel(response, list, "课题研究数据");
-        }
-        for (SysRole role : roles) {
-            if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("ktyj_admin")){
-                List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
-                for (SchoolXprojectResearchVo xprojectResearchVo : list) {
-                    i ++;
-                    xprojectResearchVo.setXh(i);
-                    xprojectResearchVo.setGrowthType("课题研究");
+        }else {
+            for (SysRole role : roles) {
+                if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("ktyj_admin")){
+                    List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
+                    for (SchoolXprojectResearchVo xprojectResearchVo : list) {
+                        i ++;
+                        xprojectResearchVo.setXh(i);
+                        xprojectResearchVo.setGrowthType("课题研究");
+                    }
+                    ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class);
+                    util.exportExcel(response, list, "课题研究数据");
+                }else if (role.getRoleKey().equals("jsdnzj_admin")){
+                    //教师电子档案中级管理员只能查看本部门及部门以下的数据
+                    //根据用户部门id查询用户部门信息
+                    SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+                    //查询本部门下所有教师的id
+                    List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
+                    if (deptUserIds.size() > 0){
+                        schoolXprojectResearchVo.setUserIds(deptUserIds);
+                    }
+                    List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
+                    for (SchoolXprojectResearchVo xprojectResearchVo : list) {
+                        i ++;
+                        xprojectResearchVo.setXh(i);
+                        xprojectResearchVo.setGrowthType("课题研究");
+                    }
+                    ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class);
+                    util.exportExcel(response, list, "课题研究数据");
+                }else {
+                    ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class);
+                    util.exportExcel(response, new ArrayList<>(), "课题研究数据");
                 }
-                ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class);
-                util.exportExcel(response, list, "课题研究数据");
-            }else if (role.getRoleKey().equals("jsdnzj_admin")){
-                //教师电子档案中级管理员只能查看本部门及部门以下的数据
-                //根据用户部门id查询用户部门信息
-                SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
-                //查询本部门下所有教师的id
-                List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
-                if (deptUserIds.size() > 0){
-                    schoolXprojectResearchVo.setUserIds(deptUserIds);
-                }
-                List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
-                for (SchoolXprojectResearchVo xprojectResearchVo : list) {
-                    i ++;
-                    xprojectResearchVo.setXh(i);
-                    xprojectResearchVo.setGrowthType("课题研究");
-                }
-                ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class);
-                util.exportExcel(response, list, "课题研究数据");
             }
         }
-        ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class);
-        util.exportExcel(response, new ArrayList<>(), "课题研究数据");
+
     }
 
     /**

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteacherAwardsController.java

@@ -147,38 +147,40 @@ public class SchoolXteacherAwardsController extends BaseController
             }
             ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class);
             util.exportExcel(response, list, "教师获奖数据");
-        }
-        for (SysRole role : roles) {
-            if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jshj_admin")){
-                List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
-                for (SchoolXteacherAwardsVo xteacherAwardsVo : list) {
-                    i ++;
-                    xteacherAwardsVo.setXh(i);
-                    xteacherAwardsVo.setGrowthType("教学获奖");
-                }
-                ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class);
-                util.exportExcel(response, list, "教师获奖数据");
-            }else if (role.getRoleKey().equals("jsdnzj_admin")){
-                //教师电子档案中级管理员只能查看本部门及部门以下的数据
-                //根据用户部门id查询用户部门信息
-                SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
-                //查询本部门下所有教师的id
-                List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
-                if (deptUserIds.size() > 0){
-                    schoolXteacherAwardsVo.setUserIds(deptUserIds);
-                }
-                List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
-                for (SchoolXteacherAwardsVo xteacherAwardsVo : list) {
-                    i ++;
-                    xteacherAwardsVo.setXh(i);
-                    xteacherAwardsVo.setGrowthType("教学获奖");
+        }else {
+            for (SysRole role : roles) {
+                if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jshj_admin")){
+                    List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
+                    for (SchoolXteacherAwardsVo xteacherAwardsVo : list) {
+                        i ++;
+                        xteacherAwardsVo.setXh(i);
+                        xteacherAwardsVo.setGrowthType("教学获奖");
+                    }
+                    ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class);
+                    util.exportExcel(response, list, "教师获奖数据");
+                }else if (role.getRoleKey().equals("jsdnzj_admin")){
+                    //教师电子档案中级管理员只能查看本部门及部门以下的数据
+                    //根据用户部门id查询用户部门信息
+                    SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+                    //查询本部门下所有教师的id
+                    List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
+                    if (deptUserIds.size() > 0){
+                        schoolXteacherAwardsVo.setUserIds(deptUserIds);
+                    }
+                    List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
+                    for (SchoolXteacherAwardsVo xteacherAwardsVo : list) {
+                        i ++;
+                        xteacherAwardsVo.setXh(i);
+                        xteacherAwardsVo.setGrowthType("教学获奖");
+                    }
+                    ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class);
+                    util.exportExcel(response, list, "教师获奖数据");
+                }else {
+                    ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class);
+                    util.exportExcel(response, new ArrayList<>(), "教师获奖数据");
                 }
-                ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class);
-                util.exportExcel(response, list, "教师获奖数据");
             }
         }
-        ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class);
-        util.exportExcel(response, new ArrayList<>(), "教师获奖数据");
     }
 
     /**

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteachingAchievementsController.java

@@ -106,9 +106,9 @@ public class SchoolXteachingAchievementsController extends BaseController
 //                    }
 //                }
                 //查询本部门下所有教师的身份证号
-                List<String> deptUserIds = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
-                if (deptUserIds.size() > 0){
-                    schoolXteachingAchievementsVo.setIdCards(deptUserIds);
+                List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
+                if (deptUserIdCards.size() > 0){
+                    schoolXteachingAchievementsVo.setIdCards(deptUserIdCards);
                 }
                 startPage();
                 List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
@@ -140,22 +140,22 @@ public class SchoolXteachingAchievementsController extends BaseController
             }
             ExcelUtil<SchoolXteachingAchievementsVo> util = new ExcelUtil<SchoolXteachingAchievementsVo>(SchoolXteachingAchievementsVo.class);
             util.exportExcel(response, list, "教学成绩数据");
-        }
-        for (SysRole role : roles) {
-            if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jxcj_admin")){
-                List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
-                for (SchoolXteachingAchievementsVo schoolXteachingAchievementsVo1 : list) {
-                    i ++;
-                    schoolXteachingAchievementsVo1.setXh(i);
-                }
-                ExcelUtil<SchoolXteachingAchievementsVo> util = new ExcelUtil<SchoolXteachingAchievementsVo>(SchoolXteachingAchievementsVo.class);
-                util.exportExcel(response, list, "教学成绩数据");
-            }else if (role.getRoleKey().equals("jsdnzj_admin")){
-                //教师电子档案中级管理员只能查看本部门及部门以下的数据
+        }else {
+            for (SysRole role : roles) {
+                if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jxcj_admin")){
+                    List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
+                    for (SchoolXteachingAchievementsVo schoolXteachingAchievementsVo1 : list) {
+                        i ++;
+                        schoolXteachingAchievementsVo1.setXh(i);
+                    }
+                    ExcelUtil<SchoolXteachingAchievementsVo> util = new ExcelUtil<SchoolXteachingAchievementsVo>(SchoolXteachingAchievementsVo.class);
+                    util.exportExcel(response, list, "教学成绩数据");
+                }else if (role.getRoleKey().equals("jsdnzj_admin")){
+                    //教师电子档案中级管理员只能查看本部门及部门以下的数据
 //                Long deptId = null;
-                //根据用户部门id查询用户部门信息
-                SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
-                //判断用户部门属于科室还是级部
+                    //根据用户部门id查询用户部门信息
+                    SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+                    //判断用户部门属于科室还是级部
 //                //查询所有级部id
 //                List<Long> jbDeptIds = schoolXteachingAchievementsService.getJbDeptId();
 //                //查询所有科室id
@@ -182,22 +182,25 @@ public class SchoolXteachingAchievementsController extends BaseController
 //                        }
 //                    }
 //                }
-                //查询本部门下所有教师的身份证号
-                List<String> deptUserIds = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
-                if (deptUserIds.size() > 0){
-                    schoolXteachingAchievementsVo.setIdCards(deptUserIds);
+                    //查询本部门下所有教师的身份证号
+                    List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
+                    if (deptUserIdCards.size() > 0){
+                        schoolXteachingAchievementsVo.setIdCards(deptUserIdCards);
+                    }
+                    List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
+                    for (SchoolXteachingAchievementsVo schoolXteachingAchievementsVo1 : list) {
+                        i ++;
+                        schoolXteachingAchievementsVo1.setXh(i);
+                    }
+                    ExcelUtil<SchoolXteachingAchievementsVo> util = new ExcelUtil<SchoolXteachingAchievementsVo>(SchoolXteachingAchievementsVo.class);
+                    util.exportExcel(response, list, "教学成绩数据");
+                }else {
+                    ExcelUtil<SchoolXteachingAchievementsVo> util = new ExcelUtil<SchoolXteachingAchievementsVo>(SchoolXteachingAchievementsVo.class);
+                    util.exportExcel(response, new ArrayList<>(), "教学成绩数据");
                 }
-                List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
-                for (SchoolXteachingAchievementsVo schoolXteachingAchievementsVo1 : list) {
-                    i ++;
-                    schoolXteachingAchievementsVo1.setXh(i);
-                }
-                ExcelUtil<SchoolXteachingAchievementsVo> util = new ExcelUtil<SchoolXteachingAchievementsVo>(SchoolXteachingAchievementsVo.class);
-                util.exportExcel(response, list, "教学成绩数据");
             }
         }
-        ExcelUtil<SchoolXteachingAchievementsVo> util = new ExcelUtil<SchoolXteachingAchievementsVo>(SchoolXteachingAchievementsVo.class);
-        util.exportExcel(response, new ArrayList<>(), "教学成绩数据");
+
     }
 
     /*

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteamAwardController.java

 package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
 
+import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -19,13 +24,15 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolGkAchievementVo;
 import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteamAward;
 import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteamAwardVo;
+import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
 import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteamAwardService;
 
 /**
  * 团队获奖Controller
- * 
+ *
  * @author ruoyi
  * @date 2023-12-13
  */
@@ -35,28 +42,61 @@ public class SchoolXteamAwardController extends BaseController
 {
     @Autowired
     private ISchoolXteamAwardService schoolXteamAwardService;
+    @Autowired
+    private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
+    @Autowired
+    private ISysDeptService sysDeptService;
 
     /**
      * 查询团队获奖列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(SchoolXteamAward schoolXteamAward)
+    public TableDataInfo list(SchoolXteamAwardVo schoolXteamAwardVo)
     {
-        startPage();
-        schoolXteamAward.setNoAuditState("0");
-        List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAward);
-        return getDataTable(list);
+        schoolXteamAwardVo.setNoAuditState("0");
+
+        //获取当前登陆人信息
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        //获取当前登陆人的角色信息
+        List<SysRole> roles = user.getRoles();
+        if (user.isAdmin()) {
+            startPage();
+            List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAwardVo);
+            return getDataTable(list);
+        }
+        for (SysRole role : roles) {
+            if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("tdhj_admin")){
+                startPage();
+                List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAwardVo);
+                return getDataTable(list);
+            }else if (role.getRoleKey().equals("jsdnzj_admin")){
+                //教师电子档案中级管理员只能查看本部门及部门以下的数据
+                //根据用户部门id查询用户部门信息
+                SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+                //查询本部门下所有教师的id
+                List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
+                if (deptUserIds.size() > 0){
+                    schoolXteamAwardVo.setUserIds(deptUserIds);
+                }
+                startPage();
+                List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAwardVo);
+                return getDataTable(list);
+            }
+        }
+        return getDataTable(new ArrayList<>());
     }
 
     /**
      * 团队获奖个人页面查询
      */
     @GetMapping("/personlist")
-    public TableDataInfo personlist(SchoolXteamAward schoolXteamAward)
+    public TableDataInfo personlist(SchoolXteamAwardVo schoolXteamAwardVo)
     {
+
         startPage();
-        List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAward);
+        List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAwardVo);
         return getDataTable(list);
+
     }
 
 
@@ -65,11 +105,42 @@ public class SchoolXteamAwardController extends BaseController
      */
     @Log(title = "团队获奖", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SchoolXteamAward schoolXteamAward)
+    public void export(HttpServletResponse response, SchoolXteamAwardVo schoolXteamAwardVo)
     {
-        List<SchoolXteamAward> list = schoolXteamAwardService.selectSchoolXteamAwardList(schoolXteamAward);
-        ExcelUtil<SchoolXteamAward> util = new ExcelUtil<SchoolXteamAward>(SchoolXteamAward.class);
-        util.exportExcel(response, list, "团队获奖数据");
+
+        //获取当前登陆人信息
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        //获取当前登陆人的角色信息
+        List<SysRole> roles = user.getRoles();
+        if (user.isAdmin()) {
+            List<SchoolXteamAward> list = schoolXteamAwardService.selectSchoolXteamAwardList(schoolXteamAwardVo);
+            ExcelUtil<SchoolXteamAward> util = new ExcelUtil<SchoolXteamAward>(SchoolXteamAward.class);
+            util.exportExcel(response, list, "团队获奖数据");
+        }else {
+            for (SysRole role : roles) {
+                if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("tdhj_admin")){
+                    List<SchoolXteamAward> list = schoolXteamAwardService.selectSchoolXteamAwardList(schoolXteamAwardVo);
+                    ExcelUtil<SchoolXteamAward> util = new ExcelUtil<SchoolXteamAward>(SchoolXteamAward.class);
+                    util.exportExcel(response, list, "团队获奖数据");
+                }else if (role.getRoleKey().equals("jsdnzj_admin")){
+                    //教师电子档案中级管理员只能查看本部门及部门以下的数据
+                    //根据用户部门id查询用户部门信息
+                    SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
+                    //查询本部门下所有教师的id
+                    List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
+                    if (deptUserIds.size() > 0){
+                        schoolXteamAwardVo.setUserIds(deptUserIds);
+                    }
+                    List<SchoolXteamAward> list = schoolXteamAwardService.selectSchoolXteamAwardList(schoolXteamAwardVo);
+                    ExcelUtil<SchoolXteamAward> util = new ExcelUtil<SchoolXteamAward>(SchoolXteamAward.class);
+                    util.exportExcel(response, list, "团队获奖数据");
+                }else {
+                    ExcelUtil<SchoolXteamAward> util = new ExcelUtil<SchoolXteamAward>(SchoolXteamAward.class);
+                    util.exportExcel(response, new ArrayList<>(), "团队获奖数据");
+                }
+            }
+        }
+
     }
 
     /**

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAclassTeacherAssessment.java

@@ -12,7 +12,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 班主任考核对象 school_aclass_teacher_assessment
- * 
+ *
  * @author ruoyi
  * @date 2023-12-12
  */

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentExport.java

+package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class SchoolAclassTeacherAssessmentExport extends BaseEntity
+{
+
+    /** 主键id */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+    /** 学期(下拉框) */
+    @Excel(name = "学期",combo = {"第一学期","第二学期"},readConverterExp = "1=第一学期,2=第二学期")
+    private String semester;
+
+    /** 届别(下拉框) */
+    @Excel(name = "届别")
+    private String year;
+
+    /** 学年(下拉框) */
+    @Excel(name = "学年")
+    private String schoolYear;
+
+    /** 年级(下拉框) */
+    @Excel(name = "年级",combo = {"高一","高二","高三"},readConverterExp = "1=高一,2=高二,3=高三")
+    private String grade;
+
+    /** 班级(下拉框) */
+    @Excel(name = "班级",readConverterExp="1=1,2=2,3=3,4=4,5=5,6=6,7=7,8=8,9=9,10=10,11=11,12=12,13=13,14=14,15=15,16=16,17=17,18=18,19=19,20=20,21=21,22=22,23=23,24=24,25=25,26=26,27=27,28=28,29=29,30=30,31=31,32=32,33=33,34=34,35=35,36=36,37=37,38=38,39=39,40=40")
+    private String className;
+
+    /** 教师姓名 */
+    @Excel(name = "教师姓名")
+    private String teacherName;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String idCard;
+
+    /** 德育考核成绩 */
+    @Excel(name = "德育考核成绩")
+    private BigDecimal moralEduCheckAchievement;
+
+    /** 智育考核成绩 */
+    @Excel(name = "智育考核成绩")
+    private BigDecimal intellEduCheckAchievement;
+
+    /** 总考核成绩 */
+    @Excel(name = "总考核成绩")
+    private BigDecimal totalCheckAchievement;
+
+    /** 班级类型(下拉框) */
+    @Excel(name = "班级类型")
+    private String classType;
+
+    /** 学科(下拉框) */
+    @Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
+            readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
+    private String sub;
+
+    /** 备注*/
+    @Excel(name = "备注")
+    private String remark;
+
+
+    /** 删除状态 */
+    private String delFlag;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentReq.java

@@ -7,10 +7,11 @@ import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 请求对象
- * 
+ *
  * @author ruoyi
  * @date 2023-12-12
  */
@@ -28,6 +29,9 @@ public class SchoolAclassTeacherAssessmentReq extends BaseEntity
     /** 学年(下拉框) */
     private String schoolYear;
 
+    /** 身份证号集合 */
+    private List<String> idCards;
+
         /** 身份证号 */
     private String idCard;
 

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkloadDc.java

+package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class SchoolAworkloadDc extends BaseEntity {
+
+    /** 主键id */
+    private Long id;
+
+    /** 学年(下拉框) */
+    @Excel(name = "学年")
+    private String schoolYear;
+
+    /** 学期(下拉框) */
+    @Excel(name = "学期",combo = {"第一学期","第二学期"},readConverterExp = "1=第一学期,2=第二学期")
+    private String semester;
+
+    /** 届别(下拉框) */
+    @Excel(name = "届别")
+    private String year;
+
+    /** 年级(下拉框) */
+    @Excel(name = "年级",combo = {"高一","高二","高三"},readConverterExp = "1=高一,2=高二,3=高三")
+    private String grade;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 学科(下拉框) */
+    @Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
+            readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
+    private String sub;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String idCard;
+
+    /** 聘任岗位(下拉框) */
+    @Excel(name = "聘任岗位",combo = {"专职教师岗","兼职教师岗","教辅岗","学管员岗","待聘岗","其它"},
+            readConverterExp = "1=专职教师岗,2=兼职教师岗,3=教辅岗,4=学管员岗,5=待聘岗,6=其它")
+    private String appointmentPost;
+
+    /** 聘任职务 */
+    @Excel(name = "聘任职务")
+    private String appointmentPosition;
+
+    /** 聘任情况(下拉框) */
+    @Excel(name = "聘任情况",combo = {"高聘","正常","低聘","落聘","其他"},readConverterExp = "1=高聘,2=正常,3=低聘,4=落聘,5=其他")
+    private String appointmentSituation;
+
+    /** 班级 */
+    @Excel(name = "班级",prompt="多个，中间用英文“,”间隔")
+    private String className;
+
+    /** 班级类型 */
+    @Excel(name = "班级类型")
+    private String classType;
+
+    /** 早读 */
+    @Excel(name = "早读")
+    private BigDecimal earlyReading;
+
+    /** 正课 */
+    @Excel(name = "正课")
+    private BigDecimal requiredCourses;
+
+    /** 晚自习 */
+    @Excel(name = "晚自习")
+    private BigDecimal eveningSelfStudy;
+
+    /**合计*/
+    @Excel(name = "合计")
+    private BigDecimal amountTo;
+
+    /** 证明人id */
+    private Long userId;
+
+    /** 证明人 */
+    @Excel(name = "证明人")
+    private String userName;
+
+    @Excel(name = "备注")
+    private String remark;
+
+    /** 删除状态 */
+    private String delFlag;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkloadExport.java

@@ -8,7 +8,7 @@ import java.math.BigDecimal;
 
 /**
  * 工作量信息对象 school_aworkload
- * 
+ *
  * @author ruoyi
  * @date 2023-12-11
  */

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkloadVo.java

@@ -5,10 +5,11 @@ import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 工作量信息对象 school_aworkload
- * 
+ *
  * @author ruoyi
  * @date 2023-12-11
  */
@@ -38,6 +39,12 @@ public class SchoolAworkloadVo extends BaseEntity
     /** 学科(下拉框) */
     private String sub;
 
+    /** 身份证号集合 */
+    private List<String> idCards;
+
+    /** 身份证号 */
+    private String idCard;
+
 
     /** 聘任岗位(下拉框) */
     private String appointmentPost;

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolGkAchievementVo.java

@@ -6,9 +6,11 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 高考成绩对象 school_gk_achievement
- * 
+ *
  * @author ruoyi
  * @date 2023-12-13
  */
@@ -29,6 +31,12 @@ public class SchoolGkAchievementVo extends BaseEntity
     /** 教师姓名 */
     private String teacherName;
 
+    /**老师id**/
+    private Long userId;
+
+    /** 获奖人id集合 */
+    private List<Long> userIds;
+
 
     /** 授课班级 */
     private String teachingClassName;
@@ -55,6 +63,7 @@ public class SchoolGkAchievementVo extends BaseEntity
      * 审核状态
      */
     private String auditState;
+    private String noAuditState;
 
     /** 删除状态 */
     private String delFlag;

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasicInformation.java

@@ -48,7 +48,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
      * 档案出生日期 (年月)
      */
     @Excel(name = "档案出生日期")
-//    @JsonFormat(pattern = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date fileBirthDate;
 
 
@@ -85,7 +85,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
      * 入党时间（年月）
      */
     @Excel(name = "入党时间")
-//    @JsonFormat(pattern = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date partyMembershipTime;
 
     /**
@@ -221,7 +221,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
      * 毕业时间1 年月
      */
     @Excel(name = "毕业时间1")
-//    @JsonFormat(pattern = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date graduationTime1;
 
     /**
@@ -240,7 +240,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
      * 毕业时间2年月
      */
     @Excel(name = "毕业时间2")
-//    @JsonFormat(pattern = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM")
      private Date graduationTime2;
 
     /**
@@ -259,7 +259,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
      * 毕业时间3 年月
      */
     @Excel(name = "毕业时间3")
-//    @JsonFormat(pattern = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM")
     private Date graduationTime3;
 
     /**

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasicInformationVo.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 教师电子档案 老师基础信息
@@ -26,6 +27,9 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity {
     @Excel(name = "姓名")
     private String name;
 
+    /** 身份证号集合 */
+    private List<String> idCards;
+
     /**
      * 身份证号
      */

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXteachingAchievements.java

@@ -25,12 +25,14 @@ public class SchoolXteachingAchievements
     private Long id;
 
     /** 学年(下拉框) */
-    @Excel(name = "学年",combo = {"2018-2019","2019-2020","2020-2021","2021-2022","2022-2023","2023-2024","2024-2025","2025-2026",
-            "2026-2027","2027-2028","2028-2029","2029-2030","2030-2031","2031-2032","2032-2033"})
+//    @Excel(name = "学年",combo = {"2018-2019","2019-2020","2020-2021","2021-2022","2022-2023","2023-2024","2024-2025","2025-2026",
+//            "2026-2027","2027-2028","2028-2029","2029-2030","2030-2031","2031-2032","2032-2033"})
+    @Excel(name = "学年")
     private String schoolYear;
 
     /** 学期（下拉框） */
-    @Excel(name = "学期",combo = {"第一学期","第二学期"}, readConverterExp = "1=第一学期,2=第二学期")
+//    @Excel(name = "学期",combo = {"第一学期","第二学期"}, readConverterExp = "1=第一学期,2=第二学期")
+    @Excel(name = "学期")
     private String semester;
 
     /** 考试时间（年月日） */
@@ -39,16 +41,19 @@ public class SchoolXteachingAchievements
     private Date examTime;
 
     /** 考试类型（下拉框） */
-    @Excel(name = "考试类型",combo = {"月考","期中","期末","一模","二模","三模","高考","其它"},
-            readConverterExp = "1=月考,2=期中,3=期末,4=一模,5=二模,6=三模,7=高考,8=其它")
+//    @Excel(name = "考试类型",combo = {"月考","期中","期末","一模","二模","三模","高考","其它"},
+//            readConverterExp = "1=月考,2=期中,3=期末,4=一模,5=二模,6=三模,7=高考,8=其它")
+    @Excel(name = "考试类型")
     private String examType;
 
     /** 届别(下拉框) */
-    @Excel(name = "届别", combo = {"2018","2019","2020","2021","2022","2023","2024","2025","2026","2027","2028","2029","2030","2031","2032","2033"})
+//    @Excel(name = "届别", combo = {"2018","2019","2020","2021","2022","2023","2024","2025","2026","2027","2028","2029","2030","2031","2032","2033"})
+    @Excel(name = "届别")
     private String year;
 
     /** 年级（下拉框） */
-    @Excel(name = "年级", combo = {"高一","高二","高三"},readConverterExp = "1=高一,2=高二,3=高三")
+//    @Excel(name = "年级", combo = {"高一","高二","高三"},readConverterExp = "1=高一,2=高二,3=高三")
+    @Excel(name = "年级")
     private String grade;
 
     /** 用户id */
@@ -63,8 +68,9 @@ public class SchoolXteachingAchievements
     private String idCard;
 
     /** 学科 */
-    @Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
-            readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
+//    @Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
+//            readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
+    @Excel(name = "学科")
     private String sub;
 
     /** 班级 */

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXteamAwardVo.java

@@ -6,9 +6,11 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 团队获奖对象 school_xteam_award
- * 
+ *
  * @author ruoyi
  * @date 2023-12-13
  */
@@ -42,7 +44,11 @@ public class SchoolXteamAwardVo extends BaseEntity
 
     /** 审核状态（0未提交，1审核中，2同意，3驳回） */
     private String auditState;
+    private String noAuditState;
     /** 删除状态 */
     private String delFlag;
 
+    /**用户id集合 */
+    private List<Long> userIds;
+
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolAworkloadMapper.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 /**
  * 工作量信息Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2023-12-11
  */
@@ -17,7 +17,7 @@ public interface SchoolAworkloadMapper  extends BaseMapper<SchoolAworkload>
 {
     /**
      * 查询工作量信息
-     * 
+     *
      * @param id 工作量信息主键
      * @return 工作量信息
      */
@@ -25,17 +25,17 @@ public interface SchoolAworkloadMapper  extends BaseMapper<SchoolAworkload>
 
     /**
      * 查询工作量信息列表
-     * 
-     * @param schoolAworkload 工作量信息
+     *
+     * @param schoolAworkloadVo 工作量信息
      * @return 工作量信息集合
      */
-    public List<SchoolAworkloadVo> selectSchoolAworkloadList(SchoolAworkload schoolAworkload);
+    public List<SchoolAworkloadVo> selectSchoolAworkloadList(SchoolAworkloadVo schoolAworkloadVo);
 
-    public List<SchoolAworkloadExport> selectAworkloadList(SchoolAworkload schoolAworkload);
+    public List<SchoolAworkloadExport> selectAworkloadList(SchoolAworkloadVo schoolAworkloadVo);
 
     /**
      * 新增工作量信息
-     * 
+     *
      * @param schoolAworkload 工作量信息
      * @return 结果
      */
@@ -43,7 +43,7 @@ public interface SchoolAworkloadMapper  extends BaseMapper<SchoolAworkload>
 
     /**
      * 修改工作量信息
-     * 
+     *
      * @param schoolAworkload 工作量信息
      * @return 结果
      */
@@ -51,7 +51,7 @@ public interface SchoolAworkloadMapper  extends BaseMapper<SchoolAworkload>
 
     /**
      * 删除工作量信息
-     * 
+     *
      * @param id 工作量信息主键
      * @return 结果
      */
@@ -59,7 +59,7 @@ public interface SchoolAworkloadMapper  extends BaseMapper<SchoolAworkload>
 
     /**
      * 批量删除工作量信息
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolGkAchievementMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 /**
  * 高考成绩Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2023-12-13
  */
@@ -16,7 +16,7 @@ public interface SchoolGkAchievementMapper   extends BaseMapper<SchoolGkAchievem
 {
     /**
      * 查询高考成绩
-     * 
+     *
      * @param id 高考成绩主键
      * @return 高考成绩
      */
@@ -24,16 +24,16 @@ public interface SchoolGkAchievementMapper   extends BaseMapper<SchoolGkAchievem
 
     /**
      * 查询高考成绩列表
-     * 
-     * @param schoolGkAchievement 高考成绩
+     *
+     * @param schoolGkAchievementVo 高考成绩
      * @return 高考成绩集合
      */
-    public List<SchoolGkAchievementVo> selectSchoolGkAchievementVoList(SchoolGkAchievement schoolGkAchievement);
-    public List<SchoolGkAchievement> selectSchoolGkAchievementList(SchoolGkAchievement schoolGkAchievement);
+    public List<SchoolGkAchievementVo> selectSchoolGkAchievementVoList(SchoolGkAchievementVo schoolGkAchievementVo);
+    public List<SchoolGkAchievement> selectSchoolGkAchievementList(SchoolGkAchievementVo schoolGkAchievementVo);
 
     /**
      * 新增高考成绩
-     * 
+     *
      * @param schoolGkAchievement 高考成绩
      * @return 结果
      */
@@ -41,7 +41,7 @@ public interface SchoolGkAchievementMapper   extends BaseMapper<SchoolGkAchievem
 
     /**
      * 修改高考成绩
-     * 
+     *
      * @param schoolGkAchievement 高考成绩
      * @return 结果
      */
@@ -49,7 +49,7 @@ public interface SchoolGkAchievementMapper   extends BaseMapper<SchoolGkAchievem
 
     /**
      * 删除高考成绩
-     * 
+     *
      * @param id 高考成绩主键
      * @return 结果
      */
@@ -57,7 +57,7 @@ public interface SchoolGkAchievementMapper   extends BaseMapper<SchoolGkAchievem
 
     /**
      * 批量删除高考成绩
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolXteamAwardMapper.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 /**
  * 团队获奖Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2023-12-13
  */
@@ -17,7 +17,7 @@ public interface SchoolXteamAwardMapper  extends BaseMapper<SchoolXteamAward>
 {
     /**
      * 查询团队获奖
-     * 
+     *
      * @param id 团队获奖主键
      * @return 团队获奖
      */
@@ -25,16 +25,16 @@ public interface SchoolXteamAwardMapper  extends BaseMapper<SchoolXteamAward>
 
     /**
      * 查询团队获奖列表
-     * 
-     * @param schoolXteamAward 团队获奖
+     *
+     * @param schoolXteamAwardVo 团队获奖
      * @return 团队获奖集合
      */
-    public List<SchoolXteamAward> selectSchoolXteamAwardList(SchoolXteamAward schoolXteamAward);
-    public List<SchoolXteamAwardVo> selectSchoolXteamAwardVoList(SchoolXteamAward schoolXteamAward);
+    public List<SchoolXteamAward> selectSchoolXteamAwardList(SchoolXteamAwardVo schoolXteamAwardVo);
+    public List<SchoolXteamAwardVo> selectSchoolXteamAwardVoList(SchoolXteamAwardVo schoolXteamAwardVo);
 
     /**
      * 新增团队获奖
-     * 
+     *
      * @param schoolXteamAward 团队获奖
      * @return 结果
      */
@@ -42,7 +42,7 @@ public interface SchoolXteamAwardMapper  extends BaseMapper<SchoolXteamAward>
 
     /**
      * 修改团队获奖
-     * 
+     *
      * @param schoolXteamAward 团队获奖
      * @return 结果
      */
@@ -50,7 +50,7 @@ public interface SchoolXteamAwardMapper  extends BaseMapper<SchoolXteamAward>
 
     /**
      * 删除团队获奖
-     * 
+     *
      * @param id 团队获奖主键
      * @return 结果
      */
@@ -58,7 +58,7 @@ public interface SchoolXteamAwardMapper  extends BaseMapper<SchoolXteamAward>
 
     /**
      * 批量删除团队获奖
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolAnnualAssessment/SchoolAnnualAssessmentServiceImpl.java

@@ -197,17 +197,17 @@ public class SchoolAnnualAssessmentServiceImpl extends ServiceImpl<SchoolAnnualA
     public String importData(List<SchoolAnnualAssessment> list) {
         //判断数据是否为更新或新增
         //查询年度考核所有数据
-        List<SchoolAnnualAssessment> schoolAnnualAssessmentList = schoolAnnualAssessmentMapper.selectSchoolAnnualAssessmentList(new SchoolAnnualAssessmentVo());
-        for (SchoolAnnualAssessment schoolAnnualAssessment : list) {
-            //根据年度、姓名、身份证、去查询是否有记录，有则更新，无则新增
-            for (SchoolAnnualAssessment annualAssessment : schoolAnnualAssessmentList) {
-                if (schoolAnnualAssessment.getYear().equals(annualAssessment.getYear()) &&
-                    schoolAnnualAssessment.getName().equals(annualAssessment.getName()) &&
-                    schoolAnnualAssessment.getIdCard().equals(annualAssessment.getIdCard())){
-                    schoolAnnualAssessment.setId(annualAssessment.getId());
-                }
-            }
-        }
+//        List<SchoolAnnualAssessment> schoolAnnualAssessmentList = schoolAnnualAssessmentMapper.selectSchoolAnnualAssessmentList(new SchoolAnnualAssessmentVo());
+//        for (SchoolAnnualAssessment schoolAnnualAssessment : list) {
+//            //根据年度、姓名、身份证、去查询是否有记录，有则更新，无则新增
+//            for (SchoolAnnualAssessment annualAssessment : schoolAnnualAssessmentList) {
+//                if (schoolAnnualAssessment.getYear().equals(annualAssessment.getYear()) &&
+//                    schoolAnnualAssessment.getName().equals(annualAssessment.getName()) &&
+//                    schoolAnnualAssessment.getIdCard().equals(annualAssessment.getIdCard())){
+//                    schoolAnnualAssessment.setId(annualAssessment.getId());
+//                }
+//            }
+//        }
         StringBuilder successMsg = new StringBuilder();
         //批量导入年度考核数据
         boolean b = saveOrUpdateBatch(list);

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentServiceImpl.java

@@ -17,7 +17,7 @@ import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAclassTeacherAss
 
 /**
  * 班主任考核Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2023-12-12
  */
@@ -32,7 +32,7 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School
 
     /**
      * 查询班主任考核
-     * 
+     *
      * @param id 班主任考核主键
      * @return 班主任考核
      */
@@ -59,7 +59,7 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School
     public  String dataCheck(List<SchoolAclassTeacherAssessment> list){
         StringBuffer sb = new StringBuffer();
         SchoolCheckVo schoolCheckVo = null;
-        Integer index =1;
+        Integer index =0;
         for (SchoolAclassTeacherAssessment date :list) {
             index++;
             //非空验证
@@ -83,7 +83,7 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School
 
             //年纪
             if (StringUtils.isEmpty(date.getGrade())) {
-                sb.append(index+"、年纪字段不能为空");
+                sb.append(index+"、年级字段不能为空");
                 sb.append("<br/>");
             }
             //教师姓名
@@ -125,7 +125,7 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School
             }
             //学科
             if (StringUtils.isEmpty(date.getSub())) {
-                sb.append(index+"、班学科字段不能为空");
+                sb.append(index+"、学科字段不能为空");
                 sb.append("<br/>");
             }
         }
@@ -190,6 +190,17 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School
                 sb.append(date.getTeacherName()+"用户 身份证号 录入信息错误");
                 sb.append("<br/>");
             }
+
+            //班级类型
+            schoolCheckVo = checkeDicet("class_type", date.getClassType());
+            if (schoolCheckVo !=null) {
+                if (schoolCheckVo.getFlag()) {
+                    date.setSub(schoolCheckVo.getVal());
+                } else {
+                    sb.append(date.getTeacherName() + "用户 班级类型 录入不符合选择项:" + schoolCheckVo.getVal());
+                    sb.append("<br/>");
+                }
+            }
         }
 
         return sb.toString();
@@ -233,7 +244,7 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School
 
     /**
      * 查询班主任考核列表
-     * 
+     *
      * @param
      * @return 班主任考核
      */
@@ -276,7 +287,7 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School
 
     /**
      * 新增班主任考核
-     * 
+     *
      * @param schoolAclassTeacherAssessment 班主任考核
      * @return 结果
      */
@@ -289,7 +300,7 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School
 
     /**
      * 修改班主任考核
-     * 
+     *
      * @param schoolAclassTeacherAssessment 班主任考核
      * @return 结果
      */
@@ -302,7 +313,7 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School
 
     /**
      * 批量删除班主任考核
-     * 
+     *
      * @param ids 需要删除的班主任考核主键
      * @return 结果
      */
@@ -314,7 +325,7 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School
 
     /**
      * 删除班主任考核信息
-     * 
+     *
      * @param id 班主任考核主键
      * @return 结果
      */

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolAworkloadServiceImpl.java

@@ -21,7 +21,7 @@ import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAworkloadService
 
 /**
  * 工作量信息Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2023-12-11
  */
@@ -36,7 +36,7 @@ public class SchoolAworkloadServiceImpl  extends ServiceImpl<SchoolAworkloadMapp
 
     /**
      * 查询工作量信息
-     * 
+     *
      * @param id 工作量信息主键
      * @return 工作量信息
      */
@@ -65,7 +65,7 @@ public class SchoolAworkloadServiceImpl  extends ServiceImpl<SchoolAworkloadMapp
 
      public  String dataCheck(List<SchoolAworkload> list){
          StringBuffer sb = new StringBuffer();
-         Integer index = 1;
+         Integer index = 0;
          SchoolCheckVo schoolCheckVo = null;
           for (SchoolAworkload date: list) {
               index++;
@@ -88,9 +88,9 @@ public class SchoolAworkloadServiceImpl  extends ServiceImpl<SchoolAworkloadMapp
                   sb.append("<br/>");
               }
 
-              //年纪
+              //年级
               if (StringUtils.isEmpty(date.getGrade())) {
-                  sb.append(index+ "、年纪字段不能为空");
+                  sb.append(index+ "、年级字段不能为空");
                   sb.append("<br/>");
               }
               //姓名
@@ -129,9 +129,9 @@ public class SchoolAworkloadServiceImpl  extends ServiceImpl<SchoolAworkloadMapp
                   sb.append(index+ "、早读不能为空");
                   sb.append("<br/>");
               }
-              //正科
+              //正课
               if (date.getRequiredCourses() == null) {
-                  sb.append(index+ "、正科不能为空");
+                  sb.append(index+ "、正课不能为空");
                   sb.append("<br/>");
               }
               //晚自习
@@ -141,7 +141,7 @@ public class SchoolAworkloadServiceImpl  extends ServiceImpl<SchoolAworkloadMapp
               }
 
               //证明人
-              if (date.getEveningSelfStudy() == null) {
+              if (StringUtils.isEmpty(date.getUserName())) {
                   sb.append(index+ "、证明人不能为空");
                   sb.append("<br/>");
               }
@@ -295,14 +295,14 @@ public class SchoolAworkloadServiceImpl  extends ServiceImpl<SchoolAworkloadMapp
     }
     /**
      * 查询工作量信息列表
-     * 
-     * @param schoolAworkload 工作量信息
+     *
+     * @param schoolAworkloadVo 工作量信息
      * @return 工作量信息
      */
     @Override
-    public List<SchoolAworkloadVo> selectSchoolAworkloadList(SchoolAworkload schoolAworkload)
+    public List<SchoolAworkloadVo> selectSchoolAworkloadList(SchoolAworkloadVo schoolAworkloadVo)
     {
-        List<SchoolAworkloadVo> schoolAworkloadVos = schoolAworkloadMapper.selectSchoolAworkloadList(schoolAworkload);
+        List<SchoolAworkloadVo> schoolAworkloadVos = schoolAworkloadMapper.selectSchoolAworkloadList(schoolAworkloadVo);
         //计算合计
         for (SchoolAworkloadVo date : schoolAworkloadVos){
             date.setAmountTo(date.getEarlyReading().add(date.getRequiredCourses()).add(date.getEveningSelfStudy()));
@@ -312,9 +312,9 @@ public class SchoolAworkloadServiceImpl  extends ServiceImpl<SchoolAworkloadMapp
 
 
     @Override
-    public List<SchoolAworkloadExport> selectAworkloadList(SchoolAworkload schoolAworkload)
+    public List<SchoolAworkloadExport> selectAworkloadList(SchoolAworkloadVo schoolAworkloadVo)
     {
-        List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadMapper.selectAworkloadList(schoolAworkload);
+        List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadMapper.selectAworkloadList(schoolAworkloadVo);
         //计算合计
         for (SchoolAworkloadExport date : schoolAworkloadVos){
             date.setAmountTo(date.getEarlyReading().add(date.getRequiredCourses()).add(date.getEveningSelfStudy()));
@@ -325,7 +325,7 @@ public class SchoolAworkloadServiceImpl  extends ServiceImpl<SchoolAworkloadMapp
 
     /**
      * 新增工作量信息
-     * 
+     *
      * @param schoolAworkload 工作量信息
      * @return 结果
      */
@@ -338,7 +338,7 @@ public class SchoolAworkloadServiceImpl  extends ServiceImpl<SchoolAworkloadMapp
 
     /**
      * 修改工作量信息
-     * 
+     *
      * @param schoolAworkload 工作量信息
      * @return 结果
      */
@@ -351,7 +351,7 @@ public class SchoolAworkloadServiceImpl  extends ServiceImpl<SchoolAworkloadMapp
 
     /**
      * 批量删除工作量信息
-     * 
+     *
      * @param ids 需要删除的工作量信息主键
      * @return 结果
      */
@@ -363,7 +363,7 @@ public class SchoolAworkloadServiceImpl  extends ServiceImpl<SchoolAworkloadMapp
 
     /**
      * 删除工作量信息信息
-     * 
+     *
      * @param id 工作量信息主键
      * @return 结果
      */

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolGkAchievementServiceImpl.java

@@ -13,7 +13,7 @@ import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolGkAchievementSer
 
 /**
  * 高考成绩Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2023-12-13
  */
@@ -25,7 +25,7 @@ public class SchoolGkAchievementServiceImpl extends ServiceImpl<SchoolGkAchievem
 
     /**
      * 查询高考成绩
-     * 
+     *
      * @param id 高考成绩主键
      * @return 高考成绩
      */
@@ -37,23 +37,23 @@ public class SchoolGkAchievementServiceImpl extends ServiceImpl<SchoolGkAchievem
 
     /**
      * 查询高考成绩列表
-     * 
-     * @param schoolGkAchievement 高考成绩
+     *
+     * @param schoolGkAchievementVo 高考成绩
      * @return 高考成绩
      */
     @Override
-    public List<SchoolGkAchievementVo> selectSchoolGkAchievementVoList(SchoolGkAchievement schoolGkAchievement)
+    public List<SchoolGkAchievementVo> selectSchoolGkAchievementVoList(SchoolGkAchievementVo schoolGkAchievementVo)
     {
-        return schoolGkAchievementMapper.selectSchoolGkAchievementVoList(schoolGkAchievement);
+        return schoolGkAchievementMapper.selectSchoolGkAchievementVoList(schoolGkAchievementVo);
     }
     @Override
-    public List<SchoolGkAchievement> selectSchoolGkAchievementList(SchoolGkAchievement schoolGkAchievement)
+    public List<SchoolGkAchievement> selectSchoolGkAchievementList(SchoolGkAchievementVo schoolGkAchievementVo)
     {
-        return schoolGkAchievementMapper.selectSchoolGkAchievementList(schoolGkAchievement);
+        return schoolGkAchievementMapper.selectSchoolGkAchievementList(schoolGkAchievementVo);
     }
     /**
      * 新增高考成绩
-     * 
+     *
      * @param schoolGkAchievement 高考成绩
      * @return 结果
      */
@@ -66,7 +66,7 @@ public class SchoolGkAchievementServiceImpl extends ServiceImpl<SchoolGkAchievem
 
     /**
      * 修改高考成绩
-     * 
+     *
      * @param schoolGkAchievement 高考成绩
      * @return 结果
      */
@@ -79,7 +79,7 @@ public class SchoolGkAchievementServiceImpl extends ServiceImpl<SchoolGkAchievem
 
     /**
      * 批量删除高考成绩
-     * 
+     *
      * @param ids 需要删除的高考成绩主键
      * @return 结果
      */
@@ -91,7 +91,7 @@ public class SchoolGkAchievementServiceImpl extends ServiceImpl<SchoolGkAchievem
 
     /**
      * 删除高考成绩信息
-     * 
+     *
      * @param id 高考成绩主键
      * @return 结果
      */

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolXteamAwardServiceImpl.java

@@ -16,7 +16,7 @@ import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteamAwardServic
 
 /**
  * 团队获奖Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2023-12-13
  */
@@ -28,7 +28,7 @@ public class SchoolXteamAwardServiceImpl  extends ServiceImpl<SchoolXteamAwardMa
 
     /**
      * 查询团队获奖
-     * 
+     *
      * @param id 团队获奖主键
      * @return 团队获奖
      */
@@ -40,25 +40,25 @@ public class SchoolXteamAwardServiceImpl  extends ServiceImpl<SchoolXteamAwardMa
 
     /**
      * 查询团队获奖列表
-     * 
-     * @param schoolXteamAward 团队获奖
+     *
+     * @param schoolXteamAwardVo 团队获奖
      * @return 团队获奖
      */
     @Override
-    public List<SchoolXteamAward> selectSchoolXteamAwardList(SchoolXteamAward schoolXteamAward)
+    public List<SchoolXteamAward> selectSchoolXteamAwardList(SchoolXteamAwardVo schoolXteamAwardVo)
     {
-        return schoolXteamAwardMapper.selectSchoolXteamAwardList(schoolXteamAward);
+        return schoolXteamAwardMapper.selectSchoolXteamAwardList(schoolXteamAwardVo);
     }
 
     @Override
-    public List<SchoolXteamAwardVo> selectSchoolXteamAwardVoList(SchoolXteamAward schoolXteamAward)
+    public List<SchoolXteamAwardVo> selectSchoolXteamAwardVoList(SchoolXteamAwardVo schoolXteamAwardVo)
     {
-        return schoolXteamAwardMapper.selectSchoolXteamAwardVoList(schoolXteamAward);
+        return schoolXteamAwardMapper.selectSchoolXteamAwardVoList(schoolXteamAwardVo);
     }
 
     /**
      * 新增团队获奖
-     * 
+     *
      * @param schoolXteamAward 团队获奖
      * @return 结果
      */
@@ -71,7 +71,7 @@ public class SchoolXteamAwardServiceImpl  extends ServiceImpl<SchoolXteamAwardMa
 
     /**
      * 修改团队获奖
-     * 
+     *
      * @param schoolXteamAward 团队获奖
      * @return 结果
      */
@@ -84,7 +84,7 @@ public class SchoolXteamAwardServiceImpl  extends ServiceImpl<SchoolXteamAwardMa
 
     /**
      * 批量删除团队获奖
-     * 
+     *
      * @param ids 需要删除的团队获奖主键
      * @return 结果
      */
@@ -96,7 +96,7 @@ public class SchoolXteamAwardServiceImpl  extends ServiceImpl<SchoolXteamAwardMa
 
     /**
      * 删除团队获奖信息
-     * 
+     *
      * @param id 团队获奖主键
      * @return 结果
      */

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolAclassTeacherAssessmentService.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 /**
  * 班主任考核Service接口
- * 
+ *
  * @author ruoyi
  * @date 2023-12-12
  */
@@ -18,7 +18,7 @@ public interface ISchoolAclassTeacherAssessmentService  extends IService<SchoolA
 {
     /**
      * 查询班主任考核
-     * 
+     *
      * @param id 班主任考核主键
      * @return 班主任考核
      */
@@ -27,8 +27,8 @@ public interface ISchoolAclassTeacherAssessmentService  extends IService<SchoolA
     AjaxResult  saveCheckedDate(List<SchoolAclassTeacherAssessment> detailList);
     /**
      * 查询班主任考核列表
-     * 
-     * @param schoolAclassTeacherAssessment 班主任考核
+     *
+     * @param req 班主任考核
      * @return 班主任考核集合
      */
     public List<SchoolAclassTeacherAssessmentVo> selectSchoolAclassTeacherAssessmentList(SchoolAclassTeacherAssessmentReq req);
@@ -36,7 +36,7 @@ public interface ISchoolAclassTeacherAssessmentService  extends IService<SchoolA
 
     /**
      * 新增班主任考核
-     * 
+     *
      * @param schoolAclassTeacherAssessment 班主任考核
      * @return 结果
      */
@@ -44,7 +44,7 @@ public interface ISchoolAclassTeacherAssessmentService  extends IService<SchoolA
 
     /**
      * 修改班主任考核
-     * 
+     *
      * @param schoolAclassTeacherAssessment 班主任考核
      * @return 结果
      */
@@ -52,7 +52,7 @@ public interface ISchoolAclassTeacherAssessmentService  extends IService<SchoolA
 
     /**
      * 批量删除班主任考核
-     * 
+     *
      * @param ids 需要删除的班主任考核主键集合
      * @return 结果
      */
@@ -60,7 +60,7 @@ public interface ISchoolAclassTeacherAssessmentService  extends IService<SchoolA
 
     /**
      * 删除班主任考核信息
-     * 
+     *
      * @param id 班主任考核主键
      * @return 结果
      */

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolAworkloadService.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 /**
  * 工作量信息Service接口
- * 
+ *
  * @author ruoyi
  * @date 2023-12-11
  */
@@ -18,7 +18,7 @@ public interface ISchoolAworkloadService   extends IService<SchoolAworkload>
 {
     /**
      * 查询工作量信息
-     * 
+     *
      * @param id 工作量信息主键
      * @return 工作量信息
      */
@@ -27,17 +27,17 @@ public interface ISchoolAworkloadService   extends IService<SchoolAworkload>
     public AjaxResult saveAndChecked(List<SchoolAworkload> list);
     /**
      * 查询工作量信息列表
-     * 
-     * @param schoolAworkload 工作量信息
+     *
+     * @param schoolAworkloadVo 工作量信息
      * @return 工作量信息集合
      */
-    public List<SchoolAworkloadVo> selectSchoolAworkloadList(SchoolAworkload schoolAworkload);
+    public List<SchoolAworkloadVo> selectSchoolAworkloadList(SchoolAworkloadVo schoolAworkloadVo);
     //导出列表
-    public List<SchoolAworkloadExport> selectAworkloadList(SchoolAworkload schoolAworkload);
+    public List<SchoolAworkloadExport> selectAworkloadList(SchoolAworkloadVo schoolAworkloadVo);
 
     /**
      * 新增工作量信息
-     * 
+     *
      * @param schoolAworkload 工作量信息
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface ISchoolAworkloadService   extends IService<SchoolAworkload>
 
     /**
      * 修改工作量信息
-     * 
+     *
      * @param schoolAworkload 工作量信息
      * @return 结果
      */
@@ -53,7 +53,7 @@ public interface ISchoolAworkloadService   extends IService<SchoolAworkload>
 
     /**
      * 批量删除工作量信息
-     * 
+     *
      * @param ids 需要删除的工作量信息主键集合
      * @return 结果
      */
@@ -61,7 +61,7 @@ public interface ISchoolAworkloadService   extends IService<SchoolAworkload>
 
     /**
      * 删除工作量信息信息
-     * 
+     *
      * @param id 工作量信息主键
      * @return 结果
      */

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolGkAchievementService.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 /**
  * 高考成绩Service接口
- * 
+ *
  * @author ruoyi
  * @date 2023-12-13
  */
@@ -17,7 +17,7 @@ public interface ISchoolGkAchievementService  extends IService<SchoolGkAchieveme
 {
     /**
      * 查询高考成绩
-     * 
+     *
      * @param id 高考成绩主键
      * @return 高考成绩
      */
@@ -25,16 +25,16 @@ public interface ISchoolGkAchievementService  extends IService<SchoolGkAchieveme
 
     /**
      * 查询高考成绩列表
-     * 
-     * @param schoolGkAchievement 高考成绩
+     *
+     * @param schoolGkAchievementVo 高考成绩
      * @return 高考成绩集合
      */
-    public List<SchoolGkAchievementVo> selectSchoolGkAchievementVoList(SchoolGkAchievement schoolGkAchievement);
-    public List<SchoolGkAchievement> selectSchoolGkAchievementList(SchoolGkAchievement schoolGkAchievement);
+    public List<SchoolGkAchievementVo> selectSchoolGkAchievementVoList(SchoolGkAchievementVo schoolGkAchievementVo);
+    public List<SchoolGkAchievement> selectSchoolGkAchievementList(SchoolGkAchievementVo schoolGkAchievementVo);
 
     /**
      * 新增高考成绩
-     * 
+     *
      * @param schoolGkAchievement 高考成绩
      * @return 结果
      */
@@ -42,7 +42,7 @@ public interface ISchoolGkAchievementService  extends IService<SchoolGkAchieveme
 
     /**
      * 修改高考成绩
-     * 
+     *
      * @param schoolGkAchievement 高考成绩
      * @return 结果
      */
@@ -50,7 +50,7 @@ public interface ISchoolGkAchievementService  extends IService<SchoolGkAchieveme
 
     /**
      * 批量删除高考成绩
-     * 
+     *
      * @param ids 需要删除的高考成绩主键集合
      * @return 结果
      */
@@ -58,7 +58,7 @@ public interface ISchoolGkAchievementService  extends IService<SchoolGkAchieveme
 
     /**
      * 删除高考成绩信息
-     * 
+     *
      * @param id 高考成绩主键
      * @return 结果
      */

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolXteamAwardService.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 /**
  * 团队获奖Service接口
- * 
+ *
  * @author ruoyi
  * @date 2023-12-13
  */
@@ -17,7 +17,7 @@ public interface ISchoolXteamAwardService extends IService<SchoolXteamAward>
 {
     /**
      * 查询团队获奖
-     * 
+     *
      * @param id 团队获奖主键
      * @return 团队获奖
      */
@@ -25,16 +25,16 @@ public interface ISchoolXteamAwardService extends IService<SchoolXteamAward>
 
     /**
      * 查询团队获奖列表
-     * 
-     * @param schoolXteamAward 团队获奖
+     *
+     * @param schoolXteamAwardVo 团队获奖
      * @return 团队获奖集合
      */
-    public List<SchoolXteamAward> selectSchoolXteamAwardList(SchoolXteamAward schoolXteamAward);
-    public List<SchoolXteamAwardVo> selectSchoolXteamAwardVoList(SchoolXteamAward schoolXteamAward);
+    public List<SchoolXteamAward> selectSchoolXteamAwardList(SchoolXteamAwardVo schoolXteamAwardVo);
+    public List<SchoolXteamAwardVo> selectSchoolXteamAwardVoList(SchoolXteamAwardVo schoolXteamAwardVo);
 
     /**
      * 新增团队获奖
-     * 
+     *
      * @param schoolXteamAward 团队获奖
      * @return 结果
      */
@@ -42,7 +42,7 @@ public interface ISchoolXteamAwardService extends IService<SchoolXteamAward>
 
     /**
      * 修改团队获奖
-     * 
+     *
      * @param schoolXteamAward 团队获奖
      * @return 结果
      */
@@ -50,7 +50,7 @@ public interface ISchoolXteamAwardService extends IService<SchoolXteamAward>
 
     /**
      * 批量删除团队获奖
-     * 
+     *
      * @param ids 需要删除的团队获奖主键集合
      * @return 结果
      */
@@ -58,7 +58,7 @@ public interface ISchoolXteamAwardService extends IService<SchoolXteamAward>
 
     /**
      * 删除团队获奖信息
-     * 
+     *
      * @param id 团队获奖主键
      * @return 结果
      */

smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentMapper">
-    
+
     <resultMap type="SchoolAclassTeacherAssessment" id="SchoolAclassTeacherAssessmentResult">
         <result property="id"    column="id"    />
         <result property="semester"    column="semester"    />
@@ -38,25 +38,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="year != null  and year != ''"> and year = #{year}</if>
             <if test="semester != null  and semester != ''"> and semester = #{semester}</if>
             <if test="grade != null  and grade != ''"> and grade = #{grade}</if>
-        <if test="classType != null  and classType != ''"> and class_type like concat('%', #{classType}, '%') </if>
+            <if test="classType != null  and classType != ''"> and class_type like concat('%', #{classType}, '%') </if>
             <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
             <if test="sub != null  and sub != ''"> and sub = #{sub}</if>
             <if test="className != null  and className != ''"> and class_name like concat('%', #{className}, '%')</if>
 
 
-           <if test="moralEduCheckAchievement != null  and moralEduCheckAchievement != ''"> and moral_edu_check_achievement = #{moralEduCheckAchievement}</if>
-           <if test="moralEduCheckAchievementgt != null  and moralEduCheckAchievementgt != ''"> and moral_edu_check_achievement &gt; #{moralEduCheckAchievementgt}</if>
-           <if test="moralEduCheckAchievementgtd != null  and moralEduCheckAchievementgtd != ''"> and moral_edu_check_achievement &gt;= #{moralEduCheckAchievementgtd}</if>
-           <if test="moralEduCheckAchievementlt != null  and moralEduCheckAchievementlt != ''"> and moral_edu_check_achievement &lt; #{moralEduCheckAchievementlt}</if>
-           <if test="moralEduCheckAchievementltd != null  and moralEduCheckAchievementltd != ''"> and moral_edu_check_achievement &lt;= #{moralEduCheckAchievementltd}</if>
-
+            <if test="moralEduCheckAchievement != null  and moralEduCheckAchievement != ''"> and moral_edu_check_achievement = #{moralEduCheckAchievement}</if>
+            <if test="moralEduCheckAchievementgt != null  and moralEduCheckAchievementgt != ''"> and moral_edu_check_achievement &gt; #{moralEduCheckAchievementgt}</if>
+            <if test="moralEduCheckAchievementgtd != null  and moralEduCheckAchievementgtd != ''"> and moral_edu_check_achievement &gt;= #{moralEduCheckAchievementgtd}</if>
+            <if test="moralEduCheckAchievementlt != null  and moralEduCheckAchievementlt != ''"> and moral_edu_check_achievement &lt; #{moralEduCheckAchievementlt}</if>
+            <if test="moralEduCheckAchievementltd != null  and moralEduCheckAchievementltd != ''"> and moral_edu_check_achievement &lt;= #{moralEduCheckAchievementltd}</if>
 
-           <if test="intellEduCheckAchievement != null  and intellEduCheckAchievement != ''"> and intell_edu_check_achievement = #{intellEduCheckAchievement}</if>
-           <if test="intellEduCheckAchievementgt != null  and intellEduCheckAchievementgt != ''"> and intell_edu_check_achievement &gt; #{intellEduCheckAchievementgt}</if>
-           <if test="intellEduCheckAchievementgtd != null  and intellEduCheckAchievementgtd != ''"> and intell_edu_check_achievement &gt;= #{intellEduCheckAchievementgtd}</if>
-           <if test="intellEduCheckAchievementlt != null  and intellEduCheckAchievementlt != ''"> and intell_edu_check_achievement &lt; #{intellEduCheckAchievementlt}</if>
-           <if test="intellEduCheckAchievementltd != null  and intellEduCheckAchievementltd != ''"> and intell_edu_check_achievement &lt;= #{intellEduCheckAchievementltd}</if>
 
+            <if test="intellEduCheckAchievement != null  and intellEduCheckAchievement != ''"> and intell_edu_check_achievement = #{intellEduCheckAchievement}</if>
+            <if test="intellEduCheckAchievementgt != null  and intellEduCheckAchievementgt != ''"> and intell_edu_check_achievement &gt; #{intellEduCheckAchievementgt}</if>
+            <if test="intellEduCheckAchievementgtd != null  and intellEduCheckAchievementgtd != ''"> and intell_edu_check_achievement &gt;= #{intellEduCheckAchievementgtd}</if>
+            <if test="intellEduCheckAchievementlt != null  and intellEduCheckAchievementlt != ''"> and intell_edu_check_achievement &lt; #{intellEduCheckAchievementlt}</if>
+            <if test="intellEduCheckAchievementltd != null  and intellEduCheckAchievementltd != ''"> and intell_edu_check_achievement &lt;= #{intellEduCheckAchievementltd}</if>
+            <if test="idCards != null">
+                and id_card in
+                <foreach item="idCard" collection="idCards" open="(" separator="," close=")">
+                    #{idCard}
+                </foreach>
+            </if>
 
     </select>
 
@@ -87,7 +92,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="intellEduCheckAchievementgtd != null  and intellEduCheckAchievementgtd != ''"> and intell_edu_check_achievement &gt;= #{intellEduCheckAchievementgtd}</if>
         <if test="intellEduCheckAchievementlt != null  and intellEduCheckAchievementlt != ''"> and intell_edu_check_achievement &lt; #{intellEduCheckAchievementlt}</if>
         <if test="intellEduCheckAchievementltd != null  and intellEduCheckAchievementltd != ''"> and intell_edu_check_achievement &lt;= #{intellEduCheckAchievementltd}</if>
-
+         <if test="idCards != null">
+             and id_card in
+             <foreach item="idCard" collection="idCards" open="(" separator="," close=")">
+                 #{idCard}
+             </foreach>
+         </if>
 
     </select>
 
@@ -95,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectSchoolAclassTeacherAssessmentVo"/>
         where id = #{id} and del_flag = 0
     </select>
-        
+
     <insert id="insertSchoolAclassTeacherAssessment" parameterType="SchoolAclassTeacherAssessment" useGeneratedKeys="true" keyProperty="id">
         insert into school_aclass_teacher_assessment
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -170,9 +180,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteSchoolAclassTeacherAssessmentByIds" parameterType="String">
-        delete from school_aclass_teacher_assessment where id in 
+        delete from school_aclass_teacher_assessment where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>

smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolAworkloadMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolAworkloadMapper">
-    
+
     <resultMap type="SchoolAworkload" id="SchoolAworkloadResult">
         <result property="id"    column="id"    />
         <result property="schoolYear"    column="school_year"    />
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, school_year, semester, year, grade, name, sub, id_card, appointment_post, appointment_position, appointment_situation, class_name, class_type, early_reading, required_courses, evening_self_study, user_id, user_name, remark, create_by, create_time, update_by, update_time, del_flag from school_aworkload
     </sql>
 
-    <select id="selectSchoolAworkloadList" parameterType="SchoolAworkload" resultType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo">
+    <select id="selectSchoolAworkloadList" parameterType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo" resultType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo">
         <include refid="selectSchoolAworkloadVo"/>
             where  del_flag = 0
             <if test="schoolYear != null  and schoolYear != ''"> and school_year = #{schoolYear}</if>
@@ -59,12 +59,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="eveningSelfStudy != null "> and evening_self_study = #{eveningSelfStudy}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="idCards != null">
+                and id_card in
+                <foreach item="idCard" collection="idCards" open="(" separator="," close=")">
+                    #{idCard}
+                </foreach>
+            </if>
     </select>
 
 
 
 
-    <select id="selectAworkloadList" parameterType="SchoolAworkload" resultType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadExport">
+    <select id="selectAworkloadList" parameterType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo" resultType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadExport">
         <include refid="selectSchoolAworkloadVo"/>
             where del_flag = 0
             <if test="schoolYear != null  and schoolYear != ''"> and school_year = #{schoolYear}</if>
@@ -88,16 +94,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="eveningSelfStudy != null "> and evening_self_study = #{eveningSelfStudy}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
-
+            <if test="idCards != null">
+                and id_card in
+                <foreach item="idCard" collection="idCards" open="(" separator="," close=")">
+                    #{idCard}
+                </foreach>
+            </if>
     </select>
 
 
-    
+
     <select id="selectSchoolAworkloadById" parameterType="Long" resultMap="SchoolAworkloadResult">
         <include refid="selectSchoolAworkloadVo"/>
         where id = #{id} and del_flag = 0
     </select>
-        
+
     <insert id="insertSchoolAworkload" parameterType="SchoolAworkload" useGeneratedKeys="true" keyProperty="id">
         insert into school_aworkload
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -187,9 +198,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteSchoolAworkloadByIds" parameterType="String">
-        delete from school_aworkload where id in 
+        delete from school_aworkload where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>

smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolGkAchievementMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolGkAchievementMapper">
-    
+
     <resultMap type="SchoolGkAchievement" id="SchoolGkAchievementResult">
         <result property="id"    column="id"    />
         <result property="sub"    column="sub"    />
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, sub, teacher_name, year, teaching_class_name, user_id,class_type, gk_appraising, top_students_culture, increment_situation, effective_num_situation, other, audit_state, create_by, create_time, update_by, update_time, del_flag from school_gk_achievement
     </sql>
 
-    <select id="selectSchoolGkAchievementVoList" parameterType="SchoolGkAchievement" resultType="SchoolGkAchievementVo">
+    <select id="selectSchoolGkAchievementVoList" parameterType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolGkAchievementVo" resultType="SchoolGkAchievementVo">
         <include refid="selectSchoolGkAchievementVo"/>
             where del_flag = 0
             <if test="year != null  and year != ''"> and year = #{year}</if>
@@ -38,10 +38,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="teachingClassName != null  and teachingClassName != ''"> and teaching_class_name = #{teachingClassName}</if>
         <if test="classType != null  and classType != ''"> and class_type like concat('%', #{classType}, '%')</if>
             <if test="gkAppraising != null  and gkAppraising != ''"> and gk_appraising = #{gkAppraising}</if>
+            <if test="userIds != null">
+                and user_id in
+                <foreach item="userId" collection="userIds" open="(" separator="," close=")">
+                    #{userId}
+                </foreach>
+            </if>
             <if test="noAuditState != null  and noAuditState != ''"> and audit_state != #{noAuditState}</if>
     </select>
 
-       <select id="selectSchoolGkAchievementList" parameterType="SchoolGkAchievement" resultMap="SchoolGkAchievementResult">
+       <select id="selectSchoolGkAchievementList" parameterType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolGkAchievementVo" resultMap="SchoolGkAchievementResult">
         <include refid="selectSchoolGkAchievementVo"/>
            where del_flag = 0
            <if test="year != null  and year != ''"> and year = #{year}</if>
@@ -51,13 +57,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="teachingClassName != null  and teachingClassName != ''"> and teaching_class_name = #{teachingClassName}</if>
            <if test="classType != null  and classType != ''"> and class_type like concat('%', #{classType}, '%')</if>
            <if test="gkAppraising != null  and gkAppraising != ''"> and gk_appraising = #{gkAppraising}</if>
+           <if test="userIds != null">
+               and user_id in
+               <foreach item="userId" collection="userIds" open="(" separator="," close=")">
+                   #{userId}
+               </foreach>
+           </if>
      </select>
 
     <select id="selectSchoolGkAchievementById" parameterType="Long" resultMap="SchoolGkAchievementResult">
         <include refid="selectSchoolGkAchievementVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertSchoolGkAchievement" parameterType="SchoolGkAchievement" useGeneratedKeys="true" keyProperty="id">
         insert into school_gk_achievement
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -129,9 +141,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteSchoolGkAchievementByIds" parameterType="String">
-        delete from school_gk_achievement where id in 
+        delete from school_gk_achievement where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
+

smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationMapper.xml

@@ -38,6 +38,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="firstDegree != null ">
             AND CONCAT(IFNULL(first_degree,''),IFNULL(last_degree,'')) LIKE concat('%',#{firstDegree},'%')
             </if>
+            <if test="idCards != null">
+                and id_card in
+                <foreach item="idCard" collection="idCards" open="(" separator="," close=")">
+                    #{idCard}
+                </foreach>
+            </if>
     </select>
 
 
@@ -101,4 +107,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where id = #{id}
     </update>
-</mapper>
\ No newline at end of file
+</mapper>

smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXteamAwardMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXteamAwardMapper">
-    
+
     <resultMap type="SchoolXteamAward" id="SchoolXteamAwardResult">
         <result property="id"    column="id"    />
         <result property="schoolYear"    column="school_year"    />
@@ -26,9 +26,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, school_year, semester, year, grade, sub, award_situation, team_members_contribution, remark, audit_state, create_by, create_time, update_by, update_time, del_flag from school_xteam_award
     </sql>
 
-    <select id="selectSchoolXteamAwardList" parameterType="SchoolXteamAward" resultMap="SchoolXteamAwardResult">
+    <select id="selectSchoolXteamAwardList" parameterType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteamAwardVo" resultMap="SchoolXteamAwardResult">
         <include refid="selectSchoolXteamAwardVo"/>
-        <where>  
+        <where>
             <if test="schoolYear != null  and schoolYear != ''"> and school_year = #{schoolYear}</if>
             <if test="semester != null  and semester != ''"> and semester = #{semester}</if>
             <if test="year != null  and year != ''"> and year = #{year}</if>
@@ -38,10 +38,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="teamMembersContribution != null  and teamMembersContribution != ''"> and team_members_contribution = #{teamMembersContribution}</if>
             <if test="auditState != null  and auditState != ''"> and audit_state = #{auditState}</if>
             <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
+            <if test="userIds != null">
+                and create_by in
+                <foreach item="userId" collection="userIds" open="(" separator="," close=")">
+                    #{userId}
+                </foreach>
+            </if>
         </where>
     </select>
 
-    <select id="selectSchoolXteamAwardVoList" parameterType="SchoolXteamAward" resultType="SchoolXteamAwardVo">
+    <select id="selectSchoolXteamAwardVoList" parameterType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteamAwardVo" resultType="SchoolXteamAwardVo">
         <include refid="selectSchoolXteamAwardVo"/>
         <where>
             <if test="schoolYear != null  and schoolYear != ''"> and school_year = #{schoolYear}</if>
@@ -54,14 +60,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="auditState != null  and auditState != ''"> and audit_state = #{auditState}</if>
             <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
             <if test="noAuditState != null  and noAuditState != ''"> and audit_state != #{noAuditState}</if>
+            <if test="userIds != null">
+                and create_by in
+                <foreach item="userId" collection="userIds" open="(" separator="," close=")">
+                    #{userId}
+                </foreach>
+            </if>
         </where>
     </select>
-    
+
     <select id="selectSchoolXteamAwardById" parameterType="Long" resultMap="SchoolXteamAwardResult">
         <include refid="selectSchoolXteamAwardVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertSchoolXteamAward" parameterType="SchoolXteamAward" useGeneratedKeys="true" keyProperty="id">
         insert into school_xteam_award
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -124,9 +136,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteSchoolXteamAwardByIds" parameterType="String">
-        delete from school_xteam_award where id in 
+        delete from school_xteam_award where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>