Skip to content

D
dd_school
Commit b84b3d0a by xuwenhao
Options

12.28修改教师电子档案查看权限

parent b5932690
Showing with 283 additions and 165 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentController.java
...@@ -3,6 +3,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn; ...@@ -3,6 +3,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.io.*; import java.io.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
...@@ -31,6 +32,7 @@ import org.springframework.web.multipart.MultipartFile; ...@@ -31,6 +32,7 @@ import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.*; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.*;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAclassTeacherAssessmentService; import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAclassTeacherAssessmentService;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService; import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.SchoolTeacherBasichlnformationService;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -51,6 +53,8 @@ public class SchoolAclassTeacherAssessmentController extends BaseController ...@@ -51,6 +53,8 @@ public class SchoolAclassTeacherAssessmentController extends BaseController
private ISchoolXteachingAchievementsService schoolXteachingAchievementsService; private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
@Autowired @Autowired
private ISysDeptService sysDeptService; private ISysDeptService sysDeptService;
@Autowired
private SchoolTeacherBasichlnformationService basichlnformationService;
/** /**
* 查询班主任考核列表 * 查询班主任考核列表
...@@ -68,26 +72,30 @@ public class SchoolAclassTeacherAssessmentController extends BaseController ...@@ -68,26 +72,30 @@ public class SchoolAclassTeacherAssessmentController extends BaseController
List<SchoolAclassTeacherAssessmentVo> list = schoolAclassTeacherAssessmentService.selectSchoolAclassTeacherAssessmentList(req); List<SchoolAclassTeacherAssessmentVo> list = schoolAclassTeacherAssessmentService.selectSchoolAclassTeacherAssessmentList(req);
return getDataTable(list); return getDataTable(list);
} }
for (SysRole role : roles) { //全部权限
//教师电子档案超级管理员和班主任考核管理员可以看全部数据 List<SysRole> rolesList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("bzrkh_admin")).collect(Collectors.toList());
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("bzrkh_admin")){ if (rolesList.size() > 0){
startPage(); startPage();
List<SchoolAclassTeacherAssessmentVo> list = schoolAclassTeacherAssessmentService.selectSchoolAclassTeacherAssessmentList(req); List<SchoolAclassTeacherAssessmentVo> list = schoolAclassTeacherAssessmentService.selectSchoolAclassTeacherAssessmentList(req);
return getDataTable(list); return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//本部门权限
List<SysRole> rolesList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
if (rolesList1.size() > 0){
//教师电子档案中级管理员只能看本部门及以下的数据 //教师电子档案中级管理员只能看本部门及以下的数据
//获取当前登陆人的部门信息 //获取当前登陆人的部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//获取当前登陆人部门下所有人的身份证号 //获取当前登陆人部门下所有人的手机号
List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId()); List<String> userPhones = schoolXteachingAchievementsService.getUserPhonesByDeptId(sysDept.getDeptId());
if (deptUserIdCards.size() > 0){ //根据用户手机号查询用户身份证信息
req.setIdCards(deptUserIdCards); List<String> userIdCards = basichlnformationService.selectIdCardsByDdPhone(userPhones);
if (userIdCards.size() > 0){
req.setIdCards(userIdCards);
} }
startPage(); startPage();
List<SchoolAclassTeacherAssessmentVo> list = schoolAclassTeacherAssessmentService.selectSchoolAclassTeacherAssessmentList(req); List<SchoolAclassTeacherAssessmentVo> list = schoolAclassTeacherAssessmentService.selectSchoolAclassTeacherAssessmentList(req);
return getDataTable(list); return getDataTable(list);
} }
}
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -200,9 +208,9 @@ public class SchoolAclassTeacherAssessmentController extends BaseController ...@@ -200,9 +208,9 @@ public class SchoolAclassTeacherAssessmentController extends BaseController
ExcelUtil<SchoolAclassTeacherAssessmentExport> util = new ExcelUtil<>(SchoolAclassTeacherAssessmentExport.class); ExcelUtil<SchoolAclassTeacherAssessmentExport> util = new ExcelUtil<>(SchoolAclassTeacherAssessmentExport.class);
util.exportExcel(response, list, "老师考核"); util.exportExcel(response, list, "老师考核");
}else { }else {
for (SysRole role : roles) { //全部权限
//教师电子档案超级管理员和班主任考核管理员可以看全部数据 List<SysRole> rolesList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("bzrkh_admin")).collect(Collectors.toList());
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("bzrkh_admin")){ if (rolesList.size() > 0){
List<SchoolAclassTeacherAssessment> schoolAclassTeacherAssessmentVos = schoolAclassTeacherAssessmentService.selectSchoolList(req); List<SchoolAclassTeacherAssessment> schoolAclassTeacherAssessmentVos = schoolAclassTeacherAssessmentService.selectSchoolList(req);
List<SchoolAclassTeacherAssessmentExport> list = new ArrayList<>(); List<SchoolAclassTeacherAssessmentExport> list = new ArrayList<>();
for (SchoolAclassTeacherAssessment schoolAclassTeacherAssessmentVo : schoolAclassTeacherAssessmentVos) { for (SchoolAclassTeacherAssessment schoolAclassTeacherAssessmentVo : schoolAclassTeacherAssessmentVos) {
...@@ -212,14 +220,19 @@ public class SchoolAclassTeacherAssessmentController extends BaseController ...@@ -212,14 +220,19 @@ public class SchoolAclassTeacherAssessmentController extends BaseController
} }
ExcelUtil<SchoolAclassTeacherAssessmentExport> util = new ExcelUtil<>(SchoolAclassTeacherAssessmentExport.class); ExcelUtil<SchoolAclassTeacherAssessmentExport> util = new ExcelUtil<>(SchoolAclassTeacherAssessmentExport.class);
util.exportExcel(response, list, "老师考核"); util.exportExcel(response, list, "老师考核");
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//本部门权限
List<SysRole> rolesList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
if (rolesList1.size() > 0){
//教师电子档案中级管理员只能看本部门及以下的数据 //教师电子档案中级管理员只能看本部门及以下的数据
//获取当前登陆人的部门信息 //获取当前登陆人的部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//获取当前登陆人部门下所有人的身份证号 //获取当前登陆人部门下所有人的手机号
List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId()); List<String> userPhones = schoolXteachingAchievementsService.getUserPhonesByDeptId(sysDept.getDeptId());
if (deptUserIdCards.size() > 0){ //根据用户手机号查询用户身份证信息
req.setIdCards(deptUserIdCards); List<String> userIdCards = basichlnformationService.selectIdCardsByDdPhone(userPhones);
if (userIdCards.size() > 0){
req.setIdCards(userIdCards);
} }
List<SchoolAclassTeacherAssessment> schoolAclassTeacherAssessmentVos = schoolAclassTeacherAssessmentService.selectSchoolList(req); List<SchoolAclassTeacherAssessment> schoolAclassTeacherAssessmentVos = schoolAclassTeacherAssessmentService.selectSchoolList(req);
List<SchoolAclassTeacherAssessmentExport> list = new ArrayList<>(); List<SchoolAclassTeacherAssessmentExport> list = new ArrayList<>();
...@@ -236,10 +249,4 @@ public class SchoolAclassTeacherAssessmentController extends BaseController ...@@ -236,10 +249,4 @@ public class SchoolAclassTeacherAssessmentController extends BaseController
} }
} }
} }
}
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolAworkloadController.java
...@@ -3,6 +3,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn; ...@@ -3,6 +3,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.io.*; import java.io.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
...@@ -32,6 +33,7 @@ import org.springframework.web.multipart.MultipartFile; ...@@ -32,6 +33,7 @@ import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.*; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.*;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAworkloadService; import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAworkloadService;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService; import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.SchoolTeacherBasichlnformationService;
/** /**
* 工作量信息Controller * 工作量信息Controller
...@@ -50,6 +52,8 @@ public class SchoolAworkloadController extends BaseController ...@@ -50,6 +52,8 @@ public class SchoolAworkloadController extends BaseController
private ISchoolXteachingAchievementsService schoolXteachingAchievementsService; private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
@Autowired @Autowired
private ISysDeptService sysDeptService; private ISysDeptService sysDeptService;
@Autowired
private SchoolTeacherBasichlnformationService basichlnformationService;
/** /**
* 查询工作量信息列表 * 查询工作量信息列表
...@@ -67,26 +71,30 @@ public class SchoolAworkloadController extends BaseController ...@@ -67,26 +71,30 @@ public class SchoolAworkloadController extends BaseController
List<SchoolAworkloadVo> list = schoolAworkloadService.selectSchoolAworkloadList(schoolAworkloadVo); List<SchoolAworkloadVo> list = schoolAworkloadService.selectSchoolAworkloadList(schoolAworkloadVo);
return getDataTable(list); return getDataTable(list);
} }
for (SysRole role : roles) { //全部权限
//教师电子档案超级管理员和工作量信息管理员可以看全部数据 List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("gzl_admin")).collect(Collectors.toList());
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("gzl_admin")){ if (roleList.size() > 0){
startPage(); startPage();
List<SchoolAworkloadVo> list = schoolAworkloadService.selectSchoolAworkloadList(schoolAworkloadVo); List<SchoolAworkloadVo> list = schoolAworkloadService.selectSchoolAworkloadList(schoolAworkloadVo);
return getDataTable(list); return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//部分权限
List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
if (roleList1.size() > 0){
//教师电子档案中级管理员只能看本部门及以下的数据 //教师电子档案中级管理员只能看本部门及以下的数据
//获取当前登陆人的部门信息 //获取当前登陆人的部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//获取当前登陆人部门下所有人的身份证号 //获取当前登陆人部门下所有人的手机号
List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId()); List<String> userPhones = schoolXteachingAchievementsService.getUserPhonesByDeptId(sysDept.getDeptId());
if (deptUserIdCards.size() > 0){ //根据用户手机号查询用户身份证信息
schoolAworkloadVo.setIdCards(deptUserIdCards); List<String> userIdCards = basichlnformationService.selectIdCardsByDdPhone(userPhones);
if (userIdCards.size() > 0){
schoolAworkloadVo.setIdCards(userIdCards);
} }
startPage(); startPage();
List<SchoolAworkloadVo> list = schoolAworkloadService.selectSchoolAworkloadList(schoolAworkloadVo); List<SchoolAworkloadVo> list = schoolAworkloadService.selectSchoolAworkloadList(schoolAworkloadVo);
return getDataTable(list); return getDataTable(list);
} }
}
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -199,9 +207,10 @@ public class SchoolAworkloadController extends BaseController ...@@ -199,9 +207,10 @@ public class SchoolAworkloadController extends BaseController
ExcelUtil<SchoolAworkloadDc> util = new ExcelUtil<>(SchoolAworkloadDc.class); ExcelUtil<SchoolAworkloadDc> util = new ExcelUtil<>(SchoolAworkloadDc.class);
util.exportExcel(response, list, "工作量内容"); util.exportExcel(response, list, "工作量内容");
}else { }else {
for (SysRole role : roles) {
//教师电子档案超级管理员和教师基础信息管理员可以看全部数据 //全部权限
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("gzl_admin")){ List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("gzl_admin")).collect(Collectors.toList());
if (roleList.size() > 0){
List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadService.selectAworkloadList(schoolAworkloadVo); List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadService.selectAworkloadList(schoolAworkloadVo);
List<SchoolAworkloadDc> list = new ArrayList<>(); List<SchoolAworkloadDc> list = new ArrayList<>();
for (SchoolAworkloadExport aworkloadVo : schoolAworkloadVos) { for (SchoolAworkloadExport aworkloadVo : schoolAworkloadVos) {
...@@ -211,14 +220,19 @@ public class SchoolAworkloadController extends BaseController ...@@ -211,14 +220,19 @@ public class SchoolAworkloadController extends BaseController
} }
ExcelUtil<SchoolAworkloadDc> util = new ExcelUtil<>(SchoolAworkloadDc.class); ExcelUtil<SchoolAworkloadDc> util = new ExcelUtil<>(SchoolAworkloadDc.class);
util.exportExcel(response, list, "工作量内容"); util.exportExcel(response, list, "工作量内容");
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//部分权限
List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
if (roleList1.size() > 0){
//教师电子档案中级管理员只能看本部门及以下的数据 //教师电子档案中级管理员只能看本部门及以下的数据
//获取当前登陆人的部门信息 //获取当前登陆人的部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//获取当前登陆人部门下所有人的身份证号 //获取当前登陆人部门下所有人的手机号
List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId()); List<String> userPhones = schoolXteachingAchievementsService.getUserPhonesByDeptId(sysDept.getDeptId());
if (deptUserIdCards.size() > 0){ //根据用户手机号查询用户身份证信息
schoolAworkloadVo.setIdCards(deptUserIdCards); List<String> userIdCards = basichlnformationService.selectIdCardsByDdPhone(userPhones);
if (userIdCards.size() > 0){
schoolAworkloadVo.setIdCards(userIdCards);
} }
List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadService.selectAworkloadList(schoolAworkloadVo); List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadService.selectAworkloadList(schoolAworkloadVo);
List<SchoolAworkloadDc> list = new ArrayList<>(); List<SchoolAworkloadDc> list = new ArrayList<>();
...@@ -235,11 +249,4 @@ public class SchoolAworkloadController extends BaseController ...@@ -235,11 +249,4 @@ public class SchoolAworkloadController extends BaseController
} }
} }
} }
}
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolGkAchievementController.java
...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn; ...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
...@@ -65,12 +66,16 @@ public class SchoolGkAchievementController extends BaseController ...@@ -65,12 +66,16 @@ public class SchoolGkAchievementController extends BaseController
List<SchoolGkAchievementVo> list = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievementVo); List<SchoolGkAchievementVo> list = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievementVo);
return getDataTable(list); return getDataTable(list);
} }
for (SysRole role : roles) { //全部权限
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("gkcj_admin")){ List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("gkcj_admin")).collect(Collectors.toList());
if (roleList.size() > 0){
startPage(); startPage();
List<SchoolGkAchievementVo> list = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievementVo); List<SchoolGkAchievementVo> list = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievementVo);
return getDataTable(list); return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//部分权限
List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
if (roleList1.size() > 0){
//教师电子档案中级管理员只能查看本部门及部门以下的数据 //教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息 //根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
...@@ -83,7 +88,6 @@ public class SchoolGkAchievementController extends BaseController ...@@ -83,7 +88,6 @@ public class SchoolGkAchievementController extends BaseController
List<SchoolGkAchievementVo> list = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievementVo); List<SchoolGkAchievementVo> list = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievementVo);
return getDataTable(list); return getDataTable(list);
} }
}
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -157,12 +161,16 @@ public class SchoolGkAchievementController extends BaseController ...@@ -157,12 +161,16 @@ public class SchoolGkAchievementController extends BaseController
ExcelUtil<SchoolGkAchievement> util = new ExcelUtil<SchoolGkAchievement>(SchoolGkAchievement.class); ExcelUtil<SchoolGkAchievement> util = new ExcelUtil<SchoolGkAchievement>(SchoolGkAchievement.class);
util.exportExcel(response, list, "高考成绩数据"); util.exportExcel(response, list, "高考成绩数据");
}else { }else {
for (SysRole role : roles) { //全部权限
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("gkcj_admin")){ List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("gkcj_admin")).collect(Collectors.toList());
if (roleList.size() > 0){
List<SchoolGkAchievement> list = schoolGkAchievementService.selectSchoolGkAchievementList(schoolGkAchievementVo); List<SchoolGkAchievement> list = schoolGkAchievementService.selectSchoolGkAchievementList(schoolGkAchievementVo);
ExcelUtil<SchoolGkAchievement> util = new ExcelUtil<SchoolGkAchievement>(SchoolGkAchievement.class); ExcelUtil<SchoolGkAchievement> util = new ExcelUtil<SchoolGkAchievement>(SchoolGkAchievement.class);
util.exportExcel(response, list, "高考成绩数据"); util.exportExcel(response, list, "高考成绩数据");
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//部分权限
List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
if (roleList1.size() > 0){
//教师电子档案中级管理员只能查看本部门及部门以下的数据 //教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息 //根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
...@@ -180,6 +188,4 @@ public class SchoolGkAchievementController extends BaseController ...@@ -180,6 +188,4 @@ public class SchoolGkAchievementController extends BaseController
} }
} }
} }
}
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationController.java
...@@ -39,6 +39,7 @@ import java.io.*; ...@@ -39,6 +39,7 @@ import java.io.*;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
@RestController @RestController
@RequestMapping("/teacher/basiclnformation") @RequestMapping("/teacher/basiclnformation")
...@@ -73,26 +74,29 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -73,26 +74,29 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
List<SchoolTeacherBasicInformationVo> list = basichlnformationService.list(information); List<SchoolTeacherBasicInformationVo> list = basichlnformationService.list(information);
return getDataTable(list); return getDataTable(list);
} }
for (SysRole role : roles) {
//教师电子档案超级管理员和教师基础信息管理员可以看全部数据 List<SysRole> sysRoles = roles.stream().filter(item -> item.getRoleKey().equals("jsdzdncj_admin") || item.getRoleKey().equals("jsjcxj_admin")).collect(Collectors.toList());
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jsjcxj_admin")){ //全部权限
if(sysRoles.size()>0){
startPage(); startPage();
List<SchoolTeacherBasicInformationVo> list = basichlnformationService.list(information); List<SchoolTeacherBasicInformationVo> list = basichlnformationService.list(information);
return getDataTable(list); return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//部分权限
List<SysRole> sysRoles2 = roles.stream().filter(item -> item.getRoleKey().equals("jsdnzj_admin") ).collect(Collectors.toList());
if(sysRoles2.size()>0){
//教师电子档案中级管理员只能看本部门及以下的数据 //教师电子档案中级管理员只能看本部门及以下的数据
//获取当前登陆人的部门信息 //获取当前登陆人的部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//获取当前登陆人部门下所有人的身份证号 //获取当前登陆人部门下所有人的手机号
List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId()); List<String> userPhones = schoolXteachingAchievementsService.getUserPhonesByDeptId(sysDept.getDeptId());
if (deptUserIdCards.size() > 0){ if (userPhones.size() > 0){
information.setIdCards(deptUserIdCards); information.setUserPhones(userPhones);
} }
startPage(); startPage();
List<SchoolTeacherBasicInformationVo> list = basichlnformationService.list(information); List<SchoolTeacherBasicInformationVo> list = basichlnformationService.list(information);
return getDataTable(list); return getDataTable(list);
} }
}
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -215,40 +219,30 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -215,40 +219,30 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class); ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class);
util.exportExcel(response, list1, "教师基本信息"); util.exportExcel(response, list1, "教师基本信息");
}else{ }else{
for (SysRole role : roles) {
//教师电子档案超级管理员和教师基础信息管理员可以看全部数据 List<SysRole> sysRoles = roles.stream().filter(item -> item.getRoleKey().equals("jsdzdncj_admin") || item.getRoleKey().equals("jsjcxj_admin")).collect(Collectors.toList());
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jsjcxj_admin")){ //全部权限
if(sysRoles.size()>0){
List<SchoolTeacherBasicInformationVo> list1 = basichlnformationService.list(export); List<SchoolTeacherBasicInformationVo> list1 = basichlnformationService.list(export);
ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class); ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class);
util.exportExcel(response, list1, "教师基本信息"); util.exportExcel(response, list1, "教师基本信息");
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//部分权限
List<SysRole> sysRoles2 = roles.stream().filter(item -> item.getRoleKey().equals("jsdnzj_admin") ).collect(Collectors.toList());
if(sysRoles2.size()>0){
//教师电子档案中级管理员只能看本部门及以下的数据 //教师电子档案中级管理员只能看本部门及以下的数据
//获取当前登陆人的部门信息 //获取当前登陆人的部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//获取当前登陆人部门下所有人的身份证号 //获取当前登陆人部门下所有人的身份证号
List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId()); List<String> userPhones = schoolXteachingAchievementsService.getUserPhonesByDeptId(sysDept.getDeptId());
if (deptUserIdCards.size() > 0){ if (userPhones.size() > 0){
export.setIdCards(deptUserIdCards); export.setUserPhones(userPhones);
} }
List<SchoolTeacherBasicInformationVo> list1 = basichlnformationService.list(export); List<SchoolTeacherBasicInformationVo> list1 = basichlnformationService.list(export);
ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class); ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class);
util.exportExcel(response, list1, "教师基本信息"); 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
...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn; ...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
...@@ -68,12 +69,16 @@ public class SchoolXacademicWorksController extends BaseController ...@@ -68,12 +69,16 @@ public class SchoolXacademicWorksController extends BaseController
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo); List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
return getDataTable(list); return getDataTable(list);
} }
for (SysRole role : roles) { //全部权限
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("lwlz_admin")){ List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("lwlz_admin")).collect(Collectors.toList());
if (roleList.size() > 0){
startPage(); startPage();
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo); List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
return getDataTable(list); return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//部分权限
List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
if (roleList1.size() > 0){
//教师电子档案中级管理员只能查看本部门及部门以下的数据 //教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息 //根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
...@@ -85,7 +90,6 @@ public class SchoolXacademicWorksController extends BaseController ...@@ -85,7 +90,6 @@ public class SchoolXacademicWorksController extends BaseController
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo); List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
return getDataTable(list); return getDataTable(list);
} }
}
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -148,8 +152,10 @@ public class SchoolXacademicWorksController extends BaseController ...@@ -148,8 +152,10 @@ public class SchoolXacademicWorksController extends BaseController
ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class); ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class);
util.exportExcel(response, list, "论文著作数据"); util.exportExcel(response, list, "论文著作数据");
}else { }else {
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("lwlz_admin")){ //全部权限
List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("lwlz_admin")).collect(Collectors.toList());
if (roleList.size() > 0){
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo); List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
for (SchoolXacademicWorksVo xacademicWorksVo : list) { for (SchoolXacademicWorksVo xacademicWorksVo : list) {
i ++; i ++;
...@@ -158,7 +164,10 @@ public class SchoolXacademicWorksController extends BaseController ...@@ -158,7 +164,10 @@ public class SchoolXacademicWorksController extends BaseController
} }
ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class); ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class);
util.exportExcel(response, list, "论文著作数据"); util.exportExcel(response, list, "论文著作数据");
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//部分权限
List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
if (roleList1.size() > 0){
//教师电子档案中级管理员只能查看本部门及部门以下的数据 //教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息 //根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
...@@ -181,7 +190,6 @@ public class SchoolXacademicWorksController extends BaseController ...@@ -181,7 +190,6 @@ public class SchoolXacademicWorksController extends BaseController
} }
} }
} }
}
/** /**
* 获取论文著作详细信息 * 获取论文著作详细信息
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXcomprehensiveHonorsController.java
...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn; ...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
...@@ -66,12 +67,16 @@ public class SchoolXcomprehensiveHonorsController extends BaseController ...@@ -66,12 +67,16 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo); List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
return getDataTable(list); return getDataTable(list);
} }
for (SysRole role : roles) { //全部权限
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("zhry_admin")){ List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("zhry_admin")).collect(Collectors.toList());
if (roleList.size() > 0){
startPage(); startPage();
List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo); List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
return getDataTable(list); return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//部分权限
List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
if (roleList1.size() > 0){
//教师电子档案中级管理员只能查看本部门及部门以下的数据 //教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息 //根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
...@@ -84,7 +89,6 @@ public class SchoolXcomprehensiveHonorsController extends BaseController ...@@ -84,7 +89,6 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo); List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
return getDataTable(list); return getDataTable(list);
} }
}
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -147,8 +151,10 @@ public class SchoolXcomprehensiveHonorsController extends BaseController ...@@ -147,8 +151,10 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class); ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class);
util.exportExcel(response, list, "综合荣誉数据"); util.exportExcel(response, list, "综合荣誉数据");
}else { }else {
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("zhry_admin")){ //全部权限
List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("zhry_admin")).collect(Collectors.toList());
if (roleList.size() > 0){
List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo); List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
for (SchoolXcomprehensiveHonorsVo xcomprehensiveHonorsVo : list) { for (SchoolXcomprehensiveHonorsVo xcomprehensiveHonorsVo : list) {
i ++; i ++;
...@@ -157,7 +163,10 @@ public class SchoolXcomprehensiveHonorsController extends BaseController ...@@ -157,7 +163,10 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
} }
ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class); ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class);
util.exportExcel(response, list, "综合荣誉数据"); util.exportExcel(response, list, "综合荣誉数据");
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//部分权限
List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
if (roleList1.size() > 0){
//教师电子档案中级管理员只能查看本部门及部门以下的数据 //教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息 //根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
...@@ -180,7 +189,6 @@ public class SchoolXcomprehensiveHonorsController extends BaseController ...@@ -180,7 +189,6 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
} }
} }
} }
}
/** /**
* 获取综合荣誉详细信息 * 获取综合荣誉详细信息
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXlectureAwardsController.java
...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn; ...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
...@@ -67,12 +68,16 @@ public class SchoolXlectureAwardsController extends BaseController ...@@ -67,12 +68,16 @@ public class SchoolXlectureAwardsController extends BaseController
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo); List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
return getDataTable(list); return getDataTable(list);
} }
for (SysRole role : roles) { //全部权限
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jkhj_admin")){ List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jkhj_admin")).collect(Collectors.toList());
if (roleList.size() > 0){
startPage(); startPage();
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo); List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
return getDataTable(list); return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//部分权限
List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
if (roleList1.size() > 0){
//教师电子档案中级管理员只能查看本部门及部门以下的数据 //教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息 //根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
...@@ -85,7 +90,6 @@ public class SchoolXlectureAwardsController extends BaseController ...@@ -85,7 +90,6 @@ public class SchoolXlectureAwardsController extends BaseController
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo); List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
return getDataTable(list); return getDataTable(list);
} }
}
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -148,8 +152,10 @@ public class SchoolXlectureAwardsController extends BaseController ...@@ -148,8 +152,10 @@ public class SchoolXlectureAwardsController extends BaseController
ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class); ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class);
util.exportExcel(response, list, "讲课获奖数据"); util.exportExcel(response, list, "讲课获奖数据");
}else { }else {
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jkhj_admin")){ //全部权限
List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jkhj_admin")).collect(Collectors.toList());
if (roleList.size() > 0){
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo); List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
for (SchoolXlectureAwardsVo xlectureAwardsVo : list) { for (SchoolXlectureAwardsVo xlectureAwardsVo : list) {
i ++; i ++;
...@@ -158,7 +164,10 @@ public class SchoolXlectureAwardsController extends BaseController ...@@ -158,7 +164,10 @@ public class SchoolXlectureAwardsController extends BaseController
} }
ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class); ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class);
util.exportExcel(response, list, "讲课获奖数据"); util.exportExcel(response, list, "讲课获奖数据");
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//部分权限
List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
if (roleList1.size() > 0){
//教师电子档案中级管理员只能查看本部门及部门以下的数据 //教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息 //根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
...@@ -180,7 +189,6 @@ public class SchoolXlectureAwardsController extends BaseController ...@@ -180,7 +189,6 @@ public class SchoolXlectureAwardsController extends BaseController
util.exportExcel(response, new ArrayList<>(), "讲课获奖数据"); util.exportExcel(response, new ArrayList<>(), "讲课获奖数据");
} }
} }
}
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXprojectResearchController.java
...@@ -25,6 +25,7 @@ import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXprojectResearchVo; ...@@ -25,6 +25,7 @@ import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXprojectResearchVo;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
/** /**
* 课题研究Controller * 课题研究Controller
...@@ -62,12 +63,17 @@ public class SchoolXprojectResearchController extends BaseController { ...@@ -62,12 +63,17 @@ public class SchoolXprojectResearchController extends BaseController {
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo); List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
return getDataTable(list); return getDataTable(list);
} }
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("ktyj_admin")){ //全部权限
List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("ktyj_admin")).collect(Collectors.toList());
if (roleList.size() > 0){
startPage(); startPage();
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo); List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
return getDataTable(list); return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//部分权限
List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
if (roleList1.size() > 0){
//教师电子档案中级管理员只能查看本部门及部门以下的数据 //教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息 //根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
...@@ -80,7 +86,6 @@ public class SchoolXprojectResearchController extends BaseController { ...@@ -80,7 +86,6 @@ public class SchoolXprojectResearchController extends BaseController {
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo); List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
return getDataTable(list); return getDataTable(list);
} }
}
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -143,8 +148,10 @@ public class SchoolXprojectResearchController extends BaseController { ...@@ -143,8 +148,10 @@ public class SchoolXprojectResearchController extends BaseController {
ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class); ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class);
util.exportExcel(response, list, "课题研究数据"); util.exportExcel(response, list, "课题研究数据");
}else { }else {
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("ktyj_admin")){ //全部权限
List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("ktyj_admin")).collect(Collectors.toList());
if (roleList.size() > 0){
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo); List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
for (SchoolXprojectResearchVo xprojectResearchVo : list) { for (SchoolXprojectResearchVo xprojectResearchVo : list) {
i ++; i ++;
...@@ -153,7 +160,10 @@ public class SchoolXprojectResearchController extends BaseController { ...@@ -153,7 +160,10 @@ public class SchoolXprojectResearchController extends BaseController {
} }
ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class); ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class);
util.exportExcel(response, list, "课题研究数据"); util.exportExcel(response, list, "课题研究数据");
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//部分权限
List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
if (roleList1.size() > 0){
//教师电子档案中级管理员只能查看本部门及部门以下的数据 //教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息 //根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
...@@ -175,7 +185,6 @@ public class SchoolXprojectResearchController extends BaseController { ...@@ -175,7 +185,6 @@ public class SchoolXprojectResearchController extends BaseController {
util.exportExcel(response, new ArrayList<>(), "课题研究数据"); util.exportExcel(response, new ArrayList<>(), "课题研究数据");
} }
} }
}
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteacherAwardsController.java
...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn; ...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
...@@ -67,12 +68,16 @@ public class SchoolXteacherAwardsController extends BaseController ...@@ -67,12 +68,16 @@ public class SchoolXteacherAwardsController extends BaseController
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo); List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
return getDataTable(list); return getDataTable(list);
} }
for (SysRole role : roles) { //全部权限
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jshj_admin")){ List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jshj_admin")).collect(Collectors.toList());
if (roleList.size() > 0){
startPage(); startPage();
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo); List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
return getDataTable(list); return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//部分权限
List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
if (roleList1.size() > 0){
//教师电子档案中级管理员只能查看本部门及部门以下的数据 //教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息 //根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
...@@ -85,7 +90,6 @@ public class SchoolXteacherAwardsController extends BaseController ...@@ -85,7 +90,6 @@ public class SchoolXteacherAwardsController extends BaseController
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo); List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
return getDataTable(list); return getDataTable(list);
} }
}
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -148,8 +152,10 @@ public class SchoolXteacherAwardsController extends BaseController ...@@ -148,8 +152,10 @@ public class SchoolXteacherAwardsController extends BaseController
ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class); ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class);
util.exportExcel(response, list, "教师获奖数据"); util.exportExcel(response, list, "教师获奖数据");
}else { }else {
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jshj_admin")){ //全部权限
List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jshj_admin")).collect(Collectors.toList());
if (roleList.size() > 0){
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo); List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
for (SchoolXteacherAwardsVo xteacherAwardsVo : list) { for (SchoolXteacherAwardsVo xteacherAwardsVo : list) {
i ++; i ++;
...@@ -158,7 +164,10 @@ public class SchoolXteacherAwardsController extends BaseController ...@@ -158,7 +164,10 @@ public class SchoolXteacherAwardsController extends BaseController
} }
ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class); ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class);
util.exportExcel(response, list, "教师获奖数据"); util.exportExcel(response, list, "教师获奖数据");
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//部分权限
List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
if (roleList1.size() > 0){
//教师电子档案中级管理员只能查看本部门及部门以下的数据 //教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息 //根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
...@@ -181,7 +190,6 @@ public class SchoolXteacherAwardsController extends BaseController ...@@ -181,7 +190,6 @@ public class SchoolXteacherAwardsController extends BaseController
} }
} }
} }
}
/** /**
* 获取教师获奖详细信息 * 获取教师获奖详细信息
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteachingAchievementsController.java
...@@ -3,6 +3,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn; ...@@ -3,6 +3,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
...@@ -33,6 +34,7 @@ import com.ruoyi.common.core.page.TableDataInfo; ...@@ -33,6 +34,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteachingAchievements; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteachingAchievements;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService; import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.SchoolTeacherBasichlnformationService;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXacademicWorksVo; import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXacademicWorksVo;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo; import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo;
...@@ -50,6 +52,8 @@ public class SchoolXteachingAchievementsController extends BaseController ...@@ -50,6 +52,8 @@ public class SchoolXteachingAchievementsController extends BaseController
private ISchoolXteachingAchievementsService schoolXteachingAchievementsService; private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
@Autowired @Autowired
private ISysDeptService sysDeptService; private ISysDeptService sysDeptService;
@Autowired
private SchoolTeacherBasichlnformationService basichlnformationService;
/** /**
* 查询教学成绩列表 * 查询教学成绩列表
...@@ -68,12 +72,17 @@ public class SchoolXteachingAchievementsController extends BaseController ...@@ -68,12 +72,17 @@ public class SchoolXteachingAchievementsController extends BaseController
List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo); List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
return getDataTable(list); return getDataTable(list);
} }
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jxcj_admin")){ //全部权限
List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jxcj_admin")).collect(Collectors.toList());
if (roleList.size() > 0){
startPage(); startPage();
List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo); List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
return getDataTable(list); return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//部分权限
List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
if (roleList1.size() > 0 ){
//教师电子档案中级管理员只能查看本部门及部门以下的数据 //教师电子档案中级管理员只能查看本部门及部门以下的数据
// Long deptId = null; // Long deptId = null;
//根据用户部门id查询用户部门信息 //根据用户部门id查询用户部门信息
...@@ -105,16 +114,17 @@ public class SchoolXteachingAchievementsController extends BaseController ...@@ -105,16 +114,17 @@ public class SchoolXteachingAchievementsController extends BaseController
// } // }
// } // }
// } // }
//查询本部门下所有教师的身份证号 //获取当前登陆人部门下所有人的手机号
List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId()); List<String> userPhones = schoolXteachingAchievementsService.getUserPhonesByDeptId(sysDept.getDeptId());
if (deptUserIdCards.size() > 0){ //根据用户手机号查询用户身份证信息
schoolXteachingAchievementsVo.setIdCards(deptUserIdCards); List<String> userIdCards = basichlnformationService.selectIdCardsByDdPhone(userPhones);
if (userIdCards.size() > 0){
schoolXteachingAchievementsVo.setIdCards(userIdCards);
} }
startPage(); startPage();
List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo); List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
return getDataTable(list); return getDataTable(list);
} }
}
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -141,8 +151,10 @@ public class SchoolXteachingAchievementsController extends BaseController ...@@ -141,8 +151,10 @@ public class SchoolXteachingAchievementsController extends BaseController
ExcelUtil<SchoolXteachingAchievementsVo> util = new ExcelUtil<SchoolXteachingAchievementsVo>(SchoolXteachingAchievementsVo.class); ExcelUtil<SchoolXteachingAchievementsVo> util = new ExcelUtil<SchoolXteachingAchievementsVo>(SchoolXteachingAchievementsVo.class);
util.exportExcel(response, list, "教学成绩数据"); util.exportExcel(response, list, "教学成绩数据");
}else { }else {
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jxcj_admin")){ //全部权限
List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jxcj_admin")).collect(Collectors.toList());
if (roleList.size() > 0){
List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo); List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
for (SchoolXteachingAchievementsVo schoolXteachingAchievementsVo1 : list) { for (SchoolXteachingAchievementsVo schoolXteachingAchievementsVo1 : list) {
i ++; i ++;
...@@ -150,7 +162,10 @@ public class SchoolXteachingAchievementsController extends BaseController ...@@ -150,7 +162,10 @@ public class SchoolXteachingAchievementsController extends BaseController
} }
ExcelUtil<SchoolXteachingAchievementsVo> util = new ExcelUtil<SchoolXteachingAchievementsVo>(SchoolXteachingAchievementsVo.class); ExcelUtil<SchoolXteachingAchievementsVo> util = new ExcelUtil<SchoolXteachingAchievementsVo>(SchoolXteachingAchievementsVo.class);
util.exportExcel(response, list, "教学成绩数据"); util.exportExcel(response, list, "教学成绩数据");
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//部分权限
List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
if (roleList1.size() > 0 ){
//教师电子档案中级管理员只能查看本部门及部门以下的数据 //教师电子档案中级管理员只能查看本部门及部门以下的数据
// Long deptId = null; // Long deptId = null;
//根据用户部门id查询用户部门信息 //根据用户部门id查询用户部门信息
...@@ -182,10 +197,12 @@ public class SchoolXteachingAchievementsController extends BaseController ...@@ -182,10 +197,12 @@ public class SchoolXteachingAchievementsController extends BaseController
// } // }
// } // }
// } // }
//查询本部门下所有教师的身份证号 //获取当前登陆人部门下所有人的手机号
List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId()); List<String> userPhones = schoolXteachingAchievementsService.getUserPhonesByDeptId(sysDept.getDeptId());
if (deptUserIdCards.size() > 0){ //根据用户手机号查询用户身份证信息
schoolXteachingAchievementsVo.setIdCards(deptUserIdCards); List<String> userIdCards = basichlnformationService.selectIdCardsByDdPhone(userPhones);
if (userIdCards.size() > 0){
schoolXteachingAchievementsVo.setIdCards(userIdCards);
} }
List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo); List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
for (SchoolXteachingAchievementsVo schoolXteachingAchievementsVo1 : list) { for (SchoolXteachingAchievementsVo schoolXteachingAchievementsVo1 : list) {
...@@ -201,8 +218,6 @@ public class SchoolXteachingAchievementsController extends BaseController ...@@ -201,8 +218,6 @@ public class SchoolXteachingAchievementsController extends BaseController
} }
} }
}
/* /*
* 下载模板 * 下载模板
* */ * */
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteamAwardController.java
...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn; ...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysDept;
...@@ -64,12 +65,17 @@ public class SchoolXteamAwardController extends BaseController ...@@ -64,12 +65,17 @@ public class SchoolXteamAwardController extends BaseController
List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAwardVo); List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAwardVo);
return getDataTable(list); return getDataTable(list);
} }
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("tdhj_admin")){ //全部权限
List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("tdhj_admin")).collect(Collectors.toList());
if (roleList.size() > 0){
startPage(); startPage();
List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAwardVo); List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAwardVo);
return getDataTable(list); return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//部分权限
List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
if (roleList1.size() > 0){
//教师电子档案中级管理员只能查看本部门及部门以下的数据 //教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息 //根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
...@@ -82,7 +88,6 @@ public class SchoolXteamAwardController extends BaseController ...@@ -82,7 +88,6 @@ public class SchoolXteamAwardController extends BaseController
List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAwardVo); List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAwardVo);
return getDataTable(list); return getDataTable(list);
} }
}
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -117,12 +122,17 @@ public class SchoolXteamAwardController extends BaseController ...@@ -117,12 +122,17 @@ public class SchoolXteamAwardController extends BaseController
ExcelUtil<SchoolXteamAward> util = new ExcelUtil<SchoolXteamAward>(SchoolXteamAward.class); ExcelUtil<SchoolXteamAward> util = new ExcelUtil<SchoolXteamAward>(SchoolXteamAward.class);
util.exportExcel(response, list, "团队获奖数据"); util.exportExcel(response, list, "团队获奖数据");
}else { }else {
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("tdhj_admin")){ //全部权限
List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("tdhj_admin")).collect(Collectors.toList());
if (roleList.size() > 0){
List<SchoolXteamAward> list = schoolXteamAwardService.selectSchoolXteamAwardList(schoolXteamAwardVo); List<SchoolXteamAward> list = schoolXteamAwardService.selectSchoolXteamAwardList(schoolXteamAwardVo);
ExcelUtil<SchoolXteamAward> util = new ExcelUtil<SchoolXteamAward>(SchoolXteamAward.class); ExcelUtil<SchoolXteamAward> util = new ExcelUtil<SchoolXteamAward>(SchoolXteamAward.class);
util.exportExcel(response, list, "团队获奖数据"); util.exportExcel(response, list, "团队获奖数据");
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }
//部分权限
List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
if (roleList1.size() > 0){
//教师电子档案中级管理员只能查看本部门及部门以下的数据 //教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息 //根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
...@@ -141,8 +151,6 @@ public class SchoolXteamAwardController extends BaseController ...@@ -141,8 +151,6 @@ public class SchoolXteamAwardController extends BaseController
} }
} }
}
/** /**
* 获取团队获奖详细信息 * 获取团队获奖详细信息
*/ */
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationMapper.java
package yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn; package yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolIdCardQuerReq; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolIdCardQuerReq;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformation; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformation;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformationVo; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformationVo;
...@@ -18,4 +19,11 @@ public interface SchoolTeacherBasichlnformationMapper extends BaseMapper<SchoolT ...@@ -18,4 +19,11 @@ public interface SchoolTeacherBasichlnformationMapper extends BaseMapper<SchoolT
List<SchoolIdCardQuerReq> selectByIdCardMap(); List<SchoolIdCardQuerReq> selectByIdCardMap();
/**
* 根据手机号查询身份证信息
* @param userPhones
* @return
*/
List<String> selectIdCardsByDdPhone(@Param("userPhones") List<String> userPhones);
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolXteachingAchievementsMapper.java
...@@ -75,11 +75,11 @@ public interface SchoolXteachingAchievementsMapper extends BaseMapper<SchoolXtea ...@@ -75,11 +75,11 @@ public interface SchoolXteachingAchievementsMapper extends BaseMapper<SchoolXtea
List<Long> getUserIdsByDeptId(@Param("deptId") Long deptId); List<Long> getUserIdsByDeptId(@Param("deptId") Long deptId);
/** /**
* 查询本部门下所有教师身份证号 * 查询本部门下所有教师手机号
* @param deptId * @param deptId
* @return * @return
*/ */
List<String> getUserIdCardsByDeptId(@Param("deptId") Long deptId); List<String> getUserPhonesByDeptId(@Param("deptId") Long deptId);
/** /**
* 查询所有级部id * 查询所有级部id
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationServicelmpl.java
...@@ -803,6 +803,15 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo ...@@ -803,6 +803,15 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
} }
/**
* 根据手机号查询身份证信息
* @param userPhones
* @return
*/
@Override
public List<String> selectIdCardsByDdPhone(List<String> userPhones) {
return teacherBasichlnformationMapper.selectIdCardsByDdPhone(userPhones);
}
@Override @Override
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolXteachingAchievementsServiceImpl.java
...@@ -438,13 +438,13 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt ...@@ -438,13 +438,13 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt
} }
/** /**
* 查询本部门下所有教师身份证号 * 查询本部门下所有教师手机号
* @param deptId * @param deptId
* @return * @return
*/ */
@Override @Override
public List<String> getUserIdCardsByDeptId(Long deptId) { public List<String> getUserPhonesByDeptId(Long deptId) {
return schoolXteachingAchievementsMapper.getUserIdCardsByDeptId(deptId); return schoolXteachingAchievementsMapper.getUserPhonesByDeptId(deptId);
} }
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolXteachingAchievementsService.java
...@@ -100,11 +100,11 @@ public interface ISchoolXteachingAchievementsService extends IService<SchoolXtea ...@@ -100,11 +100,11 @@ public interface ISchoolXteachingAchievementsService extends IService<SchoolXtea
List<Long> getUserIdsByDeptId(Long deptId); List<Long> getUserIdsByDeptId(Long deptId);
/** /**
* 查询本部门下所有教师身份证号 * 查询本部门下所有教师手机号
* @param deptId * @param deptId
* @return * @return
*/ */
List<String> getUserIdCardsByDeptId(Long deptId); List<String> getUserPhonesByDeptId(Long deptId);
/** /**
* 查询所有级部id * 查询所有级部id
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationService.java
...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn; ...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.ComperhensiveVo; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.ComperhensiveVo;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.ComprehensiveReq; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.ComprehensiveReq;
...@@ -38,4 +39,11 @@ public interface SchoolTeacherBasichlnformationService extends IService<SchoolT ...@@ -38,4 +39,11 @@ public interface SchoolTeacherBasichlnformationService extends IService<SchoolT
List<SchoolTeacherBasicInformation> importExcel(MultipartFile inputStream) throws IOException; List<SchoolTeacherBasicInformation> importExcel(MultipartFile inputStream) throws IOException;
/**
* 根据手机号查询身份证信息
* @param userPhones
* @return
*/
List<String> selectIdCardsByDdPhone(List<String> userPhones);
} }
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationMapper.xml
...@@ -38,10 +38,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -38,10 +38,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="firstDegree != null "> <if test="firstDegree != null ">
AND CONCAT(IFNULL(first_degree,''),IFNULL(last_degree,'')) LIKE concat('%',#{firstDegree},'%') AND CONCAT(IFNULL(first_degree,''),IFNULL(last_degree,'')) LIKE concat('%',#{firstDegree},'%')
</if> </if>
<if test="idCards != null"> <if test="userPhones != null">
and id_card in and dd_phone in
<foreach item="idCard" collection="idCards" open="(" separator="," close=")"> <foreach item="userPhone" collection="userPhones" open="(" separator="," close=")">
#{idCard} #{userPhone}
</foreach> </foreach>
</if> </if>
</select> </select>
...@@ -107,4 +107,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -107,4 +107,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
<select id="selectIdCardsByDdPhone" parameterType="String" resultType="String">
SELECT DISTINCT
id_card
FROM
school_teacher_basic_information
WHERE
del_flag = '0'
<if test="userPhones != null">
and dd_phone in
<foreach item="userPhone" collection="userPhones" open="(" separator="," close=")">
#{userPhone}
</foreach>
</if>
</select>
</mapper> </mapper>
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXteachingAchievementsMapper.xml
...@@ -177,9 +177,9 @@ ...@@ -177,9 +177,9 @@
OR #{deptId} IN ( SELECT ud.dept_id FROM sys_user_dept ud WHERE ud.user_id = u.user_id ) OR #{deptId} IN ( SELECT ud.dept_id FROM sys_user_dept ud WHERE ud.user_id = u.user_id )
</select> </select>
<select id="getUserIdCardsByDeptId" parameterType="Long" resultType="String"> <select id="getUserPhonesByDeptId" parameterType="Long" resultType="String">
SELECT SELECT
DISTINCT t.id_card DISTINCT t.teacher_tel
FROM FROM
sys_user u sys_user u
LEFT JOIN sys_dept d ON u.dept_id = d.dept_id LEFT JOIN sys_dept d ON u.dept_id = d.dept_id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment