Skip to content

D
dd_school
Commit b84b3d0a by xuwenhao
Options

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

parent b5932690
Showing with 720 additions and 682 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolAnnualAssessment/SchoolAnnualAssessmentController.java
...@@ -22,12 +22,14 @@ import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment ...@@ -22,12 +22,14 @@ import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment
import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessmentExport; import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessmentExport;
import yangtz.cs.liu.campus.service.schoolAnnualAssessment.ISchoolAnnualAssessmentService; import yangtz.cs.liu.campus.service.schoolAnnualAssessment.ISchoolAnnualAssessmentService;
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.schoolAnnualAssessment.SchoolAnnualAssessmentVo; import yangtz.cs.liu.campus.vo.schoolAnnualAssessment.SchoolAnnualAssessmentVo;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo; import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo;
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
...@@ -45,6 +47,8 @@ public class SchoolAnnualAssessmentController extends BaseController { ...@@ -45,6 +47,8 @@ public class SchoolAnnualAssessmentController extends BaseController {
private ISchoolXteachingAchievementsService schoolXteachingAchievementsService; private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
@Autowired @Autowired
private ISysDeptService sysDeptService; private ISysDeptService sysDeptService;
@Autowired
private SchoolTeacherBasichlnformationService basichlnformationService;
/** /**
* 查询年度考核列表 * 查询年度考核列表
...@@ -63,52 +67,30 @@ public class SchoolAnnualAssessmentController extends BaseController { ...@@ -63,52 +67,30 @@ public class SchoolAnnualAssessmentController extends BaseController {
List<SchoolAnnualAssessment> list = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessmentVo); List<SchoolAnnualAssessment> list = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessmentVo);
return getDataTable(list); return getDataTable(list);
} }
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("ndkh_admin")){ //全部权限
startPage(); List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("ndkh_admin")).collect(Collectors.toList());
List<SchoolAnnualAssessment> list = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessmentVo); if (roleList.size() > 0){
return getDataTable(list); startPage();
}else if (role.getRoleKey().equals("jsdnzj_admin")){ List<SchoolAnnualAssessment> list = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessmentVo);
//教师电子档案中级管理员只能查看本部门及部门以下的数据 return getDataTable(list);
// Long deptId = null; }
//根据用户部门id查询用户部门信息 //部分权限
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
//判断用户部门属于科室还是级部 if (roleList1.size() > 0){
//查询所有级部id //教师电子档案中级管理员只能查看本部门及部门以下的数据
// List<Long> jbDeptIds = schoolXteachingAchievementsService.getJbDeptId(); //根据用户部门id查询用户部门信息
// //查询所有科室id SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
// List<Long> ksDeptIds = schoolXteachingAchievementsService.getKsDeptId(); //获取当前登陆人部门下所有人的手机号
// for (Long jbDeptId : jbDeptIds) { List<String> userPhones = schoolXteachingAchievementsService.getUserPhonesByDeptId(sysDept.getDeptId());
// if (sysDept.getAncestors().contains(jbDeptId.toString())){ //根据用户手机号查询用户身份证信息
// deptId = jbDeptId; List<String> userIdCards = basichlnformationService.selectIdCardsByDdPhone(userPhones);
// }else { if (userIdCards.size() > 0){
// String[] split = sysDept.getAncestors().split(","); schoolAnnualAssessmentVo.setIdCards(userIdCards);
// if (split.length == 2){
// deptId = sysDept.getDeptId();
// }
// }
// }
// if (StringUtils.isNull(deptId)){
// for (Long ksDeptId : ksDeptIds) {
// if (sysDept.getAncestors().contains(ksDeptId.toString())){
// deptId = ksDeptId;
// }else {
// String[] split = sysDept.getAncestors().split(",");
// if (split.length == 3){
// deptId = sysDept.getDeptId();
// }
// }
// }
// }
//查询本部门下所有教师的身份证号
List<String> deptUserIds = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolAnnualAssessmentVo.setIdCards(deptUserIds);
}
startPage();
List<SchoolAnnualAssessment> list = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessmentVo);
return getDataTable(list);
} }
startPage();
List<SchoolAnnualAssessment> list = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessmentVo);
return getDataTable(list);
} }
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -141,113 +123,51 @@ public class SchoolAnnualAssessmentController extends BaseController { ...@@ -141,113 +123,51 @@ public class SchoolAnnualAssessmentController extends BaseController {
ExcelUtil<SchoolAnnualAssessmentVo> util = new ExcelUtil<SchoolAnnualAssessmentVo>(SchoolAnnualAssessmentVo.class); ExcelUtil<SchoolAnnualAssessmentVo> util = new ExcelUtil<SchoolAnnualAssessmentVo>(SchoolAnnualAssessmentVo.class);
util.exportExcel(response, exportList, "年度考核数据"); util.exportExcel(response, exportList, "年度考核数据");
} }
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("ndkh_admin")){ //全部权限
List<SchoolAnnualAssessment> list = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessmentVo); List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("ndkh_admin")).collect(Collectors.toList());
List<SchoolAnnualAssessmentVo> exportList = new ArrayList<>(); if (roleList.size() > 0){
for (SchoolAnnualAssessment annualAssessment : list) { List<SchoolAnnualAssessment> list = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessmentVo);
i ++; List<SchoolAnnualAssessmentVo> exportList = new ArrayList<>();
//转vo for (SchoolAnnualAssessment annualAssessment : list) {
SchoolAnnualAssessmentVo schoolAnnualAssessmentVo1 = new SchoolAnnualAssessmentVo(); i ++;
BeanUtils.copyProperties(annualAssessment,schoolAnnualAssessmentVo1); //转vo
schoolAnnualAssessmentVo1.setXh(i); SchoolAnnualAssessmentVo schoolAnnualAssessmentVo1 = new SchoolAnnualAssessmentVo();
exportList.add(schoolAnnualAssessmentVo1); BeanUtils.copyProperties(annualAssessment,schoolAnnualAssessmentVo1);
} schoolAnnualAssessmentVo1.setXh(i);
ExcelUtil<SchoolAnnualAssessmentVo> util = new ExcelUtil<SchoolAnnualAssessmentVo>(SchoolAnnualAssessmentVo.class); exportList.add(schoolAnnualAssessmentVo1);
util.exportExcel(response, exportList, "年度考核数据"); }
}else if (role.getRoleKey().equals("jsdnzj_admin")){ ExcelUtil<SchoolAnnualAssessmentVo> util = new ExcelUtil<SchoolAnnualAssessmentVo>(SchoolAnnualAssessmentVo.class);
//教师电子档案中级管理员只能查看本部门及部门以下的数据 util.exportExcel(response, exportList, "年度考核数据");
// Long deptId = null; }
//根据用户部门id查询用户部门信息 //部分权限
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
//判断用户部门属于科室还是级部 if (roleList1.size() > 0){
//查询所有级部id //教师电子档案中级管理员只能查看本部门及部门以下的数据
// List<Long> jbDeptIds = schoolXteachingAchievementsService.getJbDeptId(); //根据用户部门id查询用户部门信息
// //查询所有科室id SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
// List<Long> ksDeptIds = schoolXteachingAchievementsService.getKsDeptId(); //获取当前登陆人部门下所有人的手机号
// for (Long jbDeptId : jbDeptIds) { List<String> userPhones = schoolXteachingAchievementsService.getUserPhonesByDeptId(sysDept.getDeptId());
// if (sysDept.getAncestors().contains(jbDeptId.toString())){ //根据用户手机号查询用户身份证信息
// deptId = jbDeptId; List<String> userIdCards = basichlnformationService.selectIdCardsByDdPhone(userPhones);
// }else { if (userIdCards.size() > 0){
// String[] split = sysDept.getAncestors().split(","); schoolAnnualAssessmentVo.setIdCards(userIdCards);
// if (split.length == 2){
// deptId = sysDept.getDeptId();
// }
// }
// }
// if (StringUtils.isNull(deptId)){
// for (Long ksDeptId : ksDeptIds) {
// if (sysDept.getAncestors().contains(ksDeptId.toString())){
// deptId = ksDeptId;
// }else {
// String[] split = sysDept.getAncestors().split(",");
// if (split.length == 3){
// deptId = sysDept.getDeptId();
// }
// }
// }
// }
//查询本部门下所有教师的身份证号
List<String> deptUserIds = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolAnnualAssessmentVo.setIdCards(deptUserIds);
}
List<SchoolAnnualAssessment> list = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessmentVo);
List<SchoolAnnualAssessmentVo> exportList = new ArrayList<>();
for (SchoolAnnualAssessment annualAssessment : list) {
i ++;
//转vo
SchoolAnnualAssessmentVo schoolAnnualAssessmentVo1 = new SchoolAnnualAssessmentVo();
BeanUtils.copyProperties(annualAssessment,schoolAnnualAssessmentVo1);
schoolAnnualAssessmentVo1.setXh(i);
exportList.add(schoolAnnualAssessmentVo1);
}
ExcelUtil<SchoolAnnualAssessmentVo> util = new ExcelUtil<SchoolAnnualAssessmentVo>(SchoolAnnualAssessmentVo.class);
util.exportExcel(response, exportList, "年度考核数据");
} }
List<SchoolAnnualAssessment> list = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessmentVo);
List<SchoolAnnualAssessmentVo> exportList = new ArrayList<>();
for (SchoolAnnualAssessment annualAssessment : list) {
i ++;
//转vo
SchoolAnnualAssessmentVo schoolAnnualAssessmentVo1 = new SchoolAnnualAssessmentVo();
BeanUtils.copyProperties(annualAssessment,schoolAnnualAssessmentVo1);
schoolAnnualAssessmentVo1.setXh(i);
exportList.add(schoolAnnualAssessmentVo1);
}
ExcelUtil<SchoolAnnualAssessmentVo> util = new ExcelUtil<SchoolAnnualAssessmentVo>(SchoolAnnualAssessmentVo.class);
util.exportExcel(response, exportList, "年度考核数据");
} }
ExcelUtil<SchoolAnnualAssessmentVo> util = new ExcelUtil<SchoolAnnualAssessmentVo>(SchoolAnnualAssessmentVo.class); ExcelUtil<SchoolAnnualAssessmentVo> util = new ExcelUtil<SchoolAnnualAssessmentVo>(SchoolAnnualAssessmentVo.class);
util.exportExcel(response, new ArrayList<>(), "年度考核数据"); util.exportExcel(response, new ArrayList<>(), "年度考核数据");
// List<SchoolAnnualAssessment> schoolAnnualAssessments = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(new SchoolAnnualAssessment());
// List<SchoolAnnualAssessment> list = new ArrayList<>();
// List<SchoolAnnualAssessmentExport> exportList = new ArrayList<>();
// ExcelUtil<SchoolAnnualAssessmentExport> util = new ExcelUtil<SchoolAnnualAssessmentExport>(SchoolAnnualAssessmentExport.class);
// if (StringUtils.isNotNull(export.getIds())){
// //选中状态导出
// for (Long id : export.getIds()) {
// for (SchoolAnnualAssessment schoolAnnualAssessment : schoolAnnualAssessments) {
// if (id.equals(schoolAnnualAssessment.getId())){
// list.add(schoolAnnualAssessment);
// }
// }
// }
// //复制一份
// list.stream().forEach(date->{
// SchoolAnnualAssessmentExport schoolAnnualAssessmentExport = new SchoolAnnualAssessmentExport();
// BeanUtils.copyProperties(date,schoolAnnualAssessmentExport);
// exportList.add(schoolAnnualAssessmentExport);
// });
// util.exportExcel(response, exportList, "年度考核数据");
// }else if (StringUtils.isNotNull(export.getId())){
// for (SchoolAnnualAssessment schoolAnnualAssessment : schoolAnnualAssessments) {
// if (export.getId().equals(schoolAnnualAssessment.getId())){
// SchoolAnnualAssessmentExport schoolAnnualAssessmentExport = new SchoolAnnualAssessmentExport();
// BeanUtils.copyProperties(schoolAnnualAssessment,schoolAnnualAssessmentExport);
// exportList.add(schoolAnnualAssessmentExport);
// }
// }
// util.exportExcel(response, exportList, "年度考核数据");
// }else {
// SchoolAnnualAssessment schoolAnnualAssessment = new SchoolAnnualAssessment();
// BeanUtils.copyProperties(export,schoolAnnualAssessment);
// List<SchoolAnnualAssessment> schoolAnnualAssessmentList = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessment);
// schoolAnnualAssessmentList.forEach(date->{
// SchoolAnnualAssessmentExport schoolAnnualAssessmentExport = new SchoolAnnualAssessmentExport();
// BeanUtils.copyProperties(date,schoolAnnualAssessmentExport);
// exportList.add(schoolAnnualAssessmentExport);
// });
// util.exportExcel(response, exportList, "年度考核数据");
// }
} }
/* /*
......
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,25 +72,29 @@ public class SchoolAclassTeacherAssessmentController extends BaseController ...@@ -68,25 +72,29 @@ 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());
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); if (rolesList1.size() > 0){
//获取当前登陆人部门下所有人的身份证号 //教师电子档案中级管理员只能看本部门及以下的数据
List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId()); //获取当前登陆人的部门信息
if (deptUserIdCards.size() > 0){ SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
req.setIdCards(deptUserIdCards); //获取当前登陆人部门下所有人的手机号
} List<String> userPhones = schoolXteachingAchievementsService.getUserPhonesByDeptId(sysDept.getDeptId());
startPage(); //根据用户手机号查询用户身份证信息
List<SchoolAclassTeacherAssessmentVo> list = schoolAclassTeacherAssessmentService.selectSchoolAclassTeacherAssessmentList(req); List<String> userIdCards = basichlnformationService.selectIdCardsByDdPhone(userPhones);
return getDataTable(list); if (userIdCards.size() > 0){
req.setIdCards(userIdCards);
} }
startPage();
List<SchoolAclassTeacherAssessmentVo> list = schoolAclassTeacherAssessmentService.selectSchoolAclassTeacherAssessmentList(req);
return getDataTable(list);
} }
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -200,46 +208,45 @@ public class SchoolAclassTeacherAssessmentController extends BaseController ...@@ -200,46 +208,45 @@ 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) {
SchoolAclassTeacherAssessmentExport schoolAclassTeacherAssessmentExport = new SchoolAclassTeacherAssessmentExport(); SchoolAclassTeacherAssessmentExport schoolAclassTeacherAssessmentExport = new SchoolAclassTeacherAssessmentExport();
BeanUtils.copyProperties(schoolAclassTeacherAssessmentVo,schoolAclassTeacherAssessmentExport); BeanUtils.copyProperties(schoolAclassTeacherAssessmentVo,schoolAclassTeacherAssessmentExport);
list.add(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<>(), "老师考核");
} }
ExcelUtil<SchoolAclassTeacherAssessmentExport> util = new ExcelUtil<>(SchoolAclassTeacherAssessmentExport.class);
util.exportExcel(response, list, "老师考核");
}
//本部门权限
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());
//获取当前登陆人部门下所有人的手机号
List<String> userPhones = schoolXteachingAchievementsService.getUserPhonesByDeptId(sysDept.getDeptId());
//根据用户手机号查询用户身份证信息
List<String> userIdCards = basichlnformationService.selectIdCardsByDdPhone(userPhones);
if (userIdCards.size() > 0){
req.setIdCards(userIdCards);
}
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
...@@ -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,25 +71,29 @@ public class SchoolAworkloadController extends BaseController ...@@ -67,25 +71,29 @@ 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());
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); if (roleList1.size() > 0){
//获取当前登陆人部门下所有人的身份证号 //教师电子档案中级管理员只能看本部门及以下的数据
List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId()); //获取当前登陆人的部门信息
if (deptUserIdCards.size() > 0){ SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
schoolAworkloadVo.setIdCards(deptUserIdCards); //获取当前登陆人部门下所有人的手机号
} List<String> userPhones = schoolXteachingAchievementsService.getUserPhonesByDeptId(sysDept.getDeptId());
startPage(); //根据用户手机号查询用户身份证信息
List<SchoolAworkloadVo> list = schoolAworkloadService.selectSchoolAworkloadList(schoolAworkloadVo); List<String> userIdCards = basichlnformationService.selectIdCardsByDdPhone(userPhones);
return getDataTable(list); if (userIdCards.size() > 0){
schoolAworkloadVo.setIdCards(userIdCards);
} }
startPage();
List<SchoolAworkloadVo> list = schoolAworkloadService.selectSchoolAworkloadList(schoolAworkloadVo);
return getDataTable(list);
} }
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -199,47 +207,46 @@ public class SchoolAworkloadController extends BaseController ...@@ -199,47 +207,46 @@ 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());
List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadService.selectAworkloadList(schoolAworkloadVo); if (roleList.size() > 0){
List<SchoolAworkloadDc> list = new ArrayList<>(); List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadService.selectAworkloadList(schoolAworkloadVo);
for (SchoolAworkloadExport aworkloadVo : schoolAworkloadVos) { List<SchoolAworkloadDc> list = new ArrayList<>();
SchoolAworkloadDc schoolAworkloadDc = new SchoolAworkloadDc(); for (SchoolAworkloadExport aworkloadVo : schoolAworkloadVos) {
BeanUtils.copyProperties(aworkloadVo,schoolAworkloadDc); SchoolAworkloadDc schoolAworkloadDc = new SchoolAworkloadDc();
list.add(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<>(), "工作量内容");
} }
ExcelUtil<SchoolAworkloadDc> util = new ExcelUtil<>(SchoolAworkloadDc.class);
util.exportExcel(response, list, "工作量内容");
}
//部分权限
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());
//获取当前登陆人部门下所有人的手机号
List<String> userPhones = schoolXteachingAchievementsService.getUserPhonesByDeptId(sysDept.getDeptId());
//根据用户手机号查询用户身份证信息
List<String> userIdCards = basichlnformationService.selectIdCardsByDdPhone(userPhones);
if (userIdCards.size() > 0){
schoolAworkloadVo.setIdCards(userIdCards);
}
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
...@@ -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,24 +66,27 @@ public class SchoolGkAchievementController extends BaseController ...@@ -65,24 +66,27 @@ 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());
startPage(); if (roleList.size() > 0){
List<SchoolGkAchievementVo> list = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievementVo); startPage();
return getDataTable(list); List<SchoolGkAchievementVo> list = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievementVo);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ return getDataTable(list);
//教师电子档案中级管理员只能查看本部门及部门以下的数据 }
//根据用户部门id查询用户部门信息 //部分权限
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
//查询本部门下所有教师的id if (roleList1.size() > 0){
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId()); //教师电子档案中级管理员只能查看本部门及部门以下的数据
if (deptUserIds.size() > 0){ //根据用户部门id查询用户部门信息
schoolGkAchievementVo.setUserIds(deptUserIds); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
} //查询本部门下所有教师的id
startPage(); List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
List<SchoolGkAchievementVo> list = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievementVo); if (deptUserIds.size() > 0){
return getDataTable(list); schoolGkAchievementVo.setUserIds(deptUserIds);
} }
startPage();
List<SchoolGkAchievementVo> list = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievementVo);
return getDataTable(list);
} }
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -157,29 +161,31 @@ public class SchoolGkAchievementController extends BaseController ...@@ -157,29 +161,31 @@ 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());
List<SchoolGkAchievement> list = schoolGkAchievementService.selectSchoolGkAchievementList(schoolGkAchievementVo); if (roleList.size() > 0){
ExcelUtil<SchoolGkAchievement> util = new ExcelUtil<SchoolGkAchievement>(SchoolGkAchievement.class); List<SchoolGkAchievement> list = schoolGkAchievementService.selectSchoolGkAchievementList(schoolGkAchievementVo);
util.exportExcel(response, list, "高考成绩数据"); ExcelUtil<SchoolGkAchievement> util = new ExcelUtil<SchoolGkAchievement>(SchoolGkAchievement.class);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ util.exportExcel(response, list, "高考成绩数据");
//教师电子档案中级管理员只能查看本部门及部门以下的数据 }
//根据用户部门id查询用户部门信息 //部分权限
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
//查询本部门下所有教师的id if (roleList1.size() > 0){
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId()); //教师电子档案中级管理员只能查看本部门及部门以下的数据
if (deptUserIds.size() > 0){ //根据用户部门id查询用户部门信息
schoolGkAchievementVo.setUserIds(deptUserIds); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
} //查询本部门下所有教师的id
List<SchoolGkAchievement> list = schoolGkAchievementService.selectSchoolGkAchievementList(schoolGkAchievementVo); List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
ExcelUtil<SchoolGkAchievement> util = new ExcelUtil<SchoolGkAchievement>(SchoolGkAchievement.class); if (deptUserIds.size() > 0){
util.exportExcel(response, list, "高考成绩数据"); schoolGkAchievementVo.setUserIds(deptUserIds);
}else {
ExcelUtil<SchoolGkAchievement> util = new ExcelUtil<SchoolGkAchievement>(SchoolGkAchievement.class);
util.exportExcel(response, new ArrayList<>(), "高考成绩数据");
} }
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
...@@ -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,25 +74,28 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -73,25 +74,28 @@ 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")){ //全部权限
startPage(); if(sysRoles.size()>0){
List<SchoolTeacherBasicInformationVo> list = basichlnformationService.list(information); startPage();
return getDataTable(list); List<SchoolTeacherBasicInformationVo> list = basichlnformationService.list(information);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ return getDataTable(list);
//教师电子档案中级管理员只能看本部门及以下的数据 }
//获取当前登陆人的部门信息 //部分权限
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); List<SysRole> sysRoles2 = roles.stream().filter(item -> item.getRoleKey().equals("jsdnzj_admin") ).collect(Collectors.toList());
//获取当前登陆人部门下所有人的身份证号 if(sysRoles2.size()>0){
List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId()); //教师电子档案中级管理员只能看本部门及以下的数据
if (deptUserIdCards.size() > 0){ //获取当前登陆人的部门信息
information.setIdCards(deptUserIdCards); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
} //获取当前登陆人部门下所有人的手机号
startPage(); List<String> userPhones = schoolXteachingAchievementsService.getUserPhonesByDeptId(sysDept.getDeptId());
List<SchoolTeacherBasicInformationVo> list = basichlnformationService.list(information); if (userPhones.size() > 0){
return getDataTable(list); information.setUserPhones(userPhones);
} }
startPage();
List<SchoolTeacherBasicInformationVo> list = basichlnformationService.list(information);
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")){ //全部权限
List<SchoolTeacherBasicInformationVo> list1 = basichlnformationService.list(export); if(sysRoles.size()>0){
ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class); List<SchoolTeacherBasicInformationVo> list1 = basichlnformationService.list(export);
util.exportExcel(response, list1, "教师基本信息"); ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ util.exportExcel(response, list1, "教师基本信息");
//教师电子档案中级管理员只能看本部门及以下的数据 }
//获取当前登陆人的部门信息 //部分权限
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); List<SysRole> sysRoles2 = roles.stream().filter(item -> item.getRoleKey().equals("jsdnzj_admin") ).collect(Collectors.toList());
//获取当前登陆人部门下所有人的身份证号 if(sysRoles2.size()>0){
List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId()); //教师电子档案中级管理员只能看本部门及以下的数据
if (deptUserIdCards.size() > 0){ //获取当前登陆人的部门信息
export.setIdCards(deptUserIdCards); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
} //获取当前登陆人部门下所有人的身份证号
List<SchoolTeacherBasicInformationVo> list1 = basichlnformationService.list(export); List<String> userPhones = schoolXteachingAchievementsService.getUserPhonesByDeptId(sysDept.getDeptId());
ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class); if (userPhones.size() > 0){
util.exportExcel(response, list1, "教师基本信息"); export.setUserPhones(userPhones);
}else {
List<SchoolTeacherBasicInformationVo> list1 = basichlnformationService.list(export);
ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class);
util.exportExcel(response, list1, "教师基本信息");
} }
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,23 +69,26 @@ public class SchoolXacademicWorksController extends BaseController ...@@ -68,23 +69,26 @@ 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());
startPage(); if (roleList.size() > 0){
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo); startPage();
return getDataTable(list); List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ return getDataTable(list);
//教师电子档案中级管理员只能查看本部门及部门以下的数据 }
//根据用户部门id查询用户部门信息 //部分权限
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId()); if (roleList1.size() > 0){
if (deptUserIds.size() > 0){ //教师电子档案中级管理员只能查看本部门及部门以下的数据
schoolXacademicWorksVo.setUserIds(deptUserIds); //根据用户部门id查询用户部门信息
} SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
startPage(); List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo); if (deptUserIds.size() > 0){
return getDataTable(list); schoolXacademicWorksVo.setUserIds(deptUserIds);
} }
startPage();
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
return getDataTable(list);
} }
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -148,37 +152,41 @@ public class SchoolXacademicWorksController extends BaseController ...@@ -148,37 +152,41 @@ 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<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo); List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("lwlz_admin")).collect(Collectors.toList());
for (SchoolXacademicWorksVo xacademicWorksVo : list) { if (roleList.size() > 0){
i ++; List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
xacademicWorksVo.setXh(i); for (SchoolXacademicWorksVo xacademicWorksVo : list) {
xacademicWorksVo.setGrowthType("论文论著"); i ++;
} xacademicWorksVo.setXh(i);
ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class); xacademicWorksVo.setGrowthType("论文论著");
util.exportExcel(response, list, "论文著作数据"); }
}else if (role.getRoleKey().equals("jsdnzj_admin")){ ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class);
//教师电子档案中级管理员只能查看本部门及部门以下的数据 util.exportExcel(response, list, "论文著作数据");
//根据用户部门id查询用户部门信息 }
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); //部分权限
//查询本部门下所有教师的id List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId()); if (roleList1.size() > 0){
if (deptUserIds.size() > 0){ //教师电子档案中级管理员只能查看本部门及部门以下的数据
schoolXacademicWorksVo.setUserIds(deptUserIds); //根据用户部门id查询用户部门信息
} SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo); //查询本部门下所有教师的id
for (SchoolXacademicWorksVo xacademicWorksVo : list) { List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
i ++; if (deptUserIds.size() > 0){
xacademicWorksVo.setXh(i); schoolXacademicWorksVo.setUserIds(deptUserIds);
xacademicWorksVo.setGrowthType("论文论著"); }
} List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class); for (SchoolXacademicWorksVo xacademicWorksVo : list) {
util.exportExcel(response, list, "论文著作数据"); i ++;
}else { xacademicWorksVo.setXh(i);
ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class); xacademicWorksVo.setGrowthType("论文论著");
util.exportExcel(response, new ArrayList<>(), "论文著作数据");
} }
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<>(), "论文著作数据");
} }
} }
} }
......
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,24 +67,27 @@ public class SchoolXcomprehensiveHonorsController extends BaseController ...@@ -66,24 +67,27 @@ 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());
startPage(); if (roleList.size() > 0){
List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo); startPage();
return getDataTable(list); List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ return getDataTable(list);
//教师电子档案中级管理员只能查看本部门及部门以下的数据 }
//根据用户部门id查询用户部门信息 //部分权限
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
//查询本部门下所有教师的id if (roleList1.size() > 0){
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId()); //教师电子档案中级管理员只能查看本部门及部门以下的数据
if (deptUserIds.size() > 0){ //根据用户部门id查询用户部门信息
schoolXcomprehensiveHonorsVo.setUserIds(deptUserIds); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
} //查询本部门下所有教师的id
startPage(); List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo); if (deptUserIds.size() > 0){
return getDataTable(list); schoolXcomprehensiveHonorsVo.setUserIds(deptUserIds);
} }
startPage();
List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
return getDataTable(list);
} }
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -147,37 +151,41 @@ public class SchoolXcomprehensiveHonorsController extends BaseController ...@@ -147,37 +151,41 @@ 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<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo); List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("zhry_admin")).collect(Collectors.toList());
for (SchoolXcomprehensiveHonorsVo xcomprehensiveHonorsVo : list) { if (roleList.size() > 0){
i ++; List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
xcomprehensiveHonorsVo.setXh(i); for (SchoolXcomprehensiveHonorsVo xcomprehensiveHonorsVo : list) {
xcomprehensiveHonorsVo.setGrowthType("综合荣誉"); i ++;
} xcomprehensiveHonorsVo.setXh(i);
ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class); xcomprehensiveHonorsVo.setGrowthType("综合荣誉");
util.exportExcel(response, list, "综合荣誉数据"); }
}else if (role.getRoleKey().equals("jsdnzj_admin")){ ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class);
//教师电子档案中级管理员只能查看本部门及部门以下的数据 util.exportExcel(response, list, "综合荣誉数据");
//根据用户部门id查询用户部门信息 }
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); //部分权限
//查询本部门下所有教师的id List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId()); if (roleList1.size() > 0){
if (deptUserIds.size() > 0){ //教师电子档案中级管理员只能查看本部门及部门以下的数据
schoolXcomprehensiveHonorsVo.setUserIds(deptUserIds); //根据用户部门id查询用户部门信息
} SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo); //查询本部门下所有教师的id
for (SchoolXcomprehensiveHonorsVo xcomprehensiveHonorsVo : list) { List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
i ++; if (deptUserIds.size() > 0){
xcomprehensiveHonorsVo.setXh(i); schoolXcomprehensiveHonorsVo.setUserIds(deptUserIds);
xcomprehensiveHonorsVo.setGrowthType("综合荣誉"); }
} List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class); for (SchoolXcomprehensiveHonorsVo xcomprehensiveHonorsVo : list) {
util.exportExcel(response, list, "综合荣誉数据"); i ++;
}else { xcomprehensiveHonorsVo.setXh(i);
ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class); xcomprehensiveHonorsVo.setGrowthType("综合荣誉");
util.exportExcel(response, new ArrayList<>(), "综合荣誉数据");
} }
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<>(), "综合荣誉数据");
} }
} }
} }
......
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,24 +68,27 @@ public class SchoolXlectureAwardsController extends BaseController ...@@ -67,24 +68,27 @@ 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());
startPage(); if (roleList.size() > 0){
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo); startPage();
return getDataTable(list); List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ return getDataTable(list);
//教师电子档案中级管理员只能查看本部门及部门以下的数据 }
//根据用户部门id查询用户部门信息 //部分权限
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
//查询本部门下所有教师的id if (roleList1.size() > 0){
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId()); //教师电子档案中级管理员只能查看本部门及部门以下的数据
if (deptUserIds.size() > 0){ //根据用户部门id查询用户部门信息
schoolXlectureAwardsVo.setUserIds(deptUserIds); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
} //查询本部门下所有教师的id
startPage(); List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo); if (deptUserIds.size() > 0){
return getDataTable(list); schoolXlectureAwardsVo.setUserIds(deptUserIds);
} }
startPage();
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
return getDataTable(list);
} }
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -148,37 +152,41 @@ public class SchoolXlectureAwardsController extends BaseController ...@@ -148,37 +152,41 @@ 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<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo); List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jkhj_admin")).collect(Collectors.toList());
for (SchoolXlectureAwardsVo xlectureAwardsVo : list) { if (roleList.size() > 0){
i ++; List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
xlectureAwardsVo.setXh(i); for (SchoolXlectureAwardsVo xlectureAwardsVo : list) {
xlectureAwardsVo.setGrowthType("讲课获奖"); i ++;
} xlectureAwardsVo.setXh(i);
ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class); xlectureAwardsVo.setGrowthType("讲课获奖");
util.exportExcel(response, list, "讲课获奖数据"); }
}else if (role.getRoleKey().equals("jsdnzj_admin")){ ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class);
//教师电子档案中级管理员只能查看本部门及部门以下的数据 util.exportExcel(response, list, "讲课获奖数据");
//根据用户部门id查询用户部门信息 }
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); //部分权限
//查询本部门下所有教师的id List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId()); if (roleList1.size() > 0){
if (deptUserIds.size() > 0){ //教师电子档案中级管理员只能查看本部门及部门以下的数据
schoolXlectureAwardsVo.setUserIds(deptUserIds); //根据用户部门id查询用户部门信息
} SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo); //查询本部门下所有教师的id
for (SchoolXlectureAwardsVo xlectureAwardsVo : list) { List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
i ++; if (deptUserIds.size() > 0){
xlectureAwardsVo.setXh(i); schoolXlectureAwardsVo.setUserIds(deptUserIds);
xlectureAwardsVo.setGrowthType("讲课获奖"); }
} List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class); for (SchoolXlectureAwardsVo xlectureAwardsVo : list) {
util.exportExcel(response, list, "讲课获奖数据"); i ++;
}else { xlectureAwardsVo.setXh(i);
ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class); xlectureAwardsVo.setGrowthType("讲课获奖");
util.exportExcel(response, new ArrayList<>(), "讲课获奖数据");
} }
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<>(), "讲课获奖数据");
} }
} }
......
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,24 +63,28 @@ public class SchoolXprojectResearchController extends BaseController { ...@@ -62,24 +63,28 @@ 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")){ //全部权限
startPage(); List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("ktyj_admin")).collect(Collectors.toList());
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo); if (roleList.size() > 0){
return getDataTable(list); startPage();
}else if (role.getRoleKey().equals("jsdnzj_admin")){ List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
//教师电子档案中级管理员只能查看本部门及部门以下的数据 return getDataTable(list);
//根据用户部门id查询用户部门信息 }
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); //部分权限
//查询本部门下所有教师的id List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId()); if (roleList1.size() > 0){
if (deptUserIds.size() > 0){ //教师电子档案中级管理员只能查看本部门及部门以下的数据
schoolXprojectResearchVo.setUserIds(deptUserIds); //根据用户部门id查询用户部门信息
} SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
startPage(); //查询本部门下所有教师的id
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo); List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
return getDataTable(list); if (deptUserIds.size() > 0){
schoolXprojectResearchVo.setUserIds(deptUserIds);
} }
startPage();
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
return getDataTable(list);
} }
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -143,37 +148,41 @@ public class SchoolXprojectResearchController extends BaseController { ...@@ -143,37 +148,41 @@ 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<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo); List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("ktyj_admin")).collect(Collectors.toList());
for (SchoolXprojectResearchVo xprojectResearchVo : list) { if (roleList.size() > 0){
i ++; List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
xprojectResearchVo.setXh(i); for (SchoolXprojectResearchVo xprojectResearchVo : list) {
xprojectResearchVo.setGrowthType("课题研究"); i ++;
} xprojectResearchVo.setXh(i);
ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class); xprojectResearchVo.setGrowthType("课题研究");
util.exportExcel(response, list, "课题研究数据"); }
}else if (role.getRoleKey().equals("jsdnzj_admin")){ ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class);
//教师电子档案中级管理员只能查看本部门及部门以下的数据 util.exportExcel(response, list, "课题研究数据");
//根据用户部门id查询用户部门信息 }
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); //部分权限
//查询本部门下所有教师的id List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId()); if (roleList1.size() > 0){
if (deptUserIds.size() > 0){ //教师电子档案中级管理员只能查看本部门及部门以下的数据
schoolXprojectResearchVo.setUserIds(deptUserIds); //根据用户部门id查询用户部门信息
} SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo); //查询本部门下所有教师的id
for (SchoolXprojectResearchVo xprojectResearchVo : list) { List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
i ++; if (deptUserIds.size() > 0){
xprojectResearchVo.setXh(i); schoolXprojectResearchVo.setUserIds(deptUserIds);
xprojectResearchVo.setGrowthType("课题研究"); }
} List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class); for (SchoolXprojectResearchVo xprojectResearchVo : list) {
util.exportExcel(response, list, "课题研究数据"); i ++;
}else { xprojectResearchVo.setXh(i);
ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class); xprojectResearchVo.setGrowthType("课题研究");
util.exportExcel(response, new ArrayList<>(), "课题研究数据");
} }
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<>(), "课题研究数据");
} }
} }
......
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,24 +68,27 @@ public class SchoolXteacherAwardsController extends BaseController ...@@ -67,24 +68,27 @@ 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());
startPage(); if (roleList.size() > 0){
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo); startPage();
return getDataTable(list); List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ return getDataTable(list);
//教师电子档案中级管理员只能查看本部门及部门以下的数据 }
//根据用户部门id查询用户部门信息 //部分权限
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
//查询本部门下所有教师的id if (roleList1.size() > 0){
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId()); //教师电子档案中级管理员只能查看本部门及部门以下的数据
if (deptUserIds.size() > 0){ //根据用户部门id查询用户部门信息
schoolXteacherAwardsVo.setUserIds(deptUserIds); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
} //查询本部门下所有教师的id
startPage(); List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo); if (deptUserIds.size() > 0){
return getDataTable(list); schoolXteacherAwardsVo.setUserIds(deptUserIds);
} }
startPage();
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
return getDataTable(list);
} }
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -148,37 +152,41 @@ public class SchoolXteacherAwardsController extends BaseController ...@@ -148,37 +152,41 @@ 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<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo); List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jshj_admin")).collect(Collectors.toList());
for (SchoolXteacherAwardsVo xteacherAwardsVo : list) { if (roleList.size() > 0){
i ++; List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
xteacherAwardsVo.setXh(i); for (SchoolXteacherAwardsVo xteacherAwardsVo : list) {
xteacherAwardsVo.setGrowthType("教学获奖"); i ++;
} xteacherAwardsVo.setXh(i);
ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class); xteacherAwardsVo.setGrowthType("教学获奖");
util.exportExcel(response, list, "教师获奖数据"); }
}else if (role.getRoleKey().equals("jsdnzj_admin")){ ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class);
//教师电子档案中级管理员只能查看本部门及部门以下的数据 util.exportExcel(response, list, "教师获奖数据");
//根据用户部门id查询用户部门信息 }
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); //部分权限
//查询本部门下所有教师的id List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId()); if (roleList1.size() > 0){
if (deptUserIds.size() > 0){ //教师电子档案中级管理员只能查看本部门及部门以下的数据
schoolXteacherAwardsVo.setUserIds(deptUserIds); //根据用户部门id查询用户部门信息
} SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo); //查询本部门下所有教师的id
for (SchoolXteacherAwardsVo xteacherAwardsVo : list) { List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
i ++; if (deptUserIds.size() > 0){
xteacherAwardsVo.setXh(i); schoolXteacherAwardsVo.setUserIds(deptUserIds);
xteacherAwardsVo.setGrowthType("教学获奖"); }
} List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class); for (SchoolXteacherAwardsVo xteacherAwardsVo : list) {
util.exportExcel(response, list, "教师获奖数据"); i ++;
}else { xteacherAwardsVo.setXh(i);
ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class); xteacherAwardsVo.setGrowthType("教学获奖");
util.exportExcel(response, new ArrayList<>(), "教师获奖数据");
} }
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<>(), "教师获奖数据");
} }
} }
} }
......
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,18 +72,23 @@ public class SchoolXteachingAchievementsController extends BaseController ...@@ -68,18 +72,23 @@ 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")){ //全部权限
startPage(); List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jxcj_admin")).collect(Collectors.toList());
List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo); if (roleList.size() > 0){
return getDataTable(list); startPage();
}else if (role.getRoleKey().equals("jsdnzj_admin")){ List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
//教师电子档案中级管理员只能查看本部门及部门以下的数据 return getDataTable(list);
}
//部分权限
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查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//判断用户部门属于科室还是级部 //判断用户部门属于科室还是级部
//查询所有级部id //查询所有级部id
// List<Long> jbDeptIds = schoolXteachingAchievementsService.getJbDeptId(); // List<Long> jbDeptIds = schoolXteachingAchievementsService.getJbDeptId();
// //查询所有科室id // //查询所有科室id
// List<Long> ksDeptIds = schoolXteachingAchievementsService.getKsDeptId(); // List<Long> ksDeptIds = schoolXteachingAchievementsService.getKsDeptId();
...@@ -105,15 +114,16 @@ public class SchoolXteachingAchievementsController extends BaseController ...@@ -105,15 +114,16 @@ 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){
startPage(); schoolXteachingAchievementsVo.setIdCards(userIdCards);
List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
return getDataTable(list);
} }
startPage();
List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
return getDataTable(list);
} }
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -141,21 +151,26 @@ public class SchoolXteachingAchievementsController extends BaseController ...@@ -141,21 +151,26 @@ 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<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo); List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jxcj_admin")).collect(Collectors.toList());
for (SchoolXteachingAchievementsVo schoolXteachingAchievementsVo1 : list) { if (roleList.size() > 0){
i ++; List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
schoolXteachingAchievementsVo1.setXh(i); for (SchoolXteachingAchievementsVo schoolXteachingAchievementsVo1 : list) {
} i ++;
ExcelUtil<SchoolXteachingAchievementsVo> util = new ExcelUtil<SchoolXteachingAchievementsVo>(SchoolXteachingAchievementsVo.class); schoolXteachingAchievementsVo1.setXh(i);
util.exportExcel(response, list, "教学成绩数据"); }
}else if (role.getRoleKey().equals("jsdnzj_admin")){ ExcelUtil<SchoolXteachingAchievementsVo> util = new ExcelUtil<SchoolXteachingAchievementsVo>(SchoolXteachingAchievementsVo.class);
//教师电子档案中级管理员只能查看本部门及部门以下的数据 util.exportExcel(response, list, "教学成绩数据");
}
//部分权限
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查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//判断用户部门属于科室还是级部 //判断用户部门属于科室还是级部
// //查询所有级部id // //查询所有级部id
// List<Long> jbDeptIds = schoolXteachingAchievementsService.getJbDeptId(); // List<Long> jbDeptIds = schoolXteachingAchievementsService.getJbDeptId();
// //查询所有科室id // //查询所有科室id
...@@ -182,25 +197,25 @@ public class SchoolXteachingAchievementsController extends BaseController ...@@ -182,25 +197,25 @@ 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){
List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo); schoolXteachingAchievementsVo.setIdCards(userIdCards);
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, "教学成绩数据");
}else {
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
...@@ -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,24 +65,28 @@ public class SchoolXteamAwardController extends BaseController ...@@ -64,24 +65,28 @@ 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")){ //全部权限
startPage(); List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("tdhj_admin")).collect(Collectors.toList());
List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAwardVo); if (roleList.size() > 0){
return getDataTable(list); startPage();
}else if (role.getRoleKey().equals("jsdnzj_admin")){ List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAwardVo);
//教师电子档案中级管理员只能查看本部门及部门以下的数据 return getDataTable(list);
//根据用户部门id查询用户部门信息 }
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); //部分权限
//查询本部门下所有教师的id List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId()); if (roleList1.size() > 0){
if (deptUserIds.size() > 0){ //教师电子档案中级管理员只能查看本部门及部门以下的数据
schoolXteamAwardVo.setUserIds(deptUserIds); //根据用户部门id查询用户部门信息
} SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
startPage(); //查询本部门下所有教师的id
List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAwardVo); List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
return getDataTable(list); if (deptUserIds.size() > 0){
schoolXteamAwardVo.setUserIds(deptUserIds);
} }
startPage();
List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAwardVo);
return getDataTable(list);
} }
return getDataTable(new ArrayList<>()); return getDataTable(new ArrayList<>());
} }
...@@ -117,30 +122,33 @@ public class SchoolXteamAwardController extends BaseController ...@@ -117,30 +122,33 @@ 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<SchoolXteamAward> list = schoolXteamAwardService.selectSchoolXteamAwardList(schoolXteamAwardVo); List<SysRole> roleList = roles.stream().filter(role -> role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("tdhj_admin")).collect(Collectors.toList());
ExcelUtil<SchoolXteamAward> util = new ExcelUtil<SchoolXteamAward>(SchoolXteamAward.class); if (roleList.size() > 0){
util.exportExcel(response, list, "团队获奖数据"); List<SchoolXteamAward> list = schoolXteamAwardService.selectSchoolXteamAwardList(schoolXteamAwardVo);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ ExcelUtil<SchoolXteamAward> util = new ExcelUtil<SchoolXteamAward>(SchoolXteamAward.class);
//教师电子档案中级管理员只能查看本部门及部门以下的数据 util.exportExcel(response, list, "团队获奖数据");
//根据用户部门id查询用户部门信息 }
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); //部分权限
//查询本部门下所有教师的id List<SysRole> roleList1 = roles.stream().filter(role -> role.getRoleKey().equals("jsdnzj_admin")).collect(Collectors.toList());
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId()); if (roleList1.size() > 0){
if (deptUserIds.size() > 0){ //教师电子档案中级管理员只能查看本部门及部门以下的数据
schoolXteamAwardVo.setUserIds(deptUserIds); //根据用户部门id查询用户部门信息
} SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
List<SchoolXteamAward> list = schoolXteamAwardService.selectSchoolXteamAwardList(schoolXteamAwardVo); //查询本部门下所有教师的id
ExcelUtil<SchoolXteamAward> util = new ExcelUtil<SchoolXteamAward>(SchoolXteamAward.class); List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
util.exportExcel(response, list, "团队获奖数据"); if (deptUserIds.size() > 0){
}else { schoolXteamAwardVo.setUserIds(deptUserIds);
ExcelUtil<SchoolXteamAward> util = new ExcelUtil<SchoolXteamAward>(SchoolXteamAward.class);
util.exportExcel(response, new ArrayList<>(), "团队获奖数据");
} }
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/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