Skip to content

D
dd_school
Commit 51052b32 by xuwenhao
Options

12.22修改教师电子档案

parent c43023c0
Showing with 829 additions and 139 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentController.java
......@@ -4,9 +4,15 @@ import java.io.*;
import java.util.ArrayList;
import java.util.List;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDeptService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -22,10 +28,9 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessment;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentReq;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentVo;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.*;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAclassTeacherAssessmentService;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
import javax.servlet.http.HttpServletResponse;
......@@ -42,6 +47,10 @@ public class SchoolAclassTeacherAssessmentController extends BaseController
@Autowired
private ISchoolAclassTeacherAssessmentService schoolAclassTeacherAssessmentService;
private Logger log = LoggerFactory.getLogger(SchoolAworkloadController.class);
@Autowired
private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
@Autowired
private ISysDeptService sysDeptService;
/**
* 查询班主任考核列表
......@@ -49,10 +58,38 @@ public class SchoolAclassTeacherAssessmentController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SchoolAclassTeacherAssessmentReq req)
{
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()){
startPage();
List<SchoolAclassTeacherAssessmentVo> list = schoolAclassTeacherAssessmentService.selectSchoolAclassTeacherAssessmentList(req);
return getDataTable(list);
}
for (SysRole role : roles) {
//教师电子档案超级管理员和班主任考核管理员可以看全部数据
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("bzrkh_admin")){
startPage();
List<SchoolAclassTeacherAssessmentVo> list = schoolAclassTeacherAssessmentService.selectSchoolAclassTeacherAssessmentList(req);
return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能看本部门及以下的数据
//获取当前登陆人的部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//获取当前登陆人部门下所有人的身份证号
List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
if (deptUserIdCards.size() > 0){
req.setIdCards(deptUserIdCards);
}
startPage();
List<SchoolAclassTeacherAssessmentVo> list = schoolAclassTeacherAssessmentService.selectSchoolAclassTeacherAssessmentList(req);
return getDataTable(list);
}
}
return getDataTable(new ArrayList<>());
}
/**
......@@ -147,9 +184,59 @@ public class SchoolAclassTeacherAssessmentController extends BaseController
*/
@PostMapping("/export")
public void export(HttpServletResponse response, SchoolAclassTeacherAssessmentReq req ) throws Exception{
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()){
List<SchoolAclassTeacherAssessment> schoolAclassTeacherAssessmentVos = schoolAclassTeacherAssessmentService.selectSchoolList(req);
List<SchoolAclassTeacherAssessmentExport> list = new ArrayList<>();
for (SchoolAclassTeacherAssessment schoolAclassTeacherAssessmentVo : schoolAclassTeacherAssessmentVos) {
SchoolAclassTeacherAssessmentExport schoolAclassTeacherAssessmentExport = new SchoolAclassTeacherAssessmentExport();
BeanUtils.copyProperties(schoolAclassTeacherAssessmentVo,schoolAclassTeacherAssessmentExport);
list.add(schoolAclassTeacherAssessmentExport);
}
ExcelUtil<SchoolAclassTeacherAssessmentExport> util = new ExcelUtil<>(SchoolAclassTeacherAssessmentExport.class);
util.exportExcel(response, list, "老师考核");
}else {
for (SysRole role : roles) {
//教师电子档案超级管理员和班主任考核管理员可以看全部数据
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("bzrkh_admin")){
List<SchoolAclassTeacherAssessment> schoolAclassTeacherAssessmentVos = schoolAclassTeacherAssessmentService.selectSchoolList(req);
List<SchoolAclassTeacherAssessmentExport> list = new ArrayList<>();
for (SchoolAclassTeacherAssessment schoolAclassTeacherAssessmentVo : schoolAclassTeacherAssessmentVos) {
SchoolAclassTeacherAssessmentExport schoolAclassTeacherAssessmentExport = new SchoolAclassTeacherAssessmentExport();
BeanUtils.copyProperties(schoolAclassTeacherAssessmentVo,schoolAclassTeacherAssessmentExport);
list.add(schoolAclassTeacherAssessmentExport);
}
ExcelUtil<SchoolAclassTeacherAssessmentExport> util = new ExcelUtil<>(SchoolAclassTeacherAssessmentExport.class);
util.exportExcel(response, list, "老师考核");
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能看本部门及以下的数据
//获取当前登陆人的部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//获取当前登陆人部门下所有人的身份证号
List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
if (deptUserIdCards.size() > 0){
req.setIdCards(deptUserIdCards);
}
List<SchoolAclassTeacherAssessment> schoolAclassTeacherAssessmentVos = schoolAclassTeacherAssessmentService.selectSchoolList(req);
ExcelUtil<SchoolAclassTeacherAssessment> util = new ExcelUtil<>(SchoolAclassTeacherAssessment.class);
util.exportExcel(response, schoolAclassTeacherAssessmentVos, "老师考核");
List<SchoolAclassTeacherAssessmentExport> list = new ArrayList<>();
for (SchoolAclassTeacherAssessment schoolAclassTeacherAssessmentVo : schoolAclassTeacherAssessmentVos) {
SchoolAclassTeacherAssessmentExport schoolAclassTeacherAssessmentExport = new SchoolAclassTeacherAssessmentExport();
BeanUtils.copyProperties(schoolAclassTeacherAssessmentVo,schoolAclassTeacherAssessmentExport);
list.add(schoolAclassTeacherAssessmentExport);
}
ExcelUtil<SchoolAclassTeacherAssessmentExport> util = new ExcelUtil<>(SchoolAclassTeacherAssessmentExport.class);
util.exportExcel(response, list, "老师考核");
}else {
ExcelUtil<SchoolAclassTeacherAssessmentExport> util = new ExcelUtil<>(SchoolAclassTeacherAssessmentExport.class);
util.exportExcel(response, new ArrayList<>(), "老师考核");
}
}
}
}
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolAworkloadController.java
......@@ -5,7 +5,12 @@ import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDeptService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
......@@ -24,10 +29,9 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkload;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadExport;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.*;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAworkloadService;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
/**
* 工作量信息Controller
......@@ -42,16 +46,48 @@ public class SchoolAworkloadController extends BaseController
@Autowired
private ISchoolAworkloadService schoolAworkloadService;
private Logger log = LoggerFactory.getLogger(SchoolAworkloadController.class);
@Autowired
private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
@Autowired
private ISysDeptService sysDeptService;
/**
* 查询工作量信息列表
*/
@GetMapping("/list")
public TableDataInfo list(SchoolAworkload schoolAworkload)
public TableDataInfo list(SchoolAworkloadVo schoolAworkloadVo)
{
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()){
startPage();
List<SchoolAworkloadVo> list = schoolAworkloadService.selectSchoolAworkloadList(schoolAworkloadVo);
return getDataTable(list);
}
for (SysRole role : roles) {
//教师电子档案超级管理员和工作量信息管理员可以看全部数据
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("gzl_admin")){
startPage();
List<SchoolAworkloadVo> list = schoolAworkloadService.selectSchoolAworkloadList(schoolAworkload);
List<SchoolAworkloadVo> list = schoolAworkloadService.selectSchoolAworkloadList(schoolAworkloadVo);
return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能看本部门及以下的数据
//获取当前登陆人的部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//获取当前登陆人部门下所有人的身份证号
List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
if (deptUserIdCards.size() > 0){
schoolAworkloadVo.setIdCards(deptUserIdCards);
}
startPage();
List<SchoolAworkloadVo> list = schoolAworkloadService.selectSchoolAworkloadList(schoolAworkloadVo);
return getDataTable(list);
}
}
return getDataTable(new ArrayList<>());
}
......@@ -146,10 +182,60 @@ public class SchoolAworkloadController extends BaseController
* @return
*/
@PostMapping("/export")
public void export(HttpServletResponse response, SchoolAworkload schoolAworkload ) throws Exception{
List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadService.selectAworkloadList(schoolAworkload);
ExcelUtil<SchoolAworkloadExport> util = new ExcelUtil<>(SchoolAworkloadExport.class);
util.exportExcel(response, schoolAworkloadVos, "工作量内容");
public void export(HttpServletResponse response, SchoolAworkloadVo schoolAworkloadVo ) throws Exception{
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()){
List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadService.selectAworkloadList(schoolAworkloadVo);
List<SchoolAworkloadDc> list = new ArrayList<>();
for (SchoolAworkloadExport aworkloadVo : schoolAworkloadVos) {
SchoolAworkloadDc schoolAworkloadDc = new SchoolAworkloadDc();
BeanUtils.copyProperties(aworkloadVo,schoolAworkloadDc);
list.add(schoolAworkloadDc);
}
ExcelUtil<SchoolAworkloadDc> util = new ExcelUtil<>(SchoolAworkloadDc.class);
util.exportExcel(response, list, "工作量内容");
}else {
for (SysRole role : roles) {
//教师电子档案超级管理员和教师基础信息管理员可以看全部数据
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("gzl_admin")){
List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadService.selectAworkloadList(schoolAworkloadVo);
List<SchoolAworkloadDc> list = new ArrayList<>();
for (SchoolAworkloadExport aworkloadVo : schoolAworkloadVos) {
SchoolAworkloadDc schoolAworkloadDc = new SchoolAworkloadDc();
BeanUtils.copyProperties(aworkloadVo,schoolAworkloadDc);
list.add(schoolAworkloadDc);
}
ExcelUtil<SchoolAworkloadDc> util = new ExcelUtil<>(SchoolAworkloadDc.class);
util.exportExcel(response, list, "工作量内容");
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能看本部门及以下的数据
//获取当前登陆人的部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//获取当前登陆人部门下所有人的身份证号
List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
if (deptUserIdCards.size() > 0){
schoolAworkloadVo.setIdCards(deptUserIdCards);
}
List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadService.selectAworkloadList(schoolAworkloadVo);
List<SchoolAworkloadDc> list = new ArrayList<>();
for (SchoolAworkloadExport aworkloadVo : schoolAworkloadVos) {
SchoolAworkloadDc schoolAworkloadDc = new SchoolAworkloadDc();
BeanUtils.copyProperties(aworkloadVo,schoolAworkloadDc);
list.add(schoolAworkloadDc);
}
ExcelUtil<SchoolAworkloadDc> util = new ExcelUtil<>(SchoolAworkloadDc.class);
util.exportExcel(response, list, "工作量内容");
}else {
ExcelUtil<SchoolAworkloadDc> util = new ExcelUtil<>(SchoolAworkloadDc.class);
util.exportExcel(response, new ArrayList<>(), "工作量内容");
}
}
}
}
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolGkAchievementController.java
package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -24,6 +29,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolGkAchievement;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolGkAchievementVo;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolGkAchievementService;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXcomprehensiveHonorsVo;
/**
* 高考成绩Controller
......@@ -37,16 +44,47 @@ public class SchoolGkAchievementController extends BaseController
{
@Autowired
private ISchoolGkAchievementService schoolGkAchievementService;
@Autowired
private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
@Autowired
private ISysDeptService sysDeptService;
/**
* 查询高考成绩列表
*/
@GetMapping("/list")
public TableDataInfo list(SchoolGkAchievement schoolGkAchievement)
public TableDataInfo list(SchoolGkAchievementVo schoolGkAchievementVo)
{
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()) {
startPage();
List<SchoolGkAchievementVo> list = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievementVo);
return getDataTable(list);
}
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("gkcj_admin")){
startPage();
List<SchoolGkAchievementVo> list = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievement);
List<SchoolGkAchievementVo> list = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievementVo);
return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolGkAchievementVo.setUserIds(deptUserIds);
}
startPage();
List<SchoolGkAchievementVo> list = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievementVo);
return getDataTable(list);
}
}
return getDataTable(new ArrayList<>());
}
......@@ -55,9 +93,9 @@ public class SchoolGkAchievementController extends BaseController
*/
@GetMapping("/teacher/list")
public TableDataInfo teacherList(SchoolGkAchievement schoolGkAchievement){
public TableDataInfo teacherList(SchoolGkAchievementVo schoolGkAchievementVo){
startPage();
List<SchoolGkAchievement> list = schoolGkAchievementService.selectSchoolGkAchievementList(schoolGkAchievement);
List<SchoolGkAchievement> list = schoolGkAchievementService.selectSchoolGkAchievementList(schoolGkAchievementVo);
return getDataTable(list);
}
......@@ -107,10 +145,41 @@ public class SchoolGkAchievementController extends BaseController
*/
@Log(title = "高考成绩", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchoolGkAchievement schoolGkAchievement)
public void export(HttpServletResponse response, SchoolGkAchievementVo schoolGkAchievementVo)
{
List<SchoolGkAchievement> list = schoolGkAchievementService.selectSchoolGkAchievementList(schoolGkAchievement);
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()) {
List<SchoolGkAchievement> list = schoolGkAchievementService.selectSchoolGkAchievementList(schoolGkAchievementVo);
ExcelUtil<SchoolGkAchievement> util = new ExcelUtil<SchoolGkAchievement>(SchoolGkAchievement.class);
util.exportExcel(response, list, "高考成绩数据");
}else {
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("gkcj_admin")){
List<SchoolGkAchievement> list = schoolGkAchievementService.selectSchoolGkAchievementList(schoolGkAchievementVo);
ExcelUtil<SchoolGkAchievement> util = new ExcelUtil<SchoolGkAchievement>(SchoolGkAchievement.class);
util.exportExcel(response, list, "高考成绩数据");
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolGkAchievementVo.setUserIds(deptUserIds);
}
List<SchoolGkAchievement> list = schoolGkAchievementService.selectSchoolGkAchievementList(schoolGkAchievementVo);
ExcelUtil<SchoolGkAchievement> util = new ExcelUtil<SchoolGkAchievement>(SchoolGkAchievement.class);
util.exportExcel(response, list, "高考成绩数据");
}else {
ExcelUtil<SchoolGkAchievement> util = new ExcelUtil<SchoolGkAchievement>(SchoolGkAchievement.class);
util.exportExcel(response, new ArrayList<>(), "高考成绩数据");
}
}
}
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationController.java
......@@ -9,10 +9,15 @@ import com.itextpdf.text.pdf.PdfPTable;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.pdf.PDFUtil;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.impl.SysDictDataServiceImpl;
import org.slf4j.Logger;
......@@ -24,6 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.*;
import yangtz.cs.liu.campus.service.impl.teacherFiles.IdCardNumberUtils;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.SchoolTeacherBasichlnformationService;
import yangtz.cs.liu.campus.vo.fudao.FudaoStudentVo;
import yangtz.cs.liu.campus.vo.fudao.FudaoTeacherVo;
......@@ -45,6 +51,10 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
@Autowired
private SysDictDataServiceImpl sysDictDataService;
@Autowired
private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
@Autowired
private ISysDeptService sysDeptService;
/**
* 获取老师基本信息列表
......@@ -53,9 +63,37 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
*/
@GetMapping("/list")
public TableDataInfo list(SchoolTeacherBasicInformationVo information) throws Exception{
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()){
startPage();
List<SchoolTeacherBasicInformationVo> list = basichlnformationService.list(information);
return getDataTable(list);
}
for (SysRole role : roles) {
//教师电子档案超级管理员和教师基础信息管理员可以看全部数据
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jsjcxj_admin")){
startPage();
List<SchoolTeacherBasicInformationVo> list = basichlnformationService.list(information);
return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能看本部门及以下的数据
//获取当前登陆人的部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//获取当前登陆人部门下所有人的身份证号
List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
if (deptUserIdCards.size() > 0){
information.setIdCards(deptUserIdCards);
}
startPage();
List<SchoolTeacherBasicInformationVo> list = basichlnformationService.list(information);
return getDataTable(list);
}
}
return getDataTable(new ArrayList<>());
}
/**
......@@ -167,16 +205,51 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
*/
@PostMapping("/export")
public void export(HttpServletResponse response, SchoolTeacherBasicInformationVo export ) throws Exception{
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()){
List<SchoolTeacherBasicInformationVo> list1 = basichlnformationService.list(export);
ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class);
util.exportExcel(response, list1, "教师基本信息");
}else{
for (SysRole role : roles) {
//教师电子档案超级管理员和教师基础信息管理员可以看全部数据
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jsjcxj_admin")){
List<SchoolTeacherBasicInformationVo> list1 = basichlnformationService.list(export);
ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class);
util.exportExcel(response, list1, "教师基本信息");
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能看本部门及以下的数据
//获取当前登陆人的部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//获取当前登陆人部门下所有人的身份证号
List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
if (deptUserIdCards.size() > 0){
export.setIdCards(deptUserIdCards);
}
List<SchoolTeacherBasicInformationVo> list1 = basichlnformationService.list(export);
ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class);
// //查询出来结果复制
util.exportExcel(response, list1, "教师基本信息");
}else {
List<SchoolTeacherBasicInformationVo> list1 = basichlnformationService.list(export);
// list1.forEach(date->{
// SchoolTeacherBasiclnExport schoolTeacherBasiclnExport = new SchoolTeacherBasiclnExport();
// BeanUtils.copyProperties(date,schoolTeacherBasiclnExport);
// exportList.add(schoolTeacherBasiclnExport);
// });
ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class);
util.exportExcel(response, list1, "教师基本信息");
}
}
}
// ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class);
//// //查询出来结果复制
// List<SchoolTeacherBasicInformationVo> list1 = basichlnformationService.list(export);
//// list1.forEach(date->{
//// SchoolTeacherBasiclnExport schoolTeacherBasiclnExport = new SchoolTeacherBasiclnExport();
//// BeanUtils.copyProperties(date,schoolTeacherBasiclnExport);
//// exportList.add(schoolTeacherBasiclnExport);
//// });
// util.exportExcel(response, list1, "教师基本信息");
}
/*
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXacademicWorksController.java
......@@ -147,7 +147,7 @@ public class SchoolXacademicWorksController extends BaseController
}
ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class);
util.exportExcel(response, list, "论文著作数据");
}
}else {
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("lwlz_admin")){
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
......@@ -175,11 +175,13 @@ public class SchoolXacademicWorksController extends BaseController
}
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
......@@ -146,7 +146,7 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
}
ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class);
util.exportExcel(response, list, "综合荣誉数据");
}
}else {
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("zhry_admin")){
List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
......@@ -174,11 +174,13 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
}
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
......@@ -147,7 +147,7 @@ public class SchoolXlectureAwardsController extends BaseController
}
ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class);
util.exportExcel(response, list, "讲课获奖数据");
}
}else {
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jkhj_admin")){
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
......@@ -175,11 +175,14 @@ public class SchoolXlectureAwardsController extends BaseController
}
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
......@@ -142,7 +142,7 @@ public class SchoolXprojectResearchController extends BaseController {
}
ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class);
util.exportExcel(response, list, "课题研究数据");
}
}else {
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("ktyj_admin")){
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
......@@ -170,11 +170,14 @@ public class SchoolXprojectResearchController extends BaseController {
}
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
......@@ -147,7 +147,7 @@ public class SchoolXteacherAwardsController extends BaseController
}
ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class);
util.exportExcel(response, list, "教师获奖数据");
}
}else {
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jshj_admin")){
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
......@@ -175,11 +175,13 @@ public class SchoolXteacherAwardsController extends BaseController
}
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
......@@ -106,9 +106,9 @@ public class SchoolXteachingAchievementsController extends BaseController
// }
// }
//查询本部门下所有教师的身份证号
List<String> deptUserIds = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolXteachingAchievementsVo.setIdCards(deptUserIds);
List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
if (deptUserIdCards.size() > 0){
schoolXteachingAchievementsVo.setIdCards(deptUserIdCards);
}
startPage();
List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
......@@ -140,7 +140,7 @@ public class SchoolXteachingAchievementsController extends BaseController
}
ExcelUtil<SchoolXteachingAchievementsVo> util = new ExcelUtil<SchoolXteachingAchievementsVo>(SchoolXteachingAchievementsVo.class);
util.exportExcel(response, list, "教学成绩数据");
}
}else {
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jxcj_admin")){
List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
......@@ -183,9 +183,9 @@ public class SchoolXteachingAchievementsController extends BaseController
// }
// }
//查询本部门下所有教师的身份证号
List<String> deptUserIds = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolXteachingAchievementsVo.setIdCards(deptUserIds);
List<String> deptUserIdCards = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
if (deptUserIdCards.size() > 0){
schoolXteachingAchievementsVo.setIdCards(deptUserIdCards);
}
List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
for (SchoolXteachingAchievementsVo schoolXteachingAchievementsVo1 : list) {
......@@ -194,11 +194,14 @@ public class SchoolXteachingAchievementsController extends BaseController
}
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
package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -19,8 +24,10 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolGkAchievementVo;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteamAward;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteamAwardVo;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteamAwardService;
/**
......@@ -35,28 +42,61 @@ public class SchoolXteamAwardController extends BaseController
{
@Autowired
private ISchoolXteamAwardService schoolXteamAwardService;
@Autowired
private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
@Autowired
private ISysDeptService sysDeptService;
/**
* 查询团队获奖列表
*/
@GetMapping("/list")
public TableDataInfo list(SchoolXteamAward schoolXteamAward)
public TableDataInfo list(SchoolXteamAwardVo schoolXteamAwardVo)
{
schoolXteamAwardVo.setNoAuditState("0");
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()) {
startPage();
List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAwardVo);
return getDataTable(list);
}
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("tdhj_admin")){
startPage();
schoolXteamAward.setNoAuditState("0");
List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAward);
List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAwardVo);
return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolXteamAwardVo.setUserIds(deptUserIds);
}
startPage();
List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAwardVo);
return getDataTable(list);
}
}
return getDataTable(new ArrayList<>());
}
/**
* 团队获奖个人页面查询
*/
@GetMapping("/personlist")
public TableDataInfo personlist(SchoolXteamAward schoolXteamAward)
public TableDataInfo personlist(SchoolXteamAwardVo schoolXteamAwardVo)
{
startPage();
List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAward);
List<SchoolXteamAwardVo> list = schoolXteamAwardService.selectSchoolXteamAwardVoList(schoolXteamAwardVo);
return getDataTable(list);
}
......@@ -65,11 +105,42 @@ public class SchoolXteamAwardController extends BaseController
*/
@Log(title = "团队获奖", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchoolXteamAward schoolXteamAward)
public void export(HttpServletResponse response, SchoolXteamAwardVo schoolXteamAwardVo)
{
List<SchoolXteamAward> list = schoolXteamAwardService.selectSchoolXteamAwardList(schoolXteamAward);
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()) {
List<SchoolXteamAward> list = schoolXteamAwardService.selectSchoolXteamAwardList(schoolXteamAwardVo);
ExcelUtil<SchoolXteamAward> util = new ExcelUtil<SchoolXteamAward>(SchoolXteamAward.class);
util.exportExcel(response, list, "团队获奖数据");
}else {
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("tdhj_admin")){
List<SchoolXteamAward> list = schoolXteamAwardService.selectSchoolXteamAwardList(schoolXteamAwardVo);
ExcelUtil<SchoolXteamAward> util = new ExcelUtil<SchoolXteamAward>(SchoolXteamAward.class);
util.exportExcel(response, list, "团队获奖数据");
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolXteamAwardVo.setUserIds(deptUserIds);
}
List<SchoolXteamAward> list = schoolXteamAwardService.selectSchoolXteamAwardList(schoolXteamAwardVo);
ExcelUtil<SchoolXteamAward> util = new ExcelUtil<SchoolXteamAward>(SchoolXteamAward.class);
util.exportExcel(response, list, "团队获奖数据");
}else {
ExcelUtil<SchoolXteamAward> util = new ExcelUtil<SchoolXteamAward>(SchoolXteamAward.class);
util.exportExcel(response, new ArrayList<>(), "团队获奖数据");
}
}
}
}
/**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentExport.java 0 → 100644
package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class SchoolAclassTeacherAssessmentExport extends BaseEntity
{
/** 主键id */
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/** 学期(下拉框) */
@Excel(name = "学期",combo = {"第一学期","第二学期"},readConverterExp = "1=第一学期,2=第二学期")
private String semester;
/** 届别(下拉框) */
@Excel(name = "届别")
private String year;
/** 学年(下拉框) */
@Excel(name = "学年")
private String schoolYear;
/** 年级(下拉框) */
@Excel(name = "年级",combo = {"高一","高二","高三"},readConverterExp = "1=高一,2=高二,3=高三")
private String grade;
/** 班级(下拉框) */
@Excel(name = "班级",readConverterExp="1=1,2=2,3=3,4=4,5=5,6=6,7=7,8=8,9=9,10=10,11=11,12=12,13=13,14=14,15=15,16=16,17=17,18=18,19=19,20=20,21=21,22=22,23=23,24=24,25=25,26=26,27=27,28=28,29=29,30=30,31=31,32=32,33=33,34=34,35=35,36=36,37=37,38=38,39=39,40=40")
private String className;
/** 教师姓名 */
@Excel(name = "教师姓名")
private String teacherName;
/** 身份证号 */
@Excel(name = "身份证号")
private String idCard;
/** 德育考核成绩 */
@Excel(name = "德育考核成绩")
private BigDecimal moralEduCheckAchievement;
/** 智育考核成绩 */
@Excel(name = "智育考核成绩")
private BigDecimal intellEduCheckAchievement;
/** 总考核成绩 */
@Excel(name = "总考核成绩")
private BigDecimal totalCheckAchievement;
/** 班级类型(下拉框) */
@Excel(name = "班级类型")
private String classType;
/** 学科(下拉框) */
@Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
private String sub;
/** 备注*/
@Excel(name = "备注")
private String remark;
/** 删除状态 */
private String delFlag;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentReq.java
......@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
* 请求对象
......@@ -28,6 +29,9 @@ public class SchoolAclassTeacherAssessmentReq extends BaseEntity
/** 学年(下拉框) */
private String schoolYear;
/** 身份证号集合 */
private List<String> idCards;
/** 身份证号 */
private String idCard;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkloadDc.java 0 → 100644
package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class SchoolAworkloadDc extends BaseEntity {
/** 主键id */
private Long id;
/** 学年(下拉框) */
@Excel(name = "学年")
private String schoolYear;
/** 学期(下拉框) */
@Excel(name = "学期",combo = {"第一学期","第二学期"},readConverterExp = "1=第一学期,2=第二学期")
private String semester;
/** 届别(下拉框) */
@Excel(name = "届别")
private String year;
/** 年级(下拉框) */
@Excel(name = "年级",combo = {"高一","高二","高三"},readConverterExp = "1=高一,2=高二,3=高三")
private String grade;
/** 姓名 */
@Excel(name = "姓名")
private String name;
/** 学科(下拉框) */
@Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
private String sub;
/** 身份证号 */
@Excel(name = "身份证号")
private String idCard;
/** 聘任岗位(下拉框) */
@Excel(name = "聘任岗位",combo = {"专职教师岗","兼职教师岗","教辅岗","学管员岗","待聘岗","其它"},
readConverterExp = "1=专职教师岗,2=兼职教师岗,3=教辅岗,4=学管员岗,5=待聘岗,6=其它")
private String appointmentPost;
/** 聘任职务 */
@Excel(name = "聘任职务")
private String appointmentPosition;
/** 聘任情况(下拉框) */
@Excel(name = "聘任情况",combo = {"高聘","正常","低聘","落聘","其他"},readConverterExp = "1=高聘,2=正常,3=低聘,4=落聘,5=其他")
private String appointmentSituation;
/** 班级 */
@Excel(name = "班级",prompt="多个，中间用英文“,”间隔")
private String className;
/** 班级类型 */
@Excel(name = "班级类型")
private String classType;
/** 早读 */
@Excel(name = "早读")
private BigDecimal earlyReading;
/** 正课 */
@Excel(name = "正课")
private BigDecimal requiredCourses;
/** 晚自习 */
@Excel(name = "晚自习")
private BigDecimal eveningSelfStudy;
/**合计*/
@Excel(name = "合计")
private BigDecimal amountTo;
/** 证明人id */
private Long userId;
/** 证明人 */
@Excel(name = "证明人")
private String userName;
@Excel(name = "备注")
private String remark;
/** 删除状态 */
private String delFlag;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkloadVo.java
......@@ -5,6 +5,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
* 工作量信息对象 school_aworkload
......@@ -38,6 +39,12 @@ public class SchoolAworkloadVo extends BaseEntity
/** 学科(下拉框) */
private String sub;
/** 身份证号集合 */
private List<String> idCards;
/** 身份证号 */
private String idCard;
/** 聘任岗位(下拉框) */
private String appointmentPost;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolGkAchievementVo.java
......@@ -6,6 +6,8 @@ import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import java.util.List;
/**
* 高考成绩对象 school_gk_achievement
*
......@@ -29,6 +31,12 @@ public class SchoolGkAchievementVo extends BaseEntity
/** 教师姓名 */
private String teacherName;
/**老师id**/
private Long userId;
/** 获奖人id集合 */
private List<Long> userIds;
/** 授课班级 */
private String teachingClassName;
......@@ -55,6 +63,7 @@ public class SchoolGkAchievementVo extends BaseEntity
* 审核状态
*/
private String auditState;
private String noAuditState;
/** 删除状态 */
private String delFlag;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasicInformation.java
......@@ -48,7 +48,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
* 档案出生日期 (年月)
*/
@Excel(name = "档案出生日期")
// @JsonFormat(pattern = "yyyy-MM")
@JsonFormat(pattern = "yyyy-MM")
private Date fileBirthDate;
......@@ -85,7 +85,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
* 入党时间（年月）
*/
@Excel(name = "入党时间")
// @JsonFormat(pattern = "yyyy-MM")
@JsonFormat(pattern = "yyyy-MM")
private Date partyMembershipTime;
/**
......@@ -221,7 +221,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
* 毕业时间1 年月
*/
@Excel(name = "毕业时间1")
// @JsonFormat(pattern = "yyyy-MM")
@JsonFormat(pattern = "yyyy-MM")
private Date graduationTime1;
/**
......@@ -240,7 +240,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
* 毕业时间2年月
*/
@Excel(name = "毕业时间2")
// @JsonFormat(pattern = "yyyy-MM")
@JsonFormat(pattern = "yyyy-MM")
private Date graduationTime2;
/**
......@@ -259,7 +259,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
* 毕业时间3 年月
*/
@Excel(name = "毕业时间3")
// @JsonFormat(pattern = "yyyy-MM")
@JsonFormat(pattern = "yyyy-MM")
private Date graduationTime3;
/**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasicInformationVo.java
......@@ -8,6 +8,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* 教师电子档案 老师基础信息
......@@ -26,6 +27,9 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity {
@Excel(name = "姓名")
private String name;
/** 身份证号集合 */
private List<String> idCards;
/**
* 身份证号
*/
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXteachingAchievements.java
......@@ -25,12 +25,14 @@ public class SchoolXteachingAchievements
private Long id;
/** 学年(下拉框) */
@Excel(name = "学年",combo = {"2018-2019","2019-2020","2020-2021","2021-2022","2022-2023","2023-2024","2024-2025","2025-2026",
"2026-2027","2027-2028","2028-2029","2029-2030","2030-2031","2031-2032","2032-2033"})
// @Excel(name = "学年",combo = {"2018-2019","2019-2020","2020-2021","2021-2022","2022-2023","2023-2024","2024-2025","2025-2026",
// "2026-2027","2027-2028","2028-2029","2029-2030","2030-2031","2031-2032","2032-2033"})
@Excel(name = "学年")
private String schoolYear;
/** 学期（下拉框） */
@Excel(name = "学期",combo = {"第一学期","第二学期"}, readConverterExp = "1=第一学期,2=第二学期")
// @Excel(name = "学期",combo = {"第一学期","第二学期"}, readConverterExp = "1=第一学期,2=第二学期")
@Excel(name = "学期")
private String semester;
/** 考试时间（年月日） */
......@@ -39,16 +41,19 @@ public class SchoolXteachingAchievements
private Date examTime;
/** 考试类型（下拉框） */
@Excel(name = "考试类型",combo = {"月考","期中","期末","一模","二模","三模","高考","其它"},
readConverterExp = "1=月考,2=期中,3=期末,4=一模,5=二模,6=三模,7=高考,8=其它")
// @Excel(name = "考试类型",combo = {"月考","期中","期末","一模","二模","三模","高考","其它"},
// readConverterExp = "1=月考,2=期中,3=期末,4=一模,5=二模,6=三模,7=高考,8=其它")
@Excel(name = "考试类型")
private String examType;
/** 届别(下拉框) */
@Excel(name = "届别", combo = {"2018","2019","2020","2021","2022","2023","2024","2025","2026","2027","2028","2029","2030","2031","2032","2033"})
// @Excel(name = "届别", combo = {"2018","2019","2020","2021","2022","2023","2024","2025","2026","2027","2028","2029","2030","2031","2032","2033"})
@Excel(name = "届别")
private String year;
/** 年级（下拉框） */
@Excel(name = "年级", combo = {"高一","高二","高三"},readConverterExp = "1=高一,2=高二,3=高三")
// @Excel(name = "年级", combo = {"高一","高二","高三"},readConverterExp = "1=高一,2=高二,3=高三")
@Excel(name = "年级")
private String grade;
/** 用户id */
......@@ -63,8 +68,9 @@ public class SchoolXteachingAchievements
private String idCard;
/** 学科 */
@Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
// @Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
// readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
@Excel(name = "学科")
private String sub;
/** 班级 */
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXteamAwardVo.java
......@@ -6,6 +6,8 @@ import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import java.util.List;
/**
* 团队获奖对象 school_xteam_award
*
......@@ -42,7 +44,11 @@ public class SchoolXteamAwardVo extends BaseEntity
/** 审核状态（0未提交，1审核中，2同意，3驳回） */
private String auditState;
private String noAuditState;
/** 删除状态 */
private String delFlag;
/**用户id集合 */
private List<Long> userIds;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolAworkloadMapper.java
......@@ -26,12 +26,12 @@ public interface SchoolAworkloadMapper extends BaseMapper<SchoolAworkload>
/**
* 查询工作量信息列表
*
* @param schoolAworkload 工作量信息
* @param schoolAworkloadVo 工作量信息
* @return 工作量信息集合
*/
public List<SchoolAworkloadVo> selectSchoolAworkloadList(SchoolAworkload schoolAworkload);
public List<SchoolAworkloadVo> selectSchoolAworkloadList(SchoolAworkloadVo schoolAworkloadVo);
public List<SchoolAworkloadExport> selectAworkloadList(SchoolAworkload schoolAworkload);
public List<SchoolAworkloadExport> selectAworkloadList(SchoolAworkloadVo schoolAworkloadVo);
/**
* 新增工作量信息
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolGkAchievementMapper.java
......@@ -25,11 +25,11 @@ public interface SchoolGkAchievementMapper extends BaseMapper<SchoolGkAchievem
/**
* 查询高考成绩列表
*
* @param schoolGkAchievement 高考成绩
* @param schoolGkAchievementVo 高考成绩
* @return 高考成绩集合
*/
public List<SchoolGkAchievementVo> selectSchoolGkAchievementVoList(SchoolGkAchievement schoolGkAchievement);
public List<SchoolGkAchievement> selectSchoolGkAchievementList(SchoolGkAchievement schoolGkAchievement);
public List<SchoolGkAchievementVo> selectSchoolGkAchievementVoList(SchoolGkAchievementVo schoolGkAchievementVo);
public List<SchoolGkAchievement> selectSchoolGkAchievementList(SchoolGkAchievementVo schoolGkAchievementVo);
/**
* 新增高考成绩
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolXteamAwardMapper.java
......@@ -26,11 +26,11 @@ public interface SchoolXteamAwardMapper extends BaseMapper<SchoolXteamAward>
/**
* 查询团队获奖列表
*
* @param schoolXteamAward 团队获奖
* @param schoolXteamAwardVo 团队获奖
* @return 团队获奖集合
*/
public List<SchoolXteamAward> selectSchoolXteamAwardList(SchoolXteamAward schoolXteamAward);
public List<SchoolXteamAwardVo> selectSchoolXteamAwardVoList(SchoolXteamAward schoolXteamAward);
public List<SchoolXteamAward> selectSchoolXteamAwardList(SchoolXteamAwardVo schoolXteamAwardVo);
public List<SchoolXteamAwardVo> selectSchoolXteamAwardVoList(SchoolXteamAwardVo schoolXteamAwardVo);
/**
* 新增团队获奖
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolAnnualAssessment/SchoolAnnualAssessmentServiceImpl.java
......@@ -197,17 +197,17 @@ public class SchoolAnnualAssessmentServiceImpl extends ServiceImpl<SchoolAnnualA
public String importData(List<SchoolAnnualAssessment> list) {
//判断数据是否为更新或新增
//查询年度考核所有数据
List<SchoolAnnualAssessment> schoolAnnualAssessmentList = schoolAnnualAssessmentMapper.selectSchoolAnnualAssessmentList(new SchoolAnnualAssessmentVo());
for (SchoolAnnualAssessment schoolAnnualAssessment : list) {
//根据年度、姓名、身份证、去查询是否有记录，有则更新，无则新增
for (SchoolAnnualAssessment annualAssessment : schoolAnnualAssessmentList) {
if (schoolAnnualAssessment.getYear().equals(annualAssessment.getYear()) &&
schoolAnnualAssessment.getName().equals(annualAssessment.getName()) &&
schoolAnnualAssessment.getIdCard().equals(annualAssessment.getIdCard())){
schoolAnnualAssessment.setId(annualAssessment.getId());
}
}
}
// List<SchoolAnnualAssessment> schoolAnnualAssessmentList = schoolAnnualAssessmentMapper.selectSchoolAnnualAssessmentList(new SchoolAnnualAssessmentVo());
// for (SchoolAnnualAssessment schoolAnnualAssessment : list) {
// //根据年度、姓名、身份证、去查询是否有记录，有则更新，无则新增
// for (SchoolAnnualAssessment annualAssessment : schoolAnnualAssessmentList) {
// if (schoolAnnualAssessment.getYear().equals(annualAssessment.getYear()) &&
// schoolAnnualAssessment.getName().equals(annualAssessment.getName()) &&
// schoolAnnualAssessment.getIdCard().equals(annualAssessment.getIdCard())){
// schoolAnnualAssessment.setId(annualAssessment.getId());
// }
// }
// }
StringBuilder successMsg = new StringBuilder();
//批量导入年度考核数据
boolean b = saveOrUpdateBatch(list);
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentServiceImpl.java
......@@ -59,7 +59,7 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School
public String dataCheck(List<SchoolAclassTeacherAssessment> list){
StringBuffer sb = new StringBuffer();
SchoolCheckVo schoolCheckVo = null;
Integer index =1;
Integer index =0;
for (SchoolAclassTeacherAssessment date :list) {
index++;
//非空验证
......@@ -83,7 +83,7 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School
//年纪
if (StringUtils.isEmpty(date.getGrade())) {
sb.append(index+"、年纪字段不能为空");
sb.append(index+"、年级字段不能为空");
sb.append("<br/>");
}
//教师姓名
......@@ -125,7 +125,7 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School
}
//学科
if (StringUtils.isEmpty(date.getSub())) {
sb.append(index+"、班学科字段不能为空");
sb.append(index+"、学科字段不能为空");
sb.append("<br/>");
}
}
......@@ -190,6 +190,17 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School
sb.append(date.getTeacherName()+"用户 身份证号 录入信息错误");
sb.append("<br/>");
}
//班级类型
schoolCheckVo = checkeDicet("class_type", date.getClassType());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setSub(schoolCheckVo.getVal());
} else {
sb.append(date.getTeacherName() + "用户 班级类型 录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
}
return sb.toString();
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolAworkloadServiceImpl.java
......@@ -65,7 +65,7 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
public String dataCheck(List<SchoolAworkload> list){
StringBuffer sb = new StringBuffer();
Integer index = 1;
Integer index = 0;
SchoolCheckVo schoolCheckVo = null;
for (SchoolAworkload date: list) {
index++;
......@@ -88,9 +88,9 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
sb.append("<br/>");
}
//年纪
//年级
if (StringUtils.isEmpty(date.getGrade())) {
sb.append(index+ "、年纪字段不能为空");
sb.append(index+ "、年级字段不能为空");
sb.append("<br/>");
}
//姓名
......@@ -129,9 +129,9 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
sb.append(index+ "、早读不能为空");
sb.append("<br/>");
}
//正科
//正课
if (date.getRequiredCourses() == null) {
sb.append(index+ "、正科不能为空");
sb.append(index+ "、正课不能为空");
sb.append("<br/>");
}
//晚自习
......@@ -141,7 +141,7 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
}
//证明人
if (date.getEveningSelfStudy() == null) {
if (StringUtils.isEmpty(date.getUserName())) {
sb.append(index+ "、证明人不能为空");
sb.append("<br/>");
}
......@@ -296,13 +296,13 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
/**
* 查询工作量信息列表
*
* @param schoolAworkload 工作量信息
* @param schoolAworkloadVo 工作量信息
* @return 工作量信息
*/
@Override
public List<SchoolAworkloadVo> selectSchoolAworkloadList(SchoolAworkload schoolAworkload)
public List<SchoolAworkloadVo> selectSchoolAworkloadList(SchoolAworkloadVo schoolAworkloadVo)
{
List<SchoolAworkloadVo> schoolAworkloadVos = schoolAworkloadMapper.selectSchoolAworkloadList(schoolAworkload);
List<SchoolAworkloadVo> schoolAworkloadVos = schoolAworkloadMapper.selectSchoolAworkloadList(schoolAworkloadVo);
//计算合计
for (SchoolAworkloadVo date : schoolAworkloadVos){
date.setAmountTo(date.getEarlyReading().add(date.getRequiredCourses()).add(date.getEveningSelfStudy()));
......@@ -312,9 +312,9 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
@Override
public List<SchoolAworkloadExport> selectAworkloadList(SchoolAworkload schoolAworkload)
public List<SchoolAworkloadExport> selectAworkloadList(SchoolAworkloadVo schoolAworkloadVo)
{
List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadMapper.selectAworkloadList(schoolAworkload);
List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadMapper.selectAworkloadList(schoolAworkloadVo);
//计算合计
for (SchoolAworkloadExport date : schoolAworkloadVos){
date.setAmountTo(date.getEarlyReading().add(date.getRequiredCourses()).add(date.getEveningSelfStudy()));
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolGkAchievementServiceImpl.java
......@@ -38,18 +38,18 @@ public class SchoolGkAchievementServiceImpl extends ServiceImpl<SchoolGkAchievem
/**
* 查询高考成绩列表
*
* @param schoolGkAchievement 高考成绩
* @param schoolGkAchievementVo 高考成绩
* @return 高考成绩
*/
@Override
public List<SchoolGkAchievementVo> selectSchoolGkAchievementVoList(SchoolGkAchievement schoolGkAchievement)
public List<SchoolGkAchievementVo> selectSchoolGkAchievementVoList(SchoolGkAchievementVo schoolGkAchievementVo)
{
return schoolGkAchievementMapper.selectSchoolGkAchievementVoList(schoolGkAchievement);
return schoolGkAchievementMapper.selectSchoolGkAchievementVoList(schoolGkAchievementVo);
}
@Override
public List<SchoolGkAchievement> selectSchoolGkAchievementList(SchoolGkAchievement schoolGkAchievement)
public List<SchoolGkAchievement> selectSchoolGkAchievementList(SchoolGkAchievementVo schoolGkAchievementVo)
{
return schoolGkAchievementMapper.selectSchoolGkAchievementList(schoolGkAchievement);
return schoolGkAchievementMapper.selectSchoolGkAchievementList(schoolGkAchievementVo);
}
/**
* 新增高考成绩
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationServicelmpl.java
......@@ -160,7 +160,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
public String dataCheck(List<SchoolTeacherBasicInformation> schoolTeacherBasicInformations){
StringBuilder sb = new StringBuilder();
SchoolCheckVo schoolCheckVo = null;
Integer index = 1;
Integer index = 0;
for (SchoolTeacherBasicInformation date: schoolTeacherBasicInformations) {
index ++;
......@@ -197,6 +197,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
}
for (SchoolTeacherBasicInformation date: schoolTeacherBasicInformations) {
//1 档案出生日期验证
if (null != date.getFileBirthDate()){
schoolCheckVo = this.checkeDateTime(date.getFileBirthDate());
if (schoolCheckVo.getFlag()){
date.setFileBirthDate(schoolCheckVo.getDate());
......@@ -204,7 +205,10 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
sb.append(date.getName()+"用户档案出生年月日格式错误");
sb.append("<br/>");
}
}
//2 入党时间验证
if (null != date.getPartyMembershipTime()){
schoolCheckVo = this.checkeDateTime(date.getPartyMembershipTime());
if (schoolCheckVo.getFlag()){
date.setPartyMembershipTime(schoolCheckVo.getDate());
......@@ -212,6 +216,8 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
sb.append(date.getName()+"用户入党时间格式错误");
sb.append("<br/>");
}
}
//3 手机号数数量验证
if (date.getDdPhone() ==null || date.getDdPhone().length() != 11){
sb.append(date.getName()+"用户手机号格式错误:"+date.getDdPhone() );
......@@ -246,6 +252,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
}
}
//6 先职称取得时间
if (null != date.getCurrentProfessionalTitleTime()){
schoolCheckVo = this.checkeDateTime(date.getCurrentProfessionalTitleTime());
if (schoolCheckVo.getFlag()){
date.setCurrentProfessionalTitleTime(schoolCheckVo.getDate());
......@@ -253,6 +260,8 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
sb.append(date.getName()+"用户现职称取得资格时间格式错误");
sb.append("<br/>");
}
}
//7 先聘岗位
schoolCheckVo = checkeDicet("current_position", date.getCurrentPosition());
if (schoolCheckVo !=null) {
......@@ -307,6 +316,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
}
}
//9现岗位等级聘任时间
if (null != date.getCurrentJobLevelAppointmentTime()){
schoolCheckVo = this.checkeDateTime(date.getCurrentJobLevelAppointmentTime());
if (schoolCheckVo.getFlag()){
date.setCurrentJobLevelAppointmentTime(schoolCheckVo.getDate());
......@@ -314,7 +324,10 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
sb.append(date.getName()+"用户现岗位等级聘任时间格式错误");
sb.append("<br/>");
}
}
//参加工作时间
if (StringUtils.isNotEmpty(date.getWorkingHours())){
schoolCheckVo = this.checkeDateTime(DateUtils.parseDate(date.getWorkingHours()));
if (schoolCheckVo.getFlag()){
date.setWorkingHours(schoolCheckVo.getVal());
......@@ -322,6 +335,8 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
sb.append(date.getName()+"用户参加工作时间格式错误");
sb.append("<br/>");
}
}
//到二中工作时间
schoolCheckVo = this.checkeDateTime(date.getToSecondMiddleSchoolTime());
if (schoolCheckVo.getFlag()){
......@@ -351,6 +366,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
}
}
//毕业时间1
if (null != date.getGraduationTime1()){
schoolCheckVo = this.checkeDateTime(date.getGraduationTime1());
if (schoolCheckVo.getFlag()){
......@@ -359,7 +375,9 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
sb.append(date.getName()+"用户 毕业时间1 格式错误");
sb.append("<br/>");
}
}
//毕业时间2
if (null != date.getGraduationTime2()){
schoolCheckVo = this.checkeDateTime(date.getGraduationTime2());
if (schoolCheckVo.getFlag()){
date.setGraduationTime2(schoolCheckVo.getDate());
......@@ -367,7 +385,10 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
sb.append(date.getName()+"用户 毕业时间2 格式错误");
sb.append("<br/>");
}
}
//毕业时间3
if (null != date.getGraduationTime3()){
schoolCheckVo = this.checkeDateTime(date.getGraduationTime3());
if (schoolCheckVo.getFlag()){
date.setGraduationTime3(schoolCheckVo.getDate());
......@@ -376,6 +397,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
sb.append("<br/>");
}
}
}
return sb.toString();
}
......@@ -1256,7 +1278,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
}
//2 工作量信息查询 使用身份证查询
SchoolAworkload schoolAworkload = new SchoolAworkload();
SchoolAworkloadVo schoolAworkload = new SchoolAworkloadVo();
schoolAworkload.setIdCard(basicInformation.getIdCard());
List<SchoolAworkloadVo> schoolAworkloadVos = schoolAworkloadService.selectSchoolAworkloadList(schoolAworkload);
comperhensiveVo.setSchoolAworkload(schoolAworkloadVos);
......@@ -1274,7 +1296,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
}
//4 专业考核
// * 4.1高考成绩
SchoolGkAchievement schoolGkAchievement = new SchoolGkAchievement();
SchoolGkAchievementVo schoolGkAchievement = new SchoolGkAchievementVo();
schoolGkAchievement.setUserId(sysUser.getUserId());
schoolGkAchievement.setNoAuditState("0");
List<SchoolGkAchievementVo> schoolGkAchievementVos = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievement);
......@@ -1429,7 +1451,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
}
//2 工作量信息查询 使用身份证查询
SchoolAworkload schoolAworkload = new SchoolAworkload();
SchoolAworkloadVo schoolAworkload = new SchoolAworkloadVo();
schoolAworkload.setIdCard(basicInformation.getIdCard());
List<SchoolAworkloadVo> schoolAworkloadVos = schoolAworkloadService.selectSchoolAworkloadList(schoolAworkload);
comperhensiveVo.setSchoolAworkload(schoolAworkloadVos);
......@@ -1447,7 +1469,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
}
//4 专业考核
// * 4.1高考成绩
SchoolGkAchievement schoolGkAchievement = new SchoolGkAchievement();
SchoolGkAchievementVo schoolGkAchievement = new SchoolGkAchievementVo();
schoolGkAchievement.setUserId(sysUser.getUserId());
List<SchoolGkAchievementVo> schoolGkAchievementVos = schoolGkAchievementService.selectSchoolGkAchievementVoList(schoolGkAchievement);
comperhensiveVo.setSchoolGkAchievement(schoolGkAchievementVos);
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolXteamAwardServiceImpl.java
......@@ -41,19 +41,19 @@ public class SchoolXteamAwardServiceImpl extends ServiceImpl<SchoolXteamAwardMa
/**
* 查询团队获奖列表
*
* @param schoolXteamAward 团队获奖
* @param schoolXteamAwardVo 团队获奖
* @return 团队获奖
*/
@Override
public List<SchoolXteamAward> selectSchoolXteamAwardList(SchoolXteamAward schoolXteamAward)
public List<SchoolXteamAward> selectSchoolXteamAwardList(SchoolXteamAwardVo schoolXteamAwardVo)
{
return schoolXteamAwardMapper.selectSchoolXteamAwardList(schoolXteamAward);
return schoolXteamAwardMapper.selectSchoolXteamAwardList(schoolXteamAwardVo);
}
@Override
public List<SchoolXteamAwardVo> selectSchoolXteamAwardVoList(SchoolXteamAward schoolXteamAward)
public List<SchoolXteamAwardVo> selectSchoolXteamAwardVoList(SchoolXteamAwardVo schoolXteamAwardVo)
{
return schoolXteamAwardMapper.selectSchoolXteamAwardVoList(schoolXteamAward);
return schoolXteamAwardMapper.selectSchoolXteamAwardVoList(schoolXteamAwardVo);
}
/**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolAclassTeacherAssessmentService.java
......@@ -28,7 +28,7 @@ public interface ISchoolAclassTeacherAssessmentService extends IService<SchoolA
/**
* 查询班主任考核列表
*
* @param schoolAclassTeacherAssessment 班主任考核
* @param req 班主任考核
* @return 班主任考核集合
*/
public List<SchoolAclassTeacherAssessmentVo> selectSchoolAclassTeacherAssessmentList(SchoolAclassTeacherAssessmentReq req);
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolAworkloadService.java
......@@ -28,12 +28,12 @@ public interface ISchoolAworkloadService extends IService<SchoolAworkload>
/**
* 查询工作量信息列表
*
* @param schoolAworkload 工作量信息
* @param schoolAworkloadVo 工作量信息
* @return 工作量信息集合
*/
public List<SchoolAworkloadVo> selectSchoolAworkloadList(SchoolAworkload schoolAworkload);
public List<SchoolAworkloadVo> selectSchoolAworkloadList(SchoolAworkloadVo schoolAworkloadVo);
//导出列表
public List<SchoolAworkloadExport> selectAworkloadList(SchoolAworkload schoolAworkload);
public List<SchoolAworkloadExport> selectAworkloadList(SchoolAworkloadVo schoolAworkloadVo);
/**
* 新增工作量信息
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolGkAchievementService.java
......@@ -26,11 +26,11 @@ public interface ISchoolGkAchievementService extends IService<SchoolGkAchieveme
/**
* 查询高考成绩列表
*
* @param schoolGkAchievement 高考成绩
* @param schoolGkAchievementVo 高考成绩
* @return 高考成绩集合
*/
public List<SchoolGkAchievementVo> selectSchoolGkAchievementVoList(SchoolGkAchievement schoolGkAchievement);
public List<SchoolGkAchievement> selectSchoolGkAchievementList(SchoolGkAchievement schoolGkAchievement);
public List<SchoolGkAchievementVo> selectSchoolGkAchievementVoList(SchoolGkAchievementVo schoolGkAchievementVo);
public List<SchoolGkAchievement> selectSchoolGkAchievementList(SchoolGkAchievementVo schoolGkAchievementVo);
/**
* 新增高考成绩
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolXteamAwardService.java
......@@ -26,11 +26,11 @@ public interface ISchoolXteamAwardService extends IService<SchoolXteamAward>
/**
* 查询团队获奖列表
*
* @param schoolXteamAward 团队获奖
* @param schoolXteamAwardVo 团队获奖
* @return 团队获奖集合
*/
public List<SchoolXteamAward> selectSchoolXteamAwardList(SchoolXteamAward schoolXteamAward);
public List<SchoolXteamAwardVo> selectSchoolXteamAwardVoList(SchoolXteamAward schoolXteamAward);
public List<SchoolXteamAward> selectSchoolXteamAwardList(SchoolXteamAwardVo schoolXteamAwardVo);
public List<SchoolXteamAwardVo> selectSchoolXteamAwardVoList(SchoolXteamAwardVo schoolXteamAwardVo);
/**
* 新增团队获奖
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentMapper.xml
......@@ -56,7 +56,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="intellEduCheckAchievementgtd != null and intellEduCheckAchievementgtd != ''"> and intell_edu_check_achievement &gt;= #{intellEduCheckAchievementgtd}</if>
<if test="intellEduCheckAchievementlt != null and intellEduCheckAchievementlt != ''"> and intell_edu_check_achievement &lt; #{intellEduCheckAchievementlt}</if>
<if test="intellEduCheckAchievementltd != null and intellEduCheckAchievementltd != ''"> and intell_edu_check_achievement &lt;= #{intellEduCheckAchievementltd}</if>
<if test="idCards != null">
and id_card in
<foreach item="idCard" collection="idCards" open="(" separator="," close=")">
#{idCard}
</foreach>
</if>
</select>
......@@ -87,7 +92,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="intellEduCheckAchievementgtd != null and intellEduCheckAchievementgtd != ''"> and intell_edu_check_achievement &gt;= #{intellEduCheckAchievementgtd}</if>
<if test="intellEduCheckAchievementlt != null and intellEduCheckAchievementlt != ''"> and intell_edu_check_achievement &lt; #{intellEduCheckAchievementlt}</if>
<if test="intellEduCheckAchievementltd != null and intellEduCheckAchievementltd != ''"> and intell_edu_check_achievement &lt;= #{intellEduCheckAchievementltd}</if>
<if test="idCards != null">
and id_card in
<foreach item="idCard" collection="idCards" open="(" separator="," close=")">
#{idCard}
</foreach>
</if>
</select>
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolAworkloadMapper.xml
......@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select id, school_year, semester, year, grade, name, sub, id_card, appointment_post, appointment_position, appointment_situation, class_name, class_type, early_reading, required_courses, evening_self_study, user_id, user_name, remark, create_by, create_time, update_by, update_time, del_flag from school_aworkload
</sql>
<select id="selectSchoolAworkloadList" parameterType="SchoolAworkload" resultType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo">
<select id="selectSchoolAworkloadList" parameterType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo" resultType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo">
<include refid="selectSchoolAworkloadVo"/>
where del_flag = 0
<if test="schoolYear != null and schoolYear != ''"> and school_year = #{schoolYear}</if>
......@@ -59,12 +59,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="eveningSelfStudy != null "> and evening_self_study = #{eveningSelfStudy}</if>
<if test="userId != null "> and user_id = #{userId}</if>
<if test="userName != null and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
<if test="idCards != null">
and id_card in
<foreach item="idCard" collection="idCards" open="(" separator="," close=")">
#{idCard}
</foreach>
</if>
</select>
<select id="selectAworkloadList" parameterType="SchoolAworkload" resultType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadExport">
<select id="selectAworkloadList" parameterType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo" resultType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadExport">
<include refid="selectSchoolAworkloadVo"/>
where del_flag = 0
<if test="schoolYear != null and schoolYear != ''"> and school_year = #{schoolYear}</if>
......@@ -88,7 +94,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="eveningSelfStudy != null "> and evening_self_study = #{eveningSelfStudy}</if>
<if test="userId != null "> and user_id = #{userId}</if>
<if test="userName != null and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
<if test="idCards != null">
and id_card in
<foreach item="idCard" collection="idCards" open="(" separator="," close=")">
#{idCard}
</foreach>
</if>
</select>
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolGkAchievementMapper.xml
......@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select id, sub, teacher_name, year, teaching_class_name, user_id,class_type, gk_appraising, top_students_culture, increment_situation, effective_num_situation, other, audit_state, create_by, create_time, update_by, update_time, del_flag from school_gk_achievement
</sql>
<select id="selectSchoolGkAchievementVoList" parameterType="SchoolGkAchievement" resultType="SchoolGkAchievementVo">
<select id="selectSchoolGkAchievementVoList" parameterType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolGkAchievementVo" resultType="SchoolGkAchievementVo">
<include refid="selectSchoolGkAchievementVo"/>
where del_flag = 0
<if test="year != null and year != ''"> and year = #{year}</if>
......@@ -38,10 +38,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="teachingClassName != null and teachingClassName != ''"> and teaching_class_name = #{teachingClassName}</if>
<if test="classType != null and classType != ''"> and class_type like concat('%', #{classType}, '%')</if>
<if test="gkAppraising != null and gkAppraising != ''"> and gk_appraising = #{gkAppraising}</if>
<if test="userIds != null">
and user_id in
<foreach item="userId" collection="userIds" open="(" separator="," close=")">
#{userId}
</foreach>
</if>
<if test="noAuditState != null and noAuditState != ''"> and audit_state != #{noAuditState}</if>
</select>
<select id="selectSchoolGkAchievementList" parameterType="SchoolGkAchievement" resultMap="SchoolGkAchievementResult">
<select id="selectSchoolGkAchievementList" parameterType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolGkAchievementVo" resultMap="SchoolGkAchievementResult">
<include refid="selectSchoolGkAchievementVo"/>
where del_flag = 0
<if test="year != null and year != ''"> and year = #{year}</if>
......@@ -51,6 +57,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="teachingClassName != null and teachingClassName != ''"> and teaching_class_name = #{teachingClassName}</if>
<if test="classType != null and classType != ''"> and class_type like concat('%', #{classType}, '%')</if>
<if test="gkAppraising != null and gkAppraising != ''"> and gk_appraising = #{gkAppraising}</if>
<if test="userIds != null">
and user_id in
<foreach item="userId" collection="userIds" open="(" separator="," close=")">
#{userId}
</foreach>
</if>
</select>
<select id="selectSchoolGkAchievementById" parameterType="Long" resultMap="SchoolGkAchievementResult">
......@@ -135,3 +147,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
</mapper>
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationMapper.xml
......@@ -38,6 +38,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="firstDegree != null ">
AND CONCAT(IFNULL(first_degree,''),IFNULL(last_degree,'')) LIKE concat('%',#{firstDegree},'%')
</if>
<if test="idCards != null">
and id_card in
<foreach item="idCard" collection="idCards" open="(" separator="," close=")">
#{idCard}
</foreach>
</if>
</select>
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXteamAwardMapper.xml
......@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select id, school_year, semester, year, grade, sub, award_situation, team_members_contribution, remark, audit_state, create_by, create_time, update_by, update_time, del_flag from school_xteam_award
</sql>
<select id="selectSchoolXteamAwardList" parameterType="SchoolXteamAward" resultMap="SchoolXteamAwardResult">
<select id="selectSchoolXteamAwardList" parameterType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteamAwardVo" resultMap="SchoolXteamAwardResult">
<include refid="selectSchoolXteamAwardVo"/>
<where>
<if test="schoolYear != null and schoolYear != ''"> and school_year = #{schoolYear}</if>
......@@ -38,10 +38,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="teamMembersContribution != null and teamMembersContribution != ''"> and team_members_contribution = #{teamMembersContribution}</if>
<if test="auditState != null and auditState != ''"> and audit_state = #{auditState}</if>
<if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
<if test="userIds != null">
and create_by in
<foreach item="userId" collection="userIds" open="(" separator="," close=")">
#{userId}
</foreach>
</if>
</where>
</select>
<select id="selectSchoolXteamAwardVoList" parameterType="SchoolXteamAward" resultType="SchoolXteamAwardVo">
<select id="selectSchoolXteamAwardVoList" parameterType="yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteamAwardVo" resultType="SchoolXteamAwardVo">
<include refid="selectSchoolXteamAwardVo"/>
<where>
<if test="schoolYear != null and schoolYear != ''"> and school_year = #{schoolYear}</if>
......@@ -54,6 +60,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="auditState != null and auditState != ''"> and audit_state = #{auditState}</if>
<if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
<if test="noAuditState != null and noAuditState != ''"> and audit_state != #{noAuditState}</if>
<if test="userIds != null">
and create_by in
<foreach item="userId" collection="userIds" open="(" separator="," close=")">
#{userId}
</foreach>
</if>
</where>
</select>
......
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