Skip to content

D
dd_school
Commit 599c6a10 by xuwenhao
Options

12.21修改教师电子档案

parent 2f6018ae
Showing with 732 additions and 186 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/fudao/FudaoStudentController.java
......@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -55,7 +56,7 @@ public class FudaoStudentController extends BaseController {
return getDataTable(list);
}
for (SysRole role : roles) {
if (role.getRoleKey().equals("fdxshj_admin")){
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("fdxshj_admin")){
startPage();
List<FudaoStudentVo> list = fudaoStudentService.querylist(fudaoStudentVo);
list.forEach(list1 -> {
......@@ -64,26 +65,10 @@ public class FudaoStudentController extends BaseController {
return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
Long deptId = null;
//根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//判断用户部门属于科室还是级部
//查询所有级部id
List<Long> jbDeptIds = schoolXteachingAchievementsService.getJbDeptId();
//查询所有科室id
List<Long> ksDeptIds = schoolXteachingAchievementsService.getKsDeptId();
for (Long jbDeptId : jbDeptIds) {
if (sysDept.getAncestors().contains(jbDeptId.toString())){
deptId = jbDeptId;
}
}
for (Long ksDeptId : ksDeptIds) {
if (sysDept.getAncestors().contains(ksDeptId.toString())){
deptId = ksDeptId;
}
}
//查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(deptId);
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
fudaoStudentVo.setUserids(deptUserIds);
}
......@@ -173,7 +158,7 @@ public class FudaoStudentController extends BaseController {
util.exportExcel(response, list, "辅导学生获奖");
}
for (SysRole role : roles) {
if (role.getRoleKey().equals("fdxshj_admin")){
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("fdxshj_admin")){
List<FudaoStudentVo> list = fudaoStudentService.querylist(fudaoStudentVo);
for (FudaoStudentVo studentVo : list) {
i++;
......@@ -184,26 +169,10 @@ public class FudaoStudentController extends BaseController {
util.exportExcel(response, list, "辅导学生获奖");
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
Long deptId = null;
//根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//判断用户部门属于科室还是级部
//查询所有级部id
List<Long> jbDeptIds = schoolXteachingAchievementsService.getJbDeptId();
//查询所有科室id
List<Long> ksDeptIds = schoolXteachingAchievementsService.getKsDeptId();
for (Long jbDeptId : jbDeptIds) {
if (sysDept.getAncestors().contains(jbDeptId.toString())){
deptId = jbDeptId;
}
}
for (Long ksDeptId : ksDeptIds) {
if (sysDept.getAncestors().contains(ksDeptId.toString())){
deptId = ksDeptId;
}
}
//查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(deptId);
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
fudaoStudentVo.setUserids(deptUserIds);
}
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/fudao/FudaoTeacherController.java
......@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -53,7 +54,7 @@ public class FudaoTeacherController extends BaseController {
return getDataTable(list);
}
for (SysRole role : roles) {
if (role.getRoleKey().equals("fdjshj_admin")){
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("fdjshj_admin")){
startPage();
List<FudaoTeacherVo> list = fudaoTeacherService.querylist(fudaoTeacherVo);
list.forEach(list1 -> {
......@@ -62,26 +63,10 @@ public class FudaoTeacherController extends BaseController {
return getDataTable(list);
} else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
Long deptId = null;
//根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//判断用户部门属于科室还是级部
//查询所有级部id
List<Long> jbDeptIds = schoolXteachingAchievementsService.getJbDeptId();
//查询所有科室id
List<Long> ksDeptIds = schoolXteachingAchievementsService.getKsDeptId();
for (Long jbDeptId : jbDeptIds) {
if (sysDept.getAncestors().contains(jbDeptId.toString())){
deptId = jbDeptId;
}
}
for (Long ksDeptId : ksDeptIds) {
if (sysDept.getAncestors().contains(ksDeptId.toString())){
deptId = ksDeptId;
}
}
//查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(deptId);
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
fudaoTeacherVo.setUserids(deptUserIds);
}
......@@ -154,6 +139,7 @@ public class FudaoTeacherController extends BaseController {
@PostMapping("/export")
public void export(HttpServletResponse response, FudaoTeacherVo fudaoTeacherVo) {
int i = 0;
//过滤未提交的数据
fudaoTeacherVo.setAuditstate("0");
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
......@@ -170,7 +156,7 @@ public class FudaoTeacherController extends BaseController {
util.exportExcel(response, list, "辅导教师获奖");
}
for (SysRole role : roles) {
if (role.getRoleKey().equals("fdjshj_admin")){
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("fdjshj_admin")){
List<FudaoTeacherVo> list = fudaoTeacherService.querylist(fudaoTeacherVo);
for (FudaoTeacherVo teacherVo : list) {
i ++;
......@@ -181,26 +167,10 @@ public class FudaoTeacherController extends BaseController {
util.exportExcel(response, list, "辅导教师获奖");
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
Long deptId = null;
//根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//判断用户部门属于科室还是级部
//查询所有级部id
List<Long> jbDeptIds = schoolXteachingAchievementsService.getJbDeptId();
//查询所有科室id
List<Long> ksDeptIds = schoolXteachingAchievementsService.getKsDeptId();
for (Long jbDeptId : jbDeptIds) {
if (sysDept.getAncestors().contains(jbDeptId.toString())){
deptId = jbDeptId;
}
}
for (Long ksDeptId : ksDeptIds) {
if (sysDept.getAncestors().contains(ksDeptId.toString())){
deptId = ksDeptId;
}
}
//查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(deptId);
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
fudaoTeacherVo.setUserids(deptUserIds);
}
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXacademicWorksController.java
package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysDeptService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -22,7 +28,9 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXacademicWorks;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXacademicWorksService;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXacademicWorksVo;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXlectureAwardsVo;
/**
* 论文著作Controller
......@@ -36,6 +44,10 @@ public class SchoolXacademicWorksController extends BaseController
{
@Autowired
private ISchoolXacademicWorksService schoolXacademicWorksService;
@Autowired
private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
@Autowired
private ISysDeptService sysDeptService;
/**
* 查询论文著作列表
......@@ -44,11 +56,37 @@ public class SchoolXacademicWorksController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SchoolXacademicWorksVo schoolXacademicWorksVo)
{
//查询审核中的数据
//过滤未提交的数据
schoolXacademicWorksVo.setAuditState("0");
startPage();
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
return getDataTable(list);
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()) {
startPage();
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
return getDataTable(list);
}
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("lwlz_admin")){
startPage();
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolXacademicWorksVo.setUserIds(deptUserIds);
}
startPage();
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
return getDataTable(list);
}
}
return getDataTable(new ArrayList<>());
}
/**
......@@ -93,16 +131,54 @@ public class SchoolXacademicWorksController extends BaseController
public void export(HttpServletResponse response, SchoolXacademicWorksVo schoolXacademicWorksVo)
{
int i = 0;
//查询审核中的数据
//过滤未提交的数据
schoolXacademicWorksVo.setAuditState("0");
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
for (SchoolXacademicWorksVo xacademicWorksVo : list) {
i ++;
xacademicWorksVo.setXh(i);
xacademicWorksVo.setGrowthType("论文论著");
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()) {
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
for (SchoolXacademicWorksVo xacademicWorksVo : list) {
i ++;
xacademicWorksVo.setXh(i);
xacademicWorksVo.setGrowthType("论文论著");
}
ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class);
util.exportExcel(response, list, "论文著作数据");
}
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("lwlz_admin")){
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
for (SchoolXacademicWorksVo xacademicWorksVo : list) {
i ++;
xacademicWorksVo.setXh(i);
xacademicWorksVo.setGrowthType("论文论著");
}
ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class);
util.exportExcel(response, list, "论文著作数据");
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolXacademicWorksVo.setUserIds(deptUserIds);
}
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
for (SchoolXacademicWorksVo xacademicWorksVo : list) {
i ++;
xacademicWorksVo.setXh(i);
xacademicWorksVo.setGrowthType("论文论著");
}
ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class);
util.exportExcel(response, list, "论文著作数据");
}
}
ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class);
util.exportExcel(response, list, "论文著作数据");
util.exportExcel(response, new ArrayList<>(), "论文著作数据");
}
/**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXcomprehensiveHonorsController.java
......@@ -8,6 +8,7 @@ import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -66,32 +67,16 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
return getDataTable(list);
}
for (SysRole role : roles) {
if (role.getRoleKey().equals("zhry_admin")){
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("zhry_admin")){
startPage();
List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
Long deptId = null;
//根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//判断用户部门属于科室还是级部
//查询所有级部id
List<Long> jbDeptIds = schoolXteachingAchievementsService.getJbDeptId();
//查询所有科室id
List<Long> ksDeptIds = schoolXteachingAchievementsService.getKsDeptId();
for (Long jbDeptId : jbDeptIds) {
if (sysDept.getAncestors().contains(jbDeptId.toString())){
deptId = jbDeptId;
}
}
for (Long ksDeptId : ksDeptIds) {
if (sysDept.getAncestors().contains(ksDeptId.toString())){
deptId = ksDeptId;
}
}
//查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(deptId);
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolXcomprehensiveHonorsVo.setUserIds(deptUserIds);
}
......@@ -145,16 +130,54 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
public void export(HttpServletResponse response, SchoolXcomprehensiveHonorsVo schoolXcomprehensiveHonorsVo)
{
int i = 0;
//查询审核中的数据
//过滤未提交的数据
schoolXcomprehensiveHonorsVo.setAuditState("0");
List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
for (SchoolXcomprehensiveHonorsVo xcomprehensiveHonorsVo : list) {
i ++;
xcomprehensiveHonorsVo.setXh(i);
xcomprehensiveHonorsVo.setGrowthType("综合荣誉");
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()) {
List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
for (SchoolXcomprehensiveHonorsVo xcomprehensiveHonorsVo : list) {
i ++;
xcomprehensiveHonorsVo.setXh(i);
xcomprehensiveHonorsVo.setGrowthType("综合荣誉");
}
ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class);
util.exportExcel(response, list, "综合荣誉数据");
}
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("zhry_admin")){
List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
for (SchoolXcomprehensiveHonorsVo xcomprehensiveHonorsVo : list) {
i ++;
xcomprehensiveHonorsVo.setXh(i);
xcomprehensiveHonorsVo.setGrowthType("综合荣誉");
}
ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class);
util.exportExcel(response, list, "综合荣誉数据");
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolXcomprehensiveHonorsVo.setUserIds(deptUserIds);
}
List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
for (SchoolXcomprehensiveHonorsVo xcomprehensiveHonorsVo : list) {
i ++;
xcomprehensiveHonorsVo.setXh(i);
xcomprehensiveHonorsVo.setGrowthType("综合荣誉");
}
ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class);
util.exportExcel(response, list, "综合荣誉数据");
}
}
ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class);
util.exportExcel(response, list, "综合荣誉数据");
util.exportExcel(response, new ArrayList<>(), "综合荣誉数据");
}
/**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXlectureAwardsController.java
package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -21,7 +27,9 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXlectureAwards;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXlectureAwardsService;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXlectureAwardsVo;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteacherAwardsVo;
/**
* 讲课获奖Controller
......@@ -35,6 +43,10 @@ public class SchoolXlectureAwardsController extends BaseController
{
@Autowired
private ISchoolXlectureAwardsService schoolXlectureAwardsService;
@Autowired
private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
@Autowired
private ISysDeptService sysDeptService;
/**
* 查询讲课获奖列表
......@@ -43,11 +55,38 @@ public class SchoolXlectureAwardsController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SchoolXlectureAwardsVo schoolXlectureAwardsVo)
{
//查询审核中的数据
//过滤未提交的数据
schoolXlectureAwardsVo.setAuditState("0");
startPage();
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
return getDataTable(list);
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()) {
startPage();
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
return getDataTable(list);
}
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jkhj_admin")){
startPage();
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolXlectureAwardsVo.setUserIds(deptUserIds);
}
startPage();
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
return getDataTable(list);
}
}
return getDataTable(new ArrayList<>());
}
/**
......@@ -92,16 +131,54 @@ public class SchoolXlectureAwardsController extends BaseController
public void export(HttpServletResponse response, SchoolXlectureAwardsVo schoolXlectureAwardsVo)
{
int i = 0;
//查询审核中的数据
//过滤未审核的数据
schoolXlectureAwardsVo.setAuditState("0");
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
for (SchoolXlectureAwardsVo xlectureAwardsVo : list) {
i ++;
xlectureAwardsVo.setXh(i);
xlectureAwardsVo.setGrowthType("讲课获奖");
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()) {
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
for (SchoolXlectureAwardsVo xlectureAwardsVo : list) {
i ++;
xlectureAwardsVo.setXh(i);
xlectureAwardsVo.setGrowthType("讲课获奖");
}
ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class);
util.exportExcel(response, list, "讲课获奖数据");
}
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jkhj_admin")){
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
for (SchoolXlectureAwardsVo xlectureAwardsVo : list) {
i ++;
xlectureAwardsVo.setXh(i);
xlectureAwardsVo.setGrowthType("讲课获奖");
}
ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class);
util.exportExcel(response, list, "讲课获奖数据");
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolXlectureAwardsVo.setUserIds(deptUserIds);
}
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
for (SchoolXlectureAwardsVo xlectureAwardsVo : list) {
i ++;
xlectureAwardsVo.setXh(i);
xlectureAwardsVo.setGrowthType("讲课获奖");
}
ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class);
util.exportExcel(response, list, "讲课获奖数据");
}
}
ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class);
util.exportExcel(response, list, "讲课获奖数据");
util.exportExcel(response, new ArrayList<>(), "讲课获奖数据");
}
/**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXprojectResearchController.java
......@@ -3,19 +3,27 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXprojectResearch;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteacherAwards;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXprojectResearchService;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXacademicWorksVo;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXprojectResearchVo;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -30,6 +38,10 @@ public class SchoolXprojectResearchController extends BaseController {
@Autowired
private ISchoolXprojectResearchService schoolXprojectResearchService;
@Autowired
private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
@Autowired
private ISysDeptService sysDeptService;
/**
* 查询课题研究列表
......@@ -40,9 +52,36 @@ public class SchoolXprojectResearchController extends BaseController {
{
//过滤未提交的数据
schoolXprojectResearchVo.setAuditState("0");
startPage();
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
return getDataTable(list);
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()) {
startPage();
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
return getDataTable(list);
}
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("ktyj_admin")){
startPage();
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolXprojectResearchVo.setUserIds(deptUserIds);
}
startPage();
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
return getDataTable(list);
}
}
return getDataTable(new ArrayList<>());
}
/**
......@@ -89,14 +128,52 @@ public class SchoolXprojectResearchController extends BaseController {
int i = 0;
//过滤未提交的数据
schoolXprojectResearchVo.setAuditState("0");
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
for (SchoolXprojectResearchVo xprojectResearchVo : list) {
i ++;
xprojectResearchVo.setXh(i);
xprojectResearchVo.setGrowthType("课题研究");
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()) {
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
for (SchoolXprojectResearchVo xprojectResearchVo : list) {
i ++;
xprojectResearchVo.setXh(i);
xprojectResearchVo.setGrowthType("课题研究");
}
ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class);
util.exportExcel(response, list, "课题研究数据");
}
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("ktyj_admin")){
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
for (SchoolXprojectResearchVo xprojectResearchVo : list) {
i ++;
xprojectResearchVo.setXh(i);
xprojectResearchVo.setGrowthType("课题研究");
}
ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class);
util.exportExcel(response, list, "课题研究数据");
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolXprojectResearchVo.setUserIds(deptUserIds);
}
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
for (SchoolXprojectResearchVo xprojectResearchVo : list) {
i ++;
xprojectResearchVo.setXh(i);
xprojectResearchVo.setGrowthType("课题研究");
}
ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class);
util.exportExcel(response, list, "课题研究数据");
}
}
ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class);
util.exportExcel(response, list, "课题研究数据");
util.exportExcel(response, new ArrayList<>(), "课题研究数据");
}
/**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteacherAwardsController.java
package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -21,6 +27,8 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteacherAwards;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteacherAwardsService;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXcomprehensiveHonorsVo;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteacherAwardsVo;
/**
......@@ -35,6 +43,10 @@ public class SchoolXteacherAwardsController extends BaseController
{
@Autowired
private ISchoolXteacherAwardsService schoolXteacherAwardsService;
@Autowired
private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
@Autowired
private ISysDeptService sysDeptService;
/**
* 查询教师获奖列表
......@@ -43,11 +55,38 @@ public class SchoolXteacherAwardsController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SchoolXteacherAwardsVo schoolXteacherAwardsVo)
{
//查询审核中的数据
//过滤未提交的数据
schoolXteacherAwardsVo.setAuditState("0");
startPage();
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
return getDataTable(list);
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()) {
startPage();
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
return getDataTable(list);
}
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jshj_admin")){
startPage();
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolXteacherAwardsVo.setUserIds(deptUserIds);
}
startPage();
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
return getDataTable(list);
}
}
return getDataTable(new ArrayList<>());
}
/**
......@@ -92,16 +131,54 @@ public class SchoolXteacherAwardsController extends BaseController
public void export(HttpServletResponse response, SchoolXteacherAwardsVo schoolXteacherAwardsVo)
{
int i = 0;
//查询审核中的数据
//过滤未提交的数据
schoolXteacherAwardsVo.setAuditState("0");
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
for (SchoolXteacherAwardsVo xteacherAwardsVo : list) {
i ++;
xteacherAwardsVo.setXh(i);
xteacherAwardsVo.setGrowthType("教学获奖");
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()) {
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
for (SchoolXteacherAwardsVo xteacherAwardsVo : list) {
i ++;
xteacherAwardsVo.setXh(i);
xteacherAwardsVo.setGrowthType("教学获奖");
}
ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class);
util.exportExcel(response, list, "教师获奖数据");
}
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jshj_admin")){
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
for (SchoolXteacherAwardsVo xteacherAwardsVo : list) {
i ++;
xteacherAwardsVo.setXh(i);
xteacherAwardsVo.setGrowthType("教学获奖");
}
ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class);
util.exportExcel(response, list, "教师获奖数据");
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolXteacherAwardsVo.setUserIds(deptUserIds);
}
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
for (SchoolXteacherAwardsVo xteacherAwardsVo : list) {
i ++;
xteacherAwardsVo.setXh(i);
xteacherAwardsVo.setGrowthType("教学获奖");
}
ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class);
util.exportExcel(response, list, "教师获奖数据");
}
}
ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class);
util.exportExcel(response, list, "教师获奖数据");
util.exportExcel(response, new ArrayList<>(), "教师获奖数据");
}
/**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolAnnualAssessment/SchoolAnnualAssessmentMapper.java
......@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.mapper.schoolAnnualAssessment;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
import yangtz.cs.liu.campus.vo.schoolAnnualAssessment.SchoolAnnualAssessmentVo;
import java.util.List;
......@@ -24,10 +25,10 @@ public interface SchoolAnnualAssessmentMapper extends BaseMapper<SchoolAnnualAss
/**
* 查询年度考核列表
*
* @param schoolAnnualAssessment 年度考核
* @param schoolAnnualAssessmentVo 年度考核
* @return 年度考核集合
*/
public List<SchoolAnnualAssessment> selectSchoolAnnualAssessmentList(SchoolAnnualAssessment schoolAnnualAssessment);
public List<SchoolAnnualAssessment> selectSchoolAnnualAssessmentList(SchoolAnnualAssessmentVo schoolAnnualAssessmentVo);
/**
* 新增年度考核
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolXteachingAchievementsMapper.java
......@@ -75,6 +75,13 @@ public interface SchoolXteachingAchievementsMapper extends BaseMapper<SchoolXtea
List<Long> getUserIdsByDeptId(@Param("deptId") Long deptId);
/**
* 查询本部门下所有教师身份证号
* @param deptId
* @return
*/
List<String> getUserIdCardsByDeptId(@Param("deptId") Long deptId);
/**
* 查询所有级部id
* @return
*/
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolAnnualAssessment/SchoolAnnualAssessmentServiceImpl.java
......@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
import yangtz.cs.liu.campus.mapper.schoolAnnualAssessment.SchoolAnnualAssessmentMapper;
import yangtz.cs.liu.campus.service.schoolAnnualAssessment.ISchoolAnnualAssessmentService;
import yangtz.cs.liu.campus.vo.schoolAnnualAssessment.SchoolAnnualAssessmentVo;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
......@@ -50,13 +51,13 @@ public class SchoolAnnualAssessmentServiceImpl extends ServiceImpl<SchoolAnnualA
/**
* 查询年度考核列表
*
* @param schoolAnnualAssessment 年度考核
* @param schoolAnnualAssessmentVo 年度考核
* @return 年度考核
*/
@Override
public List<SchoolAnnualAssessment> selectSchoolAnnualAssessmentList(SchoolAnnualAssessment schoolAnnualAssessment)
public List<SchoolAnnualAssessment> selectSchoolAnnualAssessmentList(SchoolAnnualAssessmentVo schoolAnnualAssessmentVo)
{
return schoolAnnualAssessmentMapper.selectSchoolAnnualAssessmentList(schoolAnnualAssessment);
return schoolAnnualAssessmentMapper.selectSchoolAnnualAssessmentList(schoolAnnualAssessmentVo);
}
/**
......@@ -147,36 +148,37 @@ public class SchoolAnnualAssessmentServiceImpl extends ServiceImpl<SchoolAnnualA
if (schoolAnnualAssessment.getYear().toString().length() != 4){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、年度输入错误,请您重新输入! ");
}
for (int i = 0; i < 4; i++) {
if (!Character.isDigit(schoolAnnualAssessment.getYear().toString().charAt(i))){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、年度输入错误,请您重新输入! ");
break;
}
}
if(schoolAnnualAssessment.getIdCard().length() == 18){
//校验前十七位是否为数字
for (int i = 0; i < 17; i++) {
if (!Character.isDigit(schoolAnnualAssessment.getIdCard().charAt(i))){
}else {
for (int i = 0; i < 4; i++) {
if (!Character.isDigit(schoolAnnualAssessment.getYear().toString().charAt(i))){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、身份证号输入错误,请您重新输入! ");
failureMsg.append("<br/>" + failureNum + "、年度输入错误,请您重新输入! ");
break;
}
}
}
String checkResult1 = "";
//判断考核结果是否输入正确
for (SysDictData sysDictData : checkResult) {
if (schoolAnnualAssessment.getCheckResult().equals(sysDictData.getDictLabel())){
checkResult1 = sysDictData.getDictValue();
if(schoolAnnualAssessment.getIdCard().length() == 18){
//校验前十七位是否为数字
for (int i = 0; i < 17; i++) {
if (!Character.isDigit(schoolAnnualAssessment.getIdCard().charAt(i))){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、身份证号输入错误,请您重新输入! ");
break;
}
}
}
String checkResult1 = "";
//判断考核结果是否输入正确
for (SysDictData sysDictData : checkResult) {
if (schoolAnnualAssessment.getCheckResult().equals(sysDictData.getDictLabel())){
checkResult1 = sysDictData.getDictValue();
}
}
if (StringUtils.isEmpty(checkResult1)){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、考核结果输入错误,请您重新输入! ");
}else {
schoolAnnualAssessment.setCheckResult(checkResult1);
}
}
if (StringUtils.isEmpty(checkResult1)){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、考核结果输入错误,请您重新输入! ");
}else {
schoolAnnualAssessment.setCheckResult(checkResult1);
}
}
}
......@@ -195,7 +197,7 @@ public class SchoolAnnualAssessmentServiceImpl extends ServiceImpl<SchoolAnnualA
public String importData(List<SchoolAnnualAssessment> list) {
//判断数据是否为更新或新增
//查询年度考核所有数据
List<SchoolAnnualAssessment> schoolAnnualAssessmentList = schoolAnnualAssessmentMapper.selectSchoolAnnualAssessmentList(new SchoolAnnualAssessment());
List<SchoolAnnualAssessment> schoolAnnualAssessmentList = schoolAnnualAssessmentMapper.selectSchoolAnnualAssessmentList(new SchoolAnnualAssessmentVo());
for (SchoolAnnualAssessment schoolAnnualAssessment : list) {
//根据年度、姓名、身份证、去查询是否有记录，有则更新，无则新增
for (SchoolAnnualAssessment annualAssessment : schoolAnnualAssessmentList) {
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationServicelmpl.java
......@@ -40,6 +40,7 @@ import yangtz.cs.liu.campus.service.impl.teacherFiles.IdCardNumberUtils;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.SchoolTeacherBasichlnformationService;
import yangtz.cs.liu.campus.vo.fudao.FudaoStudentVo;
import yangtz.cs.liu.campus.vo.fudao.FudaoTeacherVo;
import yangtz.cs.liu.campus.vo.schoolAnnualAssessment.SchoolAnnualAssessmentVo;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.*;
import java.io.*;
......@@ -1078,7 +1079,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
comperhensiveVo.setFudaoStudent(querylist1);
//7 年度考核
SchoolAnnualAssessment schoolAnnualAssessment = new SchoolAnnualAssessment();
SchoolAnnualAssessmentVo schoolAnnualAssessment = new SchoolAnnualAssessmentVo();
schoolAnnualAssessment.setIdCard(basicInformation.getIdCard());
List<SchoolAnnualAssessment> schoolAnnualAssessments = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessment);
comperhensiveVo.setSchoolAnnualAssessment(schoolAnnualAssessments);
......@@ -1246,7 +1247,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
comperhensiveVo.setFudaoStudent(querylist1);
//7 年度考核
SchoolAnnualAssessment schoolAnnualAssessment = new SchoolAnnualAssessment();
SchoolAnnualAssessmentVo schoolAnnualAssessment = new SchoolAnnualAssessmentVo();
schoolAnnualAssessment.setIdCard(basicInformation.getIdCard());
List<SchoolAnnualAssessment> schoolAnnualAssessments = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessment);
comperhensiveVo.setSchoolAnnualAssessment(schoolAnnualAssessments);
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolAnnualAssessment/ISchoolAnnualAssessmentService.java
......@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.service.schoolAnnualAssessment;
import com.baomidou.mybatisplus.extension.service.IService;
import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
import yangtz.cs.liu.campus.vo.schoolAnnualAssessment.SchoolAnnualAssessmentVo;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
......@@ -26,10 +27,10 @@ public interface ISchoolAnnualAssessmentService extends IService<SchoolAnnualAss
/**
* 查询年度考核列表
*
* @param schoolAnnualAssessment 年度考核
* @param schoolAnnualAssessmentVo 年度考核
* @return 年度考核集合
*/
public List<SchoolAnnualAssessment> selectSchoolAnnualAssessmentList(SchoolAnnualAssessment schoolAnnualAssessment);
public List<SchoolAnnualAssessment> selectSchoolAnnualAssessmentList(SchoolAnnualAssessmentVo schoolAnnualAssessmentVo);
/**
* 新增年度考核
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolXteachingAchievementsService.java
......@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.SysUser;
import org.apache.ibatis.annotations.Param;
import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteachingAchievements;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo;
......@@ -99,6 +100,13 @@ public interface ISchoolXteachingAchievementsService extends IService<SchoolXtea
List<Long> getUserIdsByDeptId(Long deptId);
/**
* 查询本部门下所有教师身份证号
* @param deptId
* @return
*/
List<String> getUserIdCardsByDeptId(Long deptId);
/**
* 查询所有级部id
* @return
*/
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolAnnualAssessment/SchoolAnnualAssessmentVo.java 0 → 100644
package yangtz.cs.liu.campus.vo.schoolAnnualAssessment;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
public class SchoolAnnualAssessmentVo {
/** 主键id */
private Long id;
@Excel(name = "序号")
private Integer xh;
/** 姓名 */
@Excel(name = "姓名")
private String name;
/** 年度 */
@Excel(name = "年度",combo = {"2018","2019","2020","2021","2022","2023","2024","2025","2026","2027","2028","2029","2030","2031","2032","2033"})
private Integer year;
/** 身份证号集合 */
private List<String> idCards;
/** 身份证 */
private String idCard;
/** 考核结果(1优秀、2合格、3不定等次、4不予考核、5不合格) */
@Excel(name = "考核结果", readConverterExp = "1=优秀,2=合格,3=不定等次,4=不予考核,5=不合格", combo = {"优秀","合格","不定等次","不予考核","不合格"})
private String checkResult;
/** 备注 */
@Excel(name = "备注")
private String remark;
/** 创建者 */
private String createBy;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 更新者 */
private String updateBy;
/** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/** 删除状态 */
private String delFlag;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolNewTeacherDzdn/SchoolXacademicWorksVo.java
......@@ -7,6 +7,7 @@ import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
public class SchoolXacademicWorksVo
......@@ -45,6 +46,9 @@ public class SchoolXacademicWorksVo
@Excel(name = "论文论著-成果名称")
private String resultName;
/** 获奖人id集合 */
private List<Long> userIds;
/** 获奖人id */
private Long userId;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolNewTeacherDzdn/SchoolXlectureAwardsVo.java
......@@ -7,6 +7,7 @@ import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
public class SchoolXlectureAwardsVo
......@@ -45,6 +46,9 @@ public class SchoolXlectureAwardsVo
@Excel(name = "讲课获奖-成果名称")
private String resultName;
/** 获奖人id集合 */
private List<Long> userIds;
/** 获奖人id */
private Long userId;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolNewTeacherDzdn/SchoolXprojectResearchVo.java
......@@ -7,6 +7,7 @@ import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
public class SchoolXprojectResearchVo {
......@@ -45,6 +46,9 @@ public class SchoolXprojectResearchVo {
@Excel(name = "课题研究-成果名称")
private String resultName;
/** 获奖人id集合 */
private List<Long> userIds;
/** 获奖人id */
private Long userId;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolNewTeacherDzdn/SchoolXteacherAwardsVo.java
......@@ -7,6 +7,7 @@ import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
public class SchoolXteacherAwardsVo
......@@ -47,6 +48,9 @@ public class SchoolXteacherAwardsVo
@Excel(name = "教学获奖-成果名称")
private String resultName;
/** 获奖人id集合 */
private List<Long> userIds;
/** 获奖人id */
private Long userId;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolNewTeacherDzdn/SchoolXteachingAchievementsVo.java
......@@ -8,6 +8,7 @@ import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@Data
public class SchoolXteachingAchievementsVo {
......@@ -53,6 +54,9 @@ public class SchoolXteachingAchievementsVo {
@Excel(name = "姓名")
private String userName;
/** 身份证号集合 */
private List<String> idCards;
/** 身份证号 */
private String idCard;
......
smart-campus/src/main/resources/mapper/fudao/FudaoStudentMapper.xml
......@@ -90,8 +90,8 @@
<if test="awardtype != null">#{awardtype},</if>
<if test="awardrank != null">#{awardrank},</if>
<if test="awardlevel != null">#{awardlevel},</if>
<if test="auditstate != null">#{auditstate},</if>
<if test="resultname !=null">#{resultname},</if>
<if test="auditstate != null">#{auditstate},</if>
<if test="guidanceteacher != null">#{guidanceteacher},</if>
<if test="userid != null">#{userid},</if>
<if test="username != null">#{username},</if>
......
smart-campus/src/main/resources/mapper/schoolAnnualAssessment/SchoolAnnualAssessmentMapper.xml
......@@ -22,7 +22,7 @@
select id, year, name, id_card, check_result, remark, create_by, create_Time, update_by, update_time, del_flag from school_annual_assessment
</sql>
<select id="selectSchoolAnnualAssessmentList" parameterType="SchoolAnnualAssessment" resultMap="SchoolAnnualAssessmentResult">
<select id="selectSchoolAnnualAssessmentList" parameterType="yangtz.cs.liu.campus.vo.schoolAnnualAssessment.SchoolAnnualAssessmentVo" resultMap="SchoolAnnualAssessmentResult">
<include refid="selectSchoolAnnualAssessmentVo"/>
<where>
del_flag = '0'
......@@ -35,6 +35,12 @@
<if test="createTime != null "> and create_time = #{createTime}</if>
<if test="updateBy != null and updateBy != ''"> and update_by = #{updateBy}</if>
<if test="updateTime != null"> and update_time = #{updateTime}</if>
<if test="idCards != null">
and id_card in
<foreach item="idCard" collection="idCards" open="(" separator="," close=")">
#{idCard}
</foreach>
</if>
</where>
order by create_time DESC
</select>
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXacademicWorksMapper.xml
......@@ -48,6 +48,12 @@
<if test="pictureUrl != null and pictureUrl != ''"> and picture_url = #{pictureUrl}</if>
<if test="auditState != null and auditState != ''"> and audit_state != #{auditState}</if>
<if test="startTime != null and endTime != null "> and award_time BETWEEN #{startTime} AND #{endTime}</if>
<if test="userIds != null">
and user_id in
<foreach item="userId" collection="userIds" open="(" separator="," close=")">
#{userId}
</foreach>
</if>
</where>
order by create_time DESC
</select>
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXlectureAwardsMapper.xml
......@@ -48,6 +48,12 @@
<if test="pictureUrl != null and pictureUrl != ''"> and picture_url = #{pictureUrl}</if>
<if test="auditState != null and auditState != ''"> and audit_state != #{auditState}</if>
<if test="startTime != null and endTime != null "> and award_time BETWEEN #{startTime} AND #{endTime}</if>
<if test="userIds != null">
and user_id in
<foreach item="userId" collection="userIds" open="(" separator="," close=")">
#{userId}
</foreach>
</if>
</where>
order by create_time DESC
</select>
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXprojectResearchMapper.xml
......@@ -47,6 +47,12 @@
<if test="pictureUrl != null and pictureUrl != ''"> and picture_url = #{pictureUrl}</if>
<if test="auditState != null and auditState != ''"> and audit_state != #{auditState}</if>
<if test="startTime != null and endTime != null "> and award_time BETWEEN #{startTime} AND #{endTime}</if>
<if test="userIds != null">
and user_id in
<foreach item="userId" collection="userIds" open="(" separator="," close=")">
#{userId}
</foreach>
</if>
</where>
order by create_time DESC
</select>
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXteacherAwardsMapper.xml
......@@ -48,6 +48,12 @@
<if test="pictureUrl != null and pictureUrl != ''"> and picture_url = #{pictureUrl}</if>
<if test="auditState != null and auditState != ''"> and audit_state != #{auditState}</if>
<if test="startTime != null and endTime != null "> and award_time BETWEEN #{startTime} AND #{endTime}</if>
<if test="userIds != null">
and user_id in
<foreach item="userId" collection="userIds" open="(" separator="," close=")">
#{userId}
</foreach>
</if>
</where>
order by create_time DESC
</select>
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXteachingAchievementsMapper.xml
......@@ -49,6 +49,12 @@
<if test="classType != null and classType != ''"> and class_type = #{classType}</if>
<if test="assessmentScore != null "> and assessment_score = #{assessmentScore}</if>
<if test="startTime != null and endTime != null "> and exam_time BETWEEN #{startTime} AND #{endTime}</if>
<if test="idCards != null">
and id_card in
<foreach item="idCard" collection="idCards" open="(" separator="," close=")">
#{idCard}
</foreach>
</if>
</where>
order by create_time DESC
</select>
......@@ -158,12 +164,28 @@
<select id="getUserIdsByDeptId" parameterType="Long" resultType="Long">
SELECT
u.user_id
DISTINCT u.user_id
FROM
sys_user u
LEFT JOIN sys_dept d ON u.dept_id = d.dept_id
LEFT JOIN school_teacher t ON t.id = u.user_id
WHERE
u.del_flag = '0'
u.del_flag = '0' AND d.del_flag = '0' AND t.del_flag = '0'
AND (
u.dept_id = #{deptId}
OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set( #{deptId}, ancestors ) ))
OR #{deptId} IN ( SELECT ud.dept_id FROM sys_user_dept ud WHERE ud.user_id = u.user_id )
</select>
<select id="getUserIdCardsByDeptId" parameterType="Long" resultType="String">
SELECT
DISTINCT t.id_card
FROM
sys_user u
LEFT JOIN sys_dept d ON u.dept_id = d.dept_id
LEFT JOIN school_teacher t ON t.id = u.user_id
WHERE
u.del_flag = '0' AND d.del_flag = '0' AND t.del_flag = '0'
AND (
u.dept_id = #{deptId}
OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set( #{deptId}, ancestors ) ))
......
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