Skip to content

D
dd_school
Commit a6b82312 by zhaopanyu
Options

Merge branch 'master' of 49.232.152.146:qangqi/dd_school

parents 33cd6591 1e2b149d
Showing with 1745 additions and 261 deletions
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
...@@ -430,10 +430,11 @@ public class ExcelUtil<T> ...@@ -430,10 +430,11 @@ public class ExcelUtil<T>
//注意实体类字段类型,除String类型外,其他类型会被解析为null值，所以要判断对象是否为null //注意实体类字段类型,除String类型外,其他类型会被解析为null值，所以要判断对象是否为null
boolean required = attr.required(); boolean required = attr.required();
if(required) if(required){
if(StringUtils.isNull(val) || StringUtils.isEmpty(val.toString())) { if(StringUtils.isNull(val) || StringUtils.isEmpty(val.toString())) {
throw new Exception("必填项未填写!"); throw new Exception("必填项未填写!");
} }
}
if (StringUtils.isNotEmpty(dateFormat)) if (StringUtils.isNotEmpty(dateFormat))
{ {
...@@ -454,11 +455,13 @@ public class ExcelUtil<T> ...@@ -454,11 +455,13 @@ public class ExcelUtil<T>
val = Convert.toLong(val); val = Convert.toLong(val);
//注意实体类字段类型,除String类型外,其他类型会被解析为null值，所以要判断对象是否为null //注意实体类字段类型,除String类型外,其他类型会被解析为null值，所以要判断对象是否为null
boolean required = attr.required(); boolean required = attr.required();
if(required) if(required){
if(StringUtils.isNull(val) || StringUtils.isEmpty(val.toString())) { if(StringUtils.isNull(val) || StringUtils.isEmpty(val.toString())) {
throw new Exception("必填项未填写!"); throw new Exception("必填项未填写!");
} }
} }
}
else if (Double.TYPE == fieldType || Double.class == fieldType) else if (Double.TYPE == fieldType || Double.class == fieldType)
{ {
val = Convert.toDouble(val); val = Convert.toDouble(val);
...@@ -473,6 +476,13 @@ public class ExcelUtil<T> ...@@ -473,6 +476,13 @@ public class ExcelUtil<T>
} }
else if (Date.class == fieldType) else if (Date.class == fieldType)
{ {
boolean required = attr.required();
if(required){
if(StringUtils.isNull(val) || StringUtils.isEmpty(val.toString())) {
throw new Exception("必填项未填写!");
}
}
if (val instanceof String) if (val instanceof String)
{ {
val = DateUtils.parseDate(val); val = DateUtils.parseDate(val);
......
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
...@@ -117,7 +117,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter ...@@ -117,7 +117,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
.antMatchers( "/common/**").permitAll() .antMatchers( "/common/**").permitAll()
.antMatchers( "/dd/school/**").permitAll() .antMatchers( "/dd/school/**").permitAll()
// .antMatchers( "/teacher/basiclnformation/**","/aworkload/**","/wx/course/**","/assessment/**","/achievement/**","/school/award/**").permitAll() .antMatchers( "/teacher/basiclnformation/**","/aworkload/**","/wx/course/**","/assessment/**","/achievement/**","/school/award/**").permitAll()
//打印下载接口放行 //打印下载接口放行
.antMatchers("/school/student/queryOne/**","/school/studentStatus/proofStatus/**").permitAll() .antMatchers("/school/student/queryOne/**","/school/studentStatus/proofStatus/**").permitAll()
......
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; ...@@ -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.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -55,7 +56,7 @@ public class FudaoStudentController extends BaseController { ...@@ -55,7 +56,7 @@ public class FudaoStudentController extends BaseController {
return getDataTable(list); return getDataTable(list);
} }
for (SysRole role : roles) { for (SysRole role : roles) {
if (role.getRoleKey().equals("fdxshj_admin")){ if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("fdxshj_admin")){
startPage(); startPage();
List<FudaoStudentVo> list = fudaoStudentService.querylist(fudaoStudentVo); List<FudaoStudentVo> list = fudaoStudentService.querylist(fudaoStudentVo);
list.forEach(list1 -> { list.forEach(list1 -> {
...@@ -64,26 +65,10 @@ public class FudaoStudentController extends BaseController { ...@@ -64,26 +65,10 @@ public class FudaoStudentController extends BaseController {
return getDataTable(list); return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据 //教师电子档案中级管理员只能查看本部门及部门以下的数据
Long deptId = null;
//根据用户部门id查询用户部门信息 //根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); 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 //查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(deptId); List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){ if (deptUserIds.size() > 0){
fudaoStudentVo.setUserids(deptUserIds); fudaoStudentVo.setUserids(deptUserIds);
} }
...@@ -173,7 +158,7 @@ public class FudaoStudentController extends BaseController { ...@@ -173,7 +158,7 @@ public class FudaoStudentController extends BaseController {
util.exportExcel(response, list, "辅导学生获奖"); util.exportExcel(response, list, "辅导学生获奖");
} }
for (SysRole role : roles) { 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); List<FudaoStudentVo> list = fudaoStudentService.querylist(fudaoStudentVo);
for (FudaoStudentVo studentVo : list) { for (FudaoStudentVo studentVo : list) {
i++; i++;
...@@ -184,26 +169,10 @@ public class FudaoStudentController extends BaseController { ...@@ -184,26 +169,10 @@ public class FudaoStudentController extends BaseController {
util.exportExcel(response, list, "辅导学生获奖"); util.exportExcel(response, list, "辅导学生获奖");
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据 //教师电子档案中级管理员只能查看本部门及部门以下的数据
Long deptId = null;
//根据用户部门id查询用户部门信息 //根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); 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 //查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(deptId); List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){ if (deptUserIds.size() > 0){
fudaoStudentVo.setUserids(deptUserIds); 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; ...@@ -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.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -53,7 +54,7 @@ public class FudaoTeacherController extends BaseController { ...@@ -53,7 +54,7 @@ public class FudaoTeacherController extends BaseController {
return getDataTable(list); return getDataTable(list);
} }
for (SysRole role : roles) { for (SysRole role : roles) {
if (role.getRoleKey().equals("fdjshj_admin")){ if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("fdjshj_admin")){
startPage(); startPage();
List<FudaoTeacherVo> list = fudaoTeacherService.querylist(fudaoTeacherVo); List<FudaoTeacherVo> list = fudaoTeacherService.querylist(fudaoTeacherVo);
list.forEach(list1 -> { list.forEach(list1 -> {
...@@ -62,26 +63,10 @@ public class FudaoTeacherController extends BaseController { ...@@ -62,26 +63,10 @@ public class FudaoTeacherController extends BaseController {
return getDataTable(list); return getDataTable(list);
} else if (role.getRoleKey().equals("jsdnzj_admin")){ } else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据 //教师电子档案中级管理员只能查看本部门及部门以下的数据
Long deptId = null;
//根据用户部门id查询用户部门信息 //根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); 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 //查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(deptId); List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){ if (deptUserIds.size() > 0){
fudaoTeacherVo.setUserids(deptUserIds); fudaoTeacherVo.setUserids(deptUserIds);
} }
...@@ -154,6 +139,7 @@ public class FudaoTeacherController extends BaseController { ...@@ -154,6 +139,7 @@ public class FudaoTeacherController extends BaseController {
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, FudaoTeacherVo fudaoTeacherVo) { public void export(HttpServletResponse response, FudaoTeacherVo fudaoTeacherVo) {
int i = 0; int i = 0;
//过滤未提交的数据
fudaoTeacherVo.setAuditstate("0"); fudaoTeacherVo.setAuditstate("0");
//获取当前登陆人信息 //获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser(); SysUser user = SecurityUtils.getLoginUser().getUser();
...@@ -170,7 +156,7 @@ public class FudaoTeacherController extends BaseController { ...@@ -170,7 +156,7 @@ public class FudaoTeacherController extends BaseController {
util.exportExcel(response, list, "辅导教师获奖"); util.exportExcel(response, list, "辅导教师获奖");
} }
for (SysRole role : roles) { 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); List<FudaoTeacherVo> list = fudaoTeacherService.querylist(fudaoTeacherVo);
for (FudaoTeacherVo teacherVo : list) { for (FudaoTeacherVo teacherVo : list) {
i ++; i ++;
...@@ -181,26 +167,10 @@ public class FudaoTeacherController extends BaseController { ...@@ -181,26 +167,10 @@ public class FudaoTeacherController extends BaseController {
util.exportExcel(response, list, "辅导教师获奖"); util.exportExcel(response, list, "辅导教师获奖");
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据 //教师电子档案中级管理员只能查看本部门及部门以下的数据
Long deptId = null;
//根据用户部门id查询用户部门信息 //根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); 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 //查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(deptId); List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){ if (deptUserIds.size() > 0){
fudaoTeacherVo.setUserids(deptUserIds); fudaoTeacherVo.setUserids(deptUserIds);
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolAnnualAssessment/SchoolAnnualAssessmentController.java
...@@ -3,9 +3,15 @@ package yangtz.cs.liu.campus.controller.schoolAnnualAssessment; ...@@ -3,9 +3,15 @@ package yangtz.cs.liu.campus.controller.schoolAnnualAssessment;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; 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.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; 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.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDeptService;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
...@@ -15,6 +21,9 @@ import org.springframework.web.multipart.MultipartFile; ...@@ -15,6 +21,9 @@ import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment; import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessmentExport; import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessmentExport;
import yangtz.cs.liu.campus.service.schoolAnnualAssessment.ISchoolAnnualAssessmentService; import yangtz.cs.liu.campus.service.schoolAnnualAssessment.ISchoolAnnualAssessmentService;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
import yangtz.cs.liu.campus.vo.schoolAnnualAssessment.SchoolAnnualAssessmentVo;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -32,18 +41,77 @@ public class SchoolAnnualAssessmentController extends BaseController { ...@@ -32,18 +41,77 @@ public class SchoolAnnualAssessmentController extends BaseController {
@Autowired @Autowired
private ISchoolAnnualAssessmentService schoolAnnualAssessmentService; private ISchoolAnnualAssessmentService schoolAnnualAssessmentService;
@Autowired
private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
@Autowired
private ISysDeptService sysDeptService;
/** /**
* 查询年度考核列表 * 查询年度考核列表
*/ */
// @PreAuthorize("@ss.hasPermi('school:annualAssessment:list')") // @PreAuthorize("@ss.hasPermi('school:annualAssessment:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SchoolAnnualAssessment schoolAnnualAssessment) public TableDataInfo list(SchoolAnnualAssessmentVo schoolAnnualAssessmentVo)
{ {
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()) {
startPage(); startPage();
List<SchoolAnnualAssessment> list = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessment); List<SchoolAnnualAssessment> list = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessmentVo);
return getDataTable(list); return getDataTable(list);
} }
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("ndkh_admin")){
startPage();
List<SchoolAnnualAssessment> list = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessmentVo);
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;
// }else {
// String[] split = sysDept.getAncestors().split(",");
// if (split.length == 2){
// deptId = sysDept.getDeptId();
// }
// }
// }
// if (StringUtils.isNull(deptId)){
// for (Long ksDeptId : ksDeptIds) {
// if (sysDept.getAncestors().contains(ksDeptId.toString())){
// deptId = ksDeptId;
// }else {
// String[] split = sysDept.getAncestors().split(",");
// if (split.length == 3){
// deptId = sysDept.getDeptId();
// }
// }
// }
// }
//查询本部门下所有教师的身份证号
List<String> deptUserIds = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolAnnualAssessmentVo.setIdCards(deptUserIds);
}
startPage();
List<SchoolAnnualAssessment> list = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessmentVo);
return getDataTable(list);
}
}
return getDataTable(new ArrayList<>());
}
/** /**
* 导出年度考核列表 * 导出年度考核列表
...@@ -51,21 +119,95 @@ public class SchoolAnnualAssessmentController extends BaseController { ...@@ -51,21 +119,95 @@ public class SchoolAnnualAssessmentController extends BaseController {
// @PreAuthorize("@ss.hasPermi('school:annualAssessment:export')") // @PreAuthorize("@ss.hasPermi('school:annualAssessment:export')")
@Log(title = "年度考核", businessType = BusinessType.EXPORT) @Log(title = "年度考核", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, SchoolAnnualAssessment schoolAnnualAssessment) public void export(HttpServletResponse response, SchoolAnnualAssessmentVo schoolAnnualAssessmentVo)
{ {
int i = 0; int i = 0;
List<SchoolAnnualAssessment> list = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessment);
List<SchoolAnnualAssessmentExport> exportList = new ArrayList<>(); //获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()) {
List<SchoolAnnualAssessment> list = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessmentVo);
List<SchoolAnnualAssessmentVo> exportList = new ArrayList<>();
for (SchoolAnnualAssessment annualAssessment : list) { for (SchoolAnnualAssessment annualAssessment : list) {
//转导出实体
i ++; i ++;
SchoolAnnualAssessmentExport schoolAnnualAssessmentExport = new SchoolAnnualAssessmentExport(); //转vo
BeanUtils.copyProperties(annualAssessment,schoolAnnualAssessmentExport); SchoolAnnualAssessmentVo schoolAnnualAssessmentVo1 = new SchoolAnnualAssessmentVo();
schoolAnnualAssessmentExport.setXh(i); BeanUtils.copyProperties(annualAssessment,schoolAnnualAssessmentVo1);
exportList.add(schoolAnnualAssessmentExport); schoolAnnualAssessmentVo1.setXh(i);
exportList.add(schoolAnnualAssessmentVo1);
} }
ExcelUtil<SchoolAnnualAssessmentExport> util = new ExcelUtil<SchoolAnnualAssessmentExport>(SchoolAnnualAssessmentExport.class); ExcelUtil<SchoolAnnualAssessmentVo> util = new ExcelUtil<SchoolAnnualAssessmentVo>(SchoolAnnualAssessmentVo.class);
util.exportExcel(response, exportList, "年度考核数据"); util.exportExcel(response, exportList, "年度考核数据");
}
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("ndkh_admin")){
List<SchoolAnnualAssessment> list = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessmentVo);
List<SchoolAnnualAssessmentVo> exportList = new ArrayList<>();
for (SchoolAnnualAssessment annualAssessment : list) {
i ++;
//转vo
SchoolAnnualAssessmentVo schoolAnnualAssessmentVo1 = new SchoolAnnualAssessmentVo();
BeanUtils.copyProperties(annualAssessment,schoolAnnualAssessmentVo1);
schoolAnnualAssessmentVo1.setXh(i);
exportList.add(schoolAnnualAssessmentVo1);
}
ExcelUtil<SchoolAnnualAssessmentVo> util = new ExcelUtil<SchoolAnnualAssessmentVo>(SchoolAnnualAssessmentVo.class);
util.exportExcel(response, exportList, "年度考核数据");
}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;
// }else {
// String[] split = sysDept.getAncestors().split(",");
// if (split.length == 2){
// deptId = sysDept.getDeptId();
// }
// }
// }
// if (StringUtils.isNull(deptId)){
// for (Long ksDeptId : ksDeptIds) {
// if (sysDept.getAncestors().contains(ksDeptId.toString())){
// deptId = ksDeptId;
// }else {
// String[] split = sysDept.getAncestors().split(",");
// if (split.length == 3){
// deptId = sysDept.getDeptId();
// }
// }
// }
// }
//查询本部门下所有教师的身份证号
List<String> deptUserIds = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolAnnualAssessmentVo.setIdCards(deptUserIds);
}
List<SchoolAnnualAssessment> list = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessmentVo);
List<SchoolAnnualAssessmentVo> exportList = new ArrayList<>();
for (SchoolAnnualAssessment annualAssessment : list) {
i ++;
//转vo
SchoolAnnualAssessmentVo schoolAnnualAssessmentVo1 = new SchoolAnnualAssessmentVo();
BeanUtils.copyProperties(annualAssessment,schoolAnnualAssessmentVo1);
schoolAnnualAssessmentVo1.setXh(i);
exportList.add(schoolAnnualAssessmentVo1);
}
ExcelUtil<SchoolAnnualAssessmentVo> util = new ExcelUtil<SchoolAnnualAssessmentVo>(SchoolAnnualAssessmentVo.class);
util.exportExcel(response, exportList, "年度考核数据");
}
}
ExcelUtil<SchoolAnnualAssessmentVo> util = new ExcelUtil<SchoolAnnualAssessmentVo>(SchoolAnnualAssessmentVo.class);
util.exportExcel(response, new ArrayList<>(), "年度考核数据");
// List<SchoolAnnualAssessment> schoolAnnualAssessments = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(new SchoolAnnualAssessment()); // List<SchoolAnnualAssessment> schoolAnnualAssessments = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(new SchoolAnnualAssessment());
// List<SchoolAnnualAssessment> list = new ArrayList<>(); // List<SchoolAnnualAssessment> list = new ArrayList<>();
// List<SchoolAnnualAssessmentExport> exportList = new ArrayList<>(); // List<SchoolAnnualAssessmentExport> exportList = new ArrayList<>();
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentController.java
...@@ -137,8 +137,7 @@ public class SchoolAclassTeacherAssessmentController extends BaseController ...@@ -137,8 +137,7 @@ public class SchoolAclassTeacherAssessmentController extends BaseController
ExcelUtil<SchoolAclassTeacherAssessment> util = new ExcelUtil<SchoolAclassTeacherAssessment>(SchoolAclassTeacherAssessment.class); ExcelUtil<SchoolAclassTeacherAssessment> util = new ExcelUtil<SchoolAclassTeacherAssessment>(SchoolAclassTeacherAssessment.class);
List<SchoolAclassTeacherAssessment> detailList = util.importExceltoRow(file.getInputStream(),1); List<SchoolAclassTeacherAssessment> detailList = util.importExceltoRow(file.getInputStream(),1);
//1.导入 //1.导入
boolean b = schoolAclassTeacherAssessmentService.saveBatch(detailList); return schoolAclassTeacherAssessmentService.saveCheckedDate(detailList);
return AjaxResult.success();
} }
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolAworkloadController.java
...@@ -137,8 +137,7 @@ public class SchoolAworkloadController extends BaseController ...@@ -137,8 +137,7 @@ public class SchoolAworkloadController extends BaseController
BeanUtils.copyProperties(date,schoolAworkload); BeanUtils.copyProperties(date,schoolAworkload);
list.add(schoolAworkload); list.add(schoolAworkload);
} }
boolean b = schoolAworkloadService.saveBatch(list); return schoolAworkloadService.saveAndChecked(list);
return AjaxResult.success(b);
} }
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationController.java
...@@ -160,27 +160,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -160,27 +160,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
public AjaxResult importData(MultipartFile file) throws Exception { public AjaxResult importData(MultipartFile file) throws Exception {
ExcelUtil<SchoolTeacherBasicInformation> util = new ExcelUtil<SchoolTeacherBasicInformation>(SchoolTeacherBasicInformation.class); ExcelUtil<SchoolTeacherBasicInformation> util = new ExcelUtil<SchoolTeacherBasicInformation>(SchoolTeacherBasicInformation.class);
List<SchoolTeacherBasicInformation> schoolTeacherBasicInformations = util.importExceltoRow(file.getInputStream(),1); List<SchoolTeacherBasicInformation> schoolTeacherBasicInformations = util.importExceltoRow(file.getInputStream(),1);
return basichlnformationService.saveOrUpdateList(schoolTeacherBasicInformations);
// List<SchoolTeacherBasicInformation> schoolTeacherBasicInformations = basichlnformationService.importExcel(file);
for (SchoolTeacherBasicInformation date : schoolTeacherBasicInformations){
//1.处理出生日期
String birthDayFromIdCard = IdCardNumberUtils.getBirthDayFromIdCard(date.getIdCard());
date.setBirthDate(birthDayFromIdCard);
//2.处理性别
Map<String, Object> sexFromIdCard = IdCardNumberUtils.getSexFromIdCard(date.getIdCard());
Integer sex = (Integer) sexFromIdCard.get(IdCardNumberUtils.SEX_BY_INT_MAP_KEY);
if (null == sex){
return AjaxResult.error("导入用户:"+date.getName()+",身份证错误请检查"+date.getIdCard());
}
if (sex == 1){
date.setSex("0");
}else {
date.setSex("1");
}
}
boolean b = basichlnformationService.saveOrUpdateList(schoolTeacherBasicInformations);
return AjaxResult.success(b);
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXacademicWorksController.java
package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn; package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils; 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.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -22,7 +28,9 @@ import com.ruoyi.common.utils.poi.ExcelUtil; ...@@ -22,7 +28,9 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXacademicWorks; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXacademicWorks;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXacademicWorksService; 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.SchoolXacademicWorksVo;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXlectureAwardsVo;
/** /**
* 论文著作Controller * 论文著作Controller
...@@ -36,6 +44,10 @@ public class SchoolXacademicWorksController extends BaseController ...@@ -36,6 +44,10 @@ public class SchoolXacademicWorksController extends BaseController
{ {
@Autowired @Autowired
private ISchoolXacademicWorksService schoolXacademicWorksService; private ISchoolXacademicWorksService schoolXacademicWorksService;
@Autowired
private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
@Autowired
private ISysDeptService sysDeptService;
/** /**
* 查询论文著作列表 * 查询论文著作列表
...@@ -44,12 +56,38 @@ public class SchoolXacademicWorksController extends BaseController ...@@ -44,12 +56,38 @@ public class SchoolXacademicWorksController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SchoolXacademicWorksVo schoolXacademicWorksVo) public TableDataInfo list(SchoolXacademicWorksVo schoolXacademicWorksVo)
{ {
//查询审核中的数据 //过滤未提交的数据
schoolXacademicWorksVo.setAuditState("0"); schoolXacademicWorksVo.setAuditState("0");
//获取当前登陆人信息
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(); startPage();
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo); List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
return getDataTable(list); return getDataTable(list);
} }
}
return getDataTable(new ArrayList<>());
}
/** /**
* 查询论文著作列表(个人) * 查询论文著作列表(个人)
...@@ -93,8 +131,14 @@ public class SchoolXacademicWorksController extends BaseController ...@@ -93,8 +131,14 @@ public class SchoolXacademicWorksController extends BaseController
public void export(HttpServletResponse response, SchoolXacademicWorksVo schoolXacademicWorksVo) public void export(HttpServletResponse response, SchoolXacademicWorksVo schoolXacademicWorksVo)
{ {
int i = 0; int i = 0;
//查询审核中的数据 //过滤未提交的数据
schoolXacademicWorksVo.setAuditState("0"); schoolXacademicWorksVo.setAuditState("0");
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()) {
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo); List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
for (SchoolXacademicWorksVo xacademicWorksVo : list) { for (SchoolXacademicWorksVo xacademicWorksVo : list) {
i ++; i ++;
...@@ -104,6 +148,38 @@ public class SchoolXacademicWorksController extends BaseController ...@@ -104,6 +148,38 @@ public class SchoolXacademicWorksController extends BaseController
ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class); ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class);
util.exportExcel(response, list, "论文著作数据"); util.exportExcel(response, list, "论文著作数据");
} }
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, 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; ...@@ -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.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -66,32 +67,16 @@ public class SchoolXcomprehensiveHonorsController extends BaseController ...@@ -66,32 +67,16 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
return getDataTable(list); return getDataTable(list);
} }
for (SysRole role : roles) { for (SysRole role : roles) {
if (role.getRoleKey().equals("zhry_admin")){ if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("zhry_admin")){
startPage(); startPage();
List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo); List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
return getDataTable(list); return getDataTable(list);
}else if (role.getRoleKey().equals("jsdnzj_admin")){ }else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据 //教师电子档案中级管理员只能查看本部门及部门以下的数据
Long deptId = null;
//根据用户部门id查询用户部门信息 //根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId()); 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 //查询本部门下所有教师的id
List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(deptId); List<Long> deptUserIds = schoolXteachingAchievementsService.getUserIdsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){ if (deptUserIds.size() > 0){
schoolXcomprehensiveHonorsVo.setUserIds(deptUserIds); schoolXcomprehensiveHonorsVo.setUserIds(deptUserIds);
} }
...@@ -145,8 +130,42 @@ public class SchoolXcomprehensiveHonorsController extends BaseController ...@@ -145,8 +130,42 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
public void export(HttpServletResponse response, SchoolXcomprehensiveHonorsVo schoolXcomprehensiveHonorsVo) public void export(HttpServletResponse response, SchoolXcomprehensiveHonorsVo schoolXcomprehensiveHonorsVo)
{ {
int i = 0; int i = 0;
//查询审核中的数据 //过滤未提交的数据
schoolXcomprehensiveHonorsVo.setAuditState("0"); schoolXcomprehensiveHonorsVo.setAuditState("0");
//获取当前登陆人信息
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); List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
for (SchoolXcomprehensiveHonorsVo xcomprehensiveHonorsVo : list) { for (SchoolXcomprehensiveHonorsVo xcomprehensiveHonorsVo : list) {
i ++; i ++;
...@@ -156,6 +175,10 @@ public class SchoolXcomprehensiveHonorsController extends BaseController ...@@ -156,6 +175,10 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class); ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class);
util.exportExcel(response, list, "综合荣誉数据"); util.exportExcel(response, list, "综合荣誉数据");
} }
}
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
package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn; package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils; 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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -21,7 +27,9 @@ import com.ruoyi.common.utils.poi.ExcelUtil; ...@@ -21,7 +27,9 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXlectureAwards; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXlectureAwards;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXlectureAwardsService; 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.SchoolXlectureAwardsVo;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteacherAwardsVo;
/** /**
* 讲课获奖Controller * 讲课获奖Controller
...@@ -35,6 +43,10 @@ public class SchoolXlectureAwardsController extends BaseController ...@@ -35,6 +43,10 @@ public class SchoolXlectureAwardsController extends BaseController
{ {
@Autowired @Autowired
private ISchoolXlectureAwardsService schoolXlectureAwardsService; private ISchoolXlectureAwardsService schoolXlectureAwardsService;
@Autowired
private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
@Autowired
private ISysDeptService sysDeptService;
/** /**
* 查询讲课获奖列表 * 查询讲课获奖列表
...@@ -43,12 +55,39 @@ public class SchoolXlectureAwardsController extends BaseController ...@@ -43,12 +55,39 @@ public class SchoolXlectureAwardsController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SchoolXlectureAwardsVo schoolXlectureAwardsVo) public TableDataInfo list(SchoolXlectureAwardsVo schoolXlectureAwardsVo)
{ {
//查询审核中的数据 //过滤未提交的数据
schoolXlectureAwardsVo.setAuditState("0"); schoolXlectureAwardsVo.setAuditState("0");
//获取当前登陆人信息
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(); startPage();
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo); List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
return getDataTable(list); return getDataTable(list);
} }
}
return getDataTable(new ArrayList<>());
}
/** /**
* 查询讲课获奖列表(个人) * 查询讲课获奖列表(个人)
...@@ -92,8 +131,14 @@ public class SchoolXlectureAwardsController extends BaseController ...@@ -92,8 +131,14 @@ public class SchoolXlectureAwardsController extends BaseController
public void export(HttpServletResponse response, SchoolXlectureAwardsVo schoolXlectureAwardsVo) public void export(HttpServletResponse response, SchoolXlectureAwardsVo schoolXlectureAwardsVo)
{ {
int i = 0; int i = 0;
//查询审核中的数据 //过滤未审核的数据
schoolXlectureAwardsVo.setAuditState("0"); schoolXlectureAwardsVo.setAuditState("0");
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()) {
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo); List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
for (SchoolXlectureAwardsVo xlectureAwardsVo : list) { for (SchoolXlectureAwardsVo xlectureAwardsVo : list) {
i ++; i ++;
...@@ -103,6 +148,38 @@ public class SchoolXlectureAwardsController extends BaseController ...@@ -103,6 +148,38 @@ public class SchoolXlectureAwardsController extends BaseController
ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class); ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class);
util.exportExcel(response, list, "讲课获奖数据"); util.exportExcel(response, list, "讲课获奖数据");
} }
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, 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; ...@@ -3,19 +3,27 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; 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.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXprojectResearch; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXprojectResearch;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteacherAwards; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteacherAwards;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXprojectResearchService; 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 yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXprojectResearchVo;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
...@@ -30,6 +38,10 @@ public class SchoolXprojectResearchController extends BaseController { ...@@ -30,6 +38,10 @@ public class SchoolXprojectResearchController extends BaseController {
@Autowired @Autowired
private ISchoolXprojectResearchService schoolXprojectResearchService; private ISchoolXprojectResearchService schoolXprojectResearchService;
@Autowired
private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
@Autowired
private ISysDeptService sysDeptService;
/** /**
* 查询课题研究列表 * 查询课题研究列表
...@@ -40,10 +52,37 @@ public class SchoolXprojectResearchController extends BaseController { ...@@ -40,10 +52,37 @@ public class SchoolXprojectResearchController extends BaseController {
{ {
//过滤未提交的数据 //过滤未提交的数据
schoolXprojectResearchVo.setAuditState("0"); schoolXprojectResearchVo.setAuditState("0");
//获取当前登陆人信息
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(); startPage();
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo); List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
return getDataTable(list); return getDataTable(list);
} }
}
return getDataTable(new ArrayList<>());
}
/** /**
* 查询课题研究列表(个人) * 查询课题研究列表(个人)
...@@ -89,6 +128,12 @@ public class SchoolXprojectResearchController extends BaseController { ...@@ -89,6 +128,12 @@ public class SchoolXprojectResearchController extends BaseController {
int i = 0; int i = 0;
//过滤未提交的数据 //过滤未提交的数据
schoolXprojectResearchVo.setAuditState("0"); schoolXprojectResearchVo.setAuditState("0");
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()) {
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo); List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
for (SchoolXprojectResearchVo xprojectResearchVo : list) { for (SchoolXprojectResearchVo xprojectResearchVo : list) {
i ++; i ++;
...@@ -98,6 +143,38 @@ public class SchoolXprojectResearchController extends BaseController { ...@@ -98,6 +143,38 @@ public class SchoolXprojectResearchController extends BaseController {
ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class); ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class);
util.exportExcel(response, list, "课题研究数据"); util.exportExcel(response, list, "课题研究数据");
} }
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, new ArrayList<>(), "课题研究数据");
}
/** /**
* 获取课题研究详细信息 * 获取课题研究详细信息
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteacherAwardsController.java
package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn; package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils; 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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -21,6 +27,8 @@ import com.ruoyi.common.utils.poi.ExcelUtil; ...@@ -21,6 +27,8 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteacherAwards; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteacherAwards;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteacherAwardsService; 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; import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteacherAwardsVo;
/** /**
...@@ -35,6 +43,10 @@ public class SchoolXteacherAwardsController extends BaseController ...@@ -35,6 +43,10 @@ public class SchoolXteacherAwardsController extends BaseController
{ {
@Autowired @Autowired
private ISchoolXteacherAwardsService schoolXteacherAwardsService; private ISchoolXteacherAwardsService schoolXteacherAwardsService;
@Autowired
private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
@Autowired
private ISysDeptService sysDeptService;
/** /**
* 查询教师获奖列表 * 查询教师获奖列表
...@@ -43,12 +55,39 @@ public class SchoolXteacherAwardsController extends BaseController ...@@ -43,12 +55,39 @@ public class SchoolXteacherAwardsController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SchoolXteacherAwardsVo schoolXteacherAwardsVo) public TableDataInfo list(SchoolXteacherAwardsVo schoolXteacherAwardsVo)
{ {
//查询审核中的数据 //过滤未提交的数据
schoolXteacherAwardsVo.setAuditState("0"); schoolXteacherAwardsVo.setAuditState("0");
//获取当前登陆人信息
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(); startPage();
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo); List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
return getDataTable(list); return getDataTable(list);
} }
}
return getDataTable(new ArrayList<>());
}
/** /**
* 查询教师获奖列表(个人) * 查询教师获奖列表(个人)
...@@ -92,8 +131,14 @@ public class SchoolXteacherAwardsController extends BaseController ...@@ -92,8 +131,14 @@ public class SchoolXteacherAwardsController extends BaseController
public void export(HttpServletResponse response, SchoolXteacherAwardsVo schoolXteacherAwardsVo) public void export(HttpServletResponse response, SchoolXteacherAwardsVo schoolXteacherAwardsVo)
{ {
int i = 0; int i = 0;
//查询审核中的数据 //过滤未提交的数据
schoolXteacherAwardsVo.setAuditState("0"); schoolXteacherAwardsVo.setAuditState("0");
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()) {
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo); List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
for (SchoolXteacherAwardsVo xteacherAwardsVo : list) { for (SchoolXteacherAwardsVo xteacherAwardsVo : list) {
i ++; i ++;
...@@ -103,6 +148,38 @@ public class SchoolXteacherAwardsController extends BaseController ...@@ -103,6 +148,38 @@ public class SchoolXteacherAwardsController extends BaseController
ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class); ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class);
util.exportExcel(response, list, "教师获奖数据"); util.exportExcel(response, list, "教师获奖数据");
} }
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, new ArrayList<>(), "教师获奖数据");
}
/** /**
* 获取教师获奖详细信息 * 获取教师获奖详细信息
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteachingAchievementsController.java
package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn; package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser; 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 com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ISysDictDataService;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -27,6 +33,7 @@ import com.ruoyi.common.core.page.TableDataInfo; ...@@ -27,6 +33,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteachingAchievements; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteachingAchievements;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService; import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXacademicWorksVo;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo; import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo;
/** /**
...@@ -41,6 +48,8 @@ public class SchoolXteachingAchievementsController extends BaseController ...@@ -41,6 +48,8 @@ public class SchoolXteachingAchievementsController extends BaseController
{ {
@Autowired @Autowired
private ISchoolXteachingAchievementsService schoolXteachingAchievementsService; private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
@Autowired
private ISysDeptService sysDeptService;
/** /**
* 查询教学成绩列表 * 查询教学成绩列表
...@@ -49,10 +58,65 @@ public class SchoolXteachingAchievementsController extends BaseController ...@@ -49,10 +58,65 @@ public class SchoolXteachingAchievementsController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SchoolXteachingAchievementsVo schoolXteachingAchievementsVo) public TableDataInfo list(SchoolXteachingAchievementsVo schoolXteachingAchievementsVo)
{ {
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()) {
startPage();
List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
return getDataTable(list);
}
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jxcj_admin")){
startPage();
List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
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;
// }else {
// String[] split = sysDept.getAncestors().split(",");
// if (split.length == 2){
// deptId = sysDept.getDeptId();
// }
// }
// }
// if (StringUtils.isNull(deptId)){
// for (Long ksDeptId : ksDeptIds) {
// if (sysDept.getAncestors().contains(ksDeptId.toString())){
// deptId = ksDeptId;
// }else {
// String[] split = sysDept.getAncestors().split(",");
// if (split.length == 3){
// deptId = sysDept.getDeptId();
// }
// }
// }
// }
//查询本部门下所有教师的身份证号
List<String> deptUserIds = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolXteachingAchievementsVo.setIdCards(deptUserIds);
}
startPage(); startPage();
List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo); List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
return getDataTable(list); return getDataTable(list);
} }
}
return getDataTable(new ArrayList<>());
}
/** /**
* 导出教学成绩列表 * 导出教学成绩列表
...@@ -63,6 +127,66 @@ public class SchoolXteachingAchievementsController extends BaseController ...@@ -63,6 +127,66 @@ public class SchoolXteachingAchievementsController extends BaseController
public void export(HttpServletResponse response, SchoolXteachingAchievementsVo schoolXteachingAchievementsVo) public void export(HttpServletResponse response, SchoolXteachingAchievementsVo schoolXteachingAchievementsVo)
{ {
int i = 0; int i = 0;
//获取当前登陆人信息
SysUser user = SecurityUtils.getLoginUser().getUser();
//获取当前登陆人的角色信息
List<SysRole> roles = user.getRoles();
if (user.isAdmin()) {
List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
for (SchoolXteachingAchievementsVo schoolXteachingAchievementsVo1 : list) {
i ++;
schoolXteachingAchievementsVo1.setXh(i);
}
ExcelUtil<SchoolXteachingAchievementsVo> util = new ExcelUtil<SchoolXteachingAchievementsVo>(SchoolXteachingAchievementsVo.class);
util.exportExcel(response, list, "教学成绩数据");
}
for (SysRole role : roles) {
if (role.getRoleKey().equals("jsdzdncj_admin") || role.getRoleKey().equals("jxcj_admin")){
List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
for (SchoolXteachingAchievementsVo schoolXteachingAchievementsVo1 : list) {
i ++;
schoolXteachingAchievementsVo1.setXh(i);
}
ExcelUtil<SchoolXteachingAchievementsVo> util = new ExcelUtil<SchoolXteachingAchievementsVo>(SchoolXteachingAchievementsVo.class);
util.exportExcel(response, list, "教学成绩数据");
}else if (role.getRoleKey().equals("jsdnzj_admin")){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
// Long deptId = null;
//根据用户部门id查询用户部门信息
SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
//判断用户部门属于科室还是级部
// //查询所有级部id
// List<Long> jbDeptIds = schoolXteachingAchievementsService.getJbDeptId();
// //查询所有科室id
// List<Long> ksDeptIds = schoolXteachingAchievementsService.getKsDeptId();
// for (Long jbDeptId : jbDeptIds) {
// if (sysDept.getAncestors().contains(jbDeptId.toString())){
// deptId = jbDeptId;
// }else {
// String[] split = sysDept.getAncestors().split(",");
// if (split.length == 2){
// deptId = sysDept.getDeptId();
// }
// }
// }
// if (StringUtils.isNull(deptId)){
// for (Long ksDeptId : ksDeptIds) {
// if (sysDept.getAncestors().contains(ksDeptId.toString())){
// deptId = ksDeptId;
// }else {
// String[] split = sysDept.getAncestors().split(",");
// if (split.length == 3){
// deptId = sysDept.getDeptId();
// }
// }
// }
// }
//查询本部门下所有教师的身份证号
List<String> deptUserIds = schoolXteachingAchievementsService.getUserIdCardsByDeptId(sysDept.getDeptId());
if (deptUserIds.size() > 0){
schoolXteachingAchievementsVo.setIdCards(deptUserIds);
}
List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo); List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
for (SchoolXteachingAchievementsVo schoolXteachingAchievementsVo1 : list) { for (SchoolXteachingAchievementsVo schoolXteachingAchievementsVo1 : list) {
i ++; i ++;
...@@ -71,6 +195,10 @@ public class SchoolXteachingAchievementsController extends BaseController ...@@ -71,6 +195,10 @@ public class SchoolXteachingAchievementsController extends BaseController
ExcelUtil<SchoolXteachingAchievementsVo> util = new ExcelUtil<SchoolXteachingAchievementsVo>(SchoolXteachingAchievementsVo.class); ExcelUtil<SchoolXteachingAchievementsVo> util = new ExcelUtil<SchoolXteachingAchievementsVo>(SchoolXteachingAchievementsVo.class);
util.exportExcel(response, list, "教学成绩数据"); util.exportExcel(response, list, "教学成绩数据");
} }
}
ExcelUtil<SchoolXteachingAchievementsVo> util = new ExcelUtil<SchoolXteachingAchievementsVo>(SchoolXteachingAchievementsVo.class);
util.exportExcel(response, new ArrayList<>(), "教学成绩数据");
}
/* /*
* 下载模板 * 下载模板
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAclassTeacherAssessment.java
...@@ -26,19 +26,19 @@ public class SchoolAclassTeacherAssessment extends BaseEntity ...@@ -26,19 +26,19 @@ public class SchoolAclassTeacherAssessment extends BaseEntity
private Long id; private Long id;
/** 学期(下拉框) */ /** 学期(下拉框) */
@Excel(name = "学期",dictType = "semester_jsdzda") @Excel(name = "学期")
private String semester; private String semester;
/** 届别(下拉框) */ /** 届别(下拉框) */
@Excel(name = "届别",dictType = "rankda") @Excel(name = "届别")
private String year; private String year;
/** 学年(下拉框) */ /** 学年(下拉框) */
@Excel(name = "学年",dictType = "yearda") @Excel(name = "学年")
private String schoolYear; private String schoolYear;
/** 年级(下拉框) */ /** 年级(下拉框) */
@Excel(name = "年级",dictType = "grade_da") @Excel(name = "年级")
private String grade; private String grade;
/** 班级(下拉框) */ /** 班级(下拉框) */
...@@ -66,11 +66,11 @@ public class SchoolAclassTeacherAssessment extends BaseEntity ...@@ -66,11 +66,11 @@ public class SchoolAclassTeacherAssessment extends BaseEntity
private BigDecimal totalCheckAchievement; private BigDecimal totalCheckAchievement;
/** 班级类型(下拉框) */ /** 班级类型(下拉框) */
@Excel(name = "班级类型",dictType = "class_type") @Excel(name = "班级类型")
private String classType; private String classType;
/** 学科(下拉框) */ /** 学科(下拉框) */
@Excel(name = "学科",dictType = "teaching_subjects") @Excel(name = "学科")
private String sub; private String sub;
/** 备注*/ /** 备注*/
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkload.java
...@@ -6,6 +6,8 @@ import lombok.Data; ...@@ -6,6 +6,8 @@ import lombok.Data;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import java.math.BigDecimal;
/** /**
* 工作量信息对象 school_aworkload * 工作量信息对象 school_aworkload
* *
...@@ -57,13 +59,13 @@ public class SchoolAworkload extends BaseEntity ...@@ -57,13 +59,13 @@ public class SchoolAworkload extends BaseEntity
private String classType; private String classType;
/** 早读 */ /** 早读 */
private Long earlyReading; private BigDecimal earlyReading;
/** 正课 */ /** 正课 */
private Long requiredCourses; private BigDecimal requiredCourses;
/** 晚自习 */ /** 晚自习 */
private Long eveningSelfStudy; private BigDecimal eveningSelfStudy;
/** 证明人id */ /** 证明人id */
private Long userId; private Long userId;
...@@ -75,7 +77,7 @@ public class SchoolAworkload extends BaseEntity ...@@ -75,7 +77,7 @@ public class SchoolAworkload extends BaseEntity
private String delFlag; private String delFlag;
/**合计*/ /**合计*/
private Long amountTo; private BigDecimal amountTo;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkloadExport.java
...@@ -4,6 +4,8 @@ import com.ruoyi.common.annotation.Excel; ...@@ -4,6 +4,8 @@ import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
/** /**
* 工作量信息对象 school_aworkload * 工作量信息对象 school_aworkload
* *
...@@ -19,35 +21,35 @@ public class SchoolAworkloadExport extends BaseEntity ...@@ -19,35 +21,35 @@ public class SchoolAworkloadExport extends BaseEntity
private Long id; private Long id;
/** 学年(下拉框) */ /** 学年(下拉框) */
@Excel(name = "学年",dictType="yearda" ,required = true) @Excel(name = "学年")
private String schoolYear; private String schoolYear;
/** 学期(下拉框) */ /** 学期(下拉框) */
@Excel(name = "学期",dictType="semester_jsdzda",required = true) @Excel(name = "学期")
private String semester; private String semester;
/** 届别(下拉框) */ /** 届别(下拉框) */
@Excel(name = "届别",dictType = "rankda",required = true) @Excel(name = "届别")
private String year; private String year;
/** 年级(下拉框) */ /** 年级(下拉框) */
@Excel(name = "年级",dictType="grade_da",required = true) @Excel(name = "年级")
private String grade; private String grade;
/** 姓名 */ /** 姓名 */
@Excel(name = "姓名",required = true) @Excel(name = "姓名")
private String name; private String name;
/** 学科(下拉框) */ /** 学科(下拉框) */
@Excel(name = "学科",dictType = "teaching_subjects",required = true) @Excel(name = "学科")
private String sub; private String sub;
/** 身份证号 */ /** 身份证号 */
@Excel(name = "身份证号",required = true) @Excel(name = "身份证号")
private String idCard; private String idCard;
/** 聘任岗位(下拉框) */ /** 聘任岗位(下拉框) */
@Excel(name = "聘任岗位",dictType = "appointment_positions",required = true) @Excel(name = "聘任岗位")
private String appointmentPost; private String appointmentPost;
/** 聘任职务 */ /** 聘任职务 */
...@@ -55,11 +57,11 @@ public class SchoolAworkloadExport extends BaseEntity ...@@ -55,11 +57,11 @@ public class SchoolAworkloadExport extends BaseEntity
private String appointmentPosition; private String appointmentPosition;
/** 聘任情况(下拉框) */ /** 聘任情况(下拉框) */
@Excel(name = "聘任情况",dictType = "appointment_situation") @Excel(name = "聘任情况")
private String appointmentSituation; private String appointmentSituation;
/** 班级 */ /** 班级 */
@Excel(name = "班级",prompt="多个，中间用英文“,”间隔",required = true) @Excel(name = "班级",prompt="多个，中间用英文“,”间隔")
private String className; private String className;
/** 班级类型 */ /** 班级类型 */
...@@ -67,26 +69,26 @@ public class SchoolAworkloadExport extends BaseEntity ...@@ -67,26 +69,26 @@ public class SchoolAworkloadExport extends BaseEntity
private String classType; private String classType;
/** 早读 */ /** 早读 */
@Excel(name = "早读",required = true) @Excel(name = "早读")
private Long earlyReading; private BigDecimal earlyReading;
/** 正课 */ /** 正课 */
@Excel(name = "正课",required = true) @Excel(name = "正课")
private Long requiredCourses; private BigDecimal requiredCourses;
/** 晚自习 */ /** 晚自习 */
@Excel(name = "晚自习",required = true) @Excel(name = "晚自习")
private Long eveningSelfStudy; private BigDecimal eveningSelfStudy;
/**合计*/ /**合计*/
@Excel(name = "合计") @Excel(name = "合计")
private Long amountTo; private BigDecimal amountTo;
/** 证明人id */ /** 证明人id */
private Long userId; private Long userId;
/** 证明人 */ /** 证明人 */
@Excel(name = "证明人",required = true) @Excel(name = "证明人")
private String userName; private String userName;
@Excel(name = "备注") @Excel(name = "备注")
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolAworkloadVo.java
...@@ -4,6 +4,8 @@ import com.ruoyi.common.annotation.Excel; ...@@ -4,6 +4,8 @@ import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
/** /**
* 工作量信息对象 school_aworkload * 工作量信息对象 school_aworkload
* *
...@@ -53,16 +55,16 @@ public class SchoolAworkloadVo extends BaseEntity ...@@ -53,16 +55,16 @@ public class SchoolAworkloadVo extends BaseEntity
private String classType; private String classType;
/** 早读 */ /** 早读 */
private Long earlyReading; private BigDecimal earlyReading;
/** 正课 */ /** 正课 */
private Long requiredCourses; private BigDecimal requiredCourses;
/** 晚自习 */ /** 晚自习 */
private Long eveningSelfStudy; private BigDecimal eveningSelfStudy;
/**合计*/ /**合计*/
private Long amountTo; private BigDecimal amountTo;
/** 证明人id */ /** 证明人id */
private Long userId; private Long userId;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolCheckVo.java 0 → 100644
package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import lombok.Data;
import java.util.Date;
/**
* 校验对象
*/
@Data
public class SchoolCheckVo {
private Boolean flag = false;
/**
* 数值
*/
private String val;
/**
* 对象
*/
private Date date;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasicInformation.java
...@@ -24,13 +24,13 @@ public class SchoolTeacherBasicInformation extends BaseEntity { ...@@ -24,13 +24,13 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
/** /**
* 姓名 * 姓名
*/ */
@Excel(name = "姓名",required = true) @Excel(name = "姓名")
private String name; private String name;
/** /**
* 身份证号 * 身份证号
*/ */
@Excel(name = "身份证号",required = true) @Excel(name = "身份证号")
private String idCard; private String idCard;
/** /**
...@@ -78,7 +78,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity { ...@@ -78,7 +78,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
/** /**
* 政治面貌(1中共党员、2共青团员、3群众、4民主党派成员、5无党派人士) * 政治面貌(1中共党员、2共青团员、3群众、4民主党派成员、5无党派人士)
*/ */
@Excel(name = "政治面貌",dictType = "politics_tatusls") @Excel(name = "政治面貌")
private String politicalLandscape; private String politicalLandscape;
/** /**
...@@ -91,13 +91,13 @@ public class SchoolTeacherBasicInformation extends BaseEntity { ...@@ -91,13 +91,13 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
/** /**
* 任教学科(1语文、2数学、3英语、4物理、5化学、6生物、7政治、8历史、9地理、10音乐、11体育、12美术、13技术、14心理、15书法) * 任教学科(1语文、2数学、3英语、4物理、5化学、6生物、7政治、8历史、9地理、10音乐、11体育、12美术、13技术、14心理、15书法)
*/ */
@Excel(name = "任教学科",dictType = "teaching_subjects",required = true) @Excel(name = "任教学科")
private String teachingSubject; private String teachingSubject;
/** /**
* 现职称(1无、2初级、3中级、4副高、5正高) * 现职称(1无、2初级、3中级、4副高、5正高)
*/ */
@Excel(name = "现职称",dictType = "current_professional") @Excel(name = "现职称")
private String currentProfessionalTitle; private String currentProfessionalTitle;
/** /**
...@@ -110,7 +110,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity { ...@@ -110,7 +110,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
/** /**
* 现聘职称(1无、2初级、3中级、4副高、5正高) * 现聘职称(1无、2初级、3中级、4副高、5正高)
*/ */
@Excel(name = "现聘职称",dictType = "current_professional") @Excel(name = "现聘职称")
private String currentHiringProfessionalTitle; private String currentHiringProfessionalTitle;
/** /**
...@@ -123,14 +123,14 @@ public class SchoolTeacherBasicInformation extends BaseEntity { ...@@ -123,14 +123,14 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
/** /**
* 现聘岗位(1专业技术岗、2管理岗、3工勤岗) * 现聘岗位(1专业技术岗、2管理岗、3工勤岗)
*/ */
@Excel(name = "现聘岗位",dictType = "current_position") @Excel(name = "现聘岗位")
private String currentPosition; private String currentPosition;
/** /**
* 现岗位等级(见习（三个现聘岗位都有见习这个等级 下拉框联动）、专业技术三级-专业技术十三级、 * 现岗位等级(见习（三个现聘岗位都有见习这个等级 下拉框联动）、专业技术三级-专业技术十三级、
* 管理五级-管理九级、技术工二级-技术工五级) * 管理五级-管理九级、技术工二级-技术工五级)
*/ */
@Excel(name = "现岗位等级",dictType = "current_joblevel") @Excel(name = "现岗位等级")
private String currentJobLevel; private String currentJobLevel;
/** /**
...@@ -167,7 +167,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity { ...@@ -167,7 +167,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
/** /**
* 到二中工作时间 * 到二中工作时间
*/ */
@Excel(name = "到二中工作时间",required = true) @Excel(name = "到二中工作时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
private Date toSecondMiddleSchoolTime; private Date toSecondMiddleSchoolTime;
...@@ -196,13 +196,13 @@ public class SchoolTeacherBasicInformation extends BaseEntity { ...@@ -196,13 +196,13 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
/** /**
* 在岗情况(1教学岗位、2教辅岗、3后勤岗、4管理岗、5其他岗、6退休、7行政、8内退岗、9待退岗) * 在岗情况(1教学岗位、2教辅岗、3后勤岗、4管理岗、5其他岗、6退休、7行政、8内退岗、9待退岗)
*/ */
@Excel(name = "在岗情况",dictType ="duty_situation") @Excel(name = "在岗情况")
private String onDutySituation; private String onDutySituation;
/** /**
* 在编情况 1在编 2合同制 * 在编情况 1在编 2合同制
*/ */
@Excel(name = "在编情况",dictType ="current_situation") @Excel(name = "在编情况")
private String currentSituation; private String currentSituation;
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolAnnualAssessment/SchoolAnnualAssessmentMapper.java
...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.mapper.schoolAnnualAssessment; ...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.mapper.schoolAnnualAssessment;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment; import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
import yangtz.cs.liu.campus.vo.schoolAnnualAssessment.SchoolAnnualAssessmentVo;
import java.util.List; import java.util.List;
...@@ -24,10 +25,10 @@ public interface SchoolAnnualAssessmentMapper extends BaseMapper<SchoolAnnualAss ...@@ -24,10 +25,10 @@ public interface SchoolAnnualAssessmentMapper extends BaseMapper<SchoolAnnualAss
/** /**
* 查询年度考核列表 * 查询年度考核列表
* *
* @param schoolAnnualAssessment 年度考核 * @param schoolAnnualAssessmentVo 年度考核
* @return 年度考核集合 * @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 ...@@ -75,6 +75,13 @@ public interface SchoolXteachingAchievementsMapper extends BaseMapper<SchoolXtea
List<Long> getUserIdsByDeptId(@Param("deptId") Long deptId); List<Long> getUserIdsByDeptId(@Param("deptId") Long deptId);
/** /**
* 查询本部门下所有教师身份证号
* @param deptId
* @return
*/
List<String> getUserIdCardsByDeptId(@Param("deptId") Long deptId);
/**
* 查询所有级部id * 查询所有级部id
* @return * @return
*/ */
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolAnnualAssessment/SchoolAnnualAssessmentServiceImpl.java
...@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; ...@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment; import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
import yangtz.cs.liu.campus.mapper.schoolAnnualAssessment.SchoolAnnualAssessmentMapper; import yangtz.cs.liu.campus.mapper.schoolAnnualAssessment.SchoolAnnualAssessmentMapper;
import yangtz.cs.liu.campus.service.schoolAnnualAssessment.ISchoolAnnualAssessmentService; import yangtz.cs.liu.campus.service.schoolAnnualAssessment.ISchoolAnnualAssessmentService;
import yangtz.cs.liu.campus.vo.schoolAnnualAssessment.SchoolAnnualAssessmentVo;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.*; import java.io.*;
...@@ -50,13 +51,13 @@ public class SchoolAnnualAssessmentServiceImpl extends ServiceImpl<SchoolAnnualA ...@@ -50,13 +51,13 @@ public class SchoolAnnualAssessmentServiceImpl extends ServiceImpl<SchoolAnnualA
/** /**
* 查询年度考核列表 * 查询年度考核列表
* *
* @param schoolAnnualAssessment 年度考核 * @param schoolAnnualAssessmentVo 年度考核
* @return 年度考核 * @return 年度考核
*/ */
@Override @Override
public List<SchoolAnnualAssessment> selectSchoolAnnualAssessmentList(SchoolAnnualAssessment schoolAnnualAssessment) public List<SchoolAnnualAssessment> selectSchoolAnnualAssessmentList(SchoolAnnualAssessmentVo schoolAnnualAssessmentVo)
{ {
return schoolAnnualAssessmentMapper.selectSchoolAnnualAssessmentList(schoolAnnualAssessment); return schoolAnnualAssessmentMapper.selectSchoolAnnualAssessmentList(schoolAnnualAssessmentVo);
} }
/** /**
...@@ -147,7 +148,7 @@ public class SchoolAnnualAssessmentServiceImpl extends ServiceImpl<SchoolAnnualA ...@@ -147,7 +148,7 @@ public class SchoolAnnualAssessmentServiceImpl extends ServiceImpl<SchoolAnnualA
if (schoolAnnualAssessment.getYear().toString().length() != 4){ if (schoolAnnualAssessment.getYear().toString().length() != 4){
failureNum++; failureNum++;
failureMsg.append("<br/>" + failureNum + "、年度输入错误,请您重新输入! "); failureMsg.append("<br/>" + failureNum + "、年度输入错误,请您重新输入! ");
} }else {
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
if (!Character.isDigit(schoolAnnualAssessment.getYear().toString().charAt(i))){ if (!Character.isDigit(schoolAnnualAssessment.getYear().toString().charAt(i))){
failureNum++; failureNum++;
...@@ -180,6 +181,7 @@ public class SchoolAnnualAssessmentServiceImpl extends ServiceImpl<SchoolAnnualA ...@@ -180,6 +181,7 @@ public class SchoolAnnualAssessmentServiceImpl extends ServiceImpl<SchoolAnnualA
} }
} }
} }
}
if (failureNum > 0) { if (failureNum > 0) {
failureMsg.insert(0, "很抱歉，导入失败！共" + failureNum + "条数据格式不正确，错误如下："); failureMsg.insert(0, "很抱歉，导入失败！共" + failureNum + "条数据格式不正确，错误如下：");
throw new ServiceException(failureMsg.toString()); throw new ServiceException(failureMsg.toString());
...@@ -195,7 +197,7 @@ public class SchoolAnnualAssessmentServiceImpl extends ServiceImpl<SchoolAnnualA ...@@ -195,7 +197,7 @@ public class SchoolAnnualAssessmentServiceImpl extends ServiceImpl<SchoolAnnualA
public String importData(List<SchoolAnnualAssessment> list) { 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 schoolAnnualAssessment : list) {
//根据年度、姓名、身份证、去查询是否有记录，有则更新，无则新增 //根据年度、姓名、身份证、去查询是否有记录，有则更新，无则新增
for (SchoolAnnualAssessment annualAssessment : schoolAnnualAssessmentList) { for (SchoolAnnualAssessment annualAssessment : schoolAnnualAssessmentList) {
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentServiceImpl.java
package yangtz.cs.liu.campus.service.impl.schoolNewTeacherDzdn; package yangtz.cs.liu.campus.service.impl.schoolNewTeacherDzdn;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.ParseException;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessment; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.*;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentReq;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentVo;
import yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentMapper; import yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentMapper;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAclassTeacherAssessmentService; import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAclassTeacherAssessmentService;
...@@ -26,6 +27,9 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School ...@@ -26,6 +27,9 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School
@Autowired @Autowired
private SchoolAclassTeacherAssessmentMapper schoolAclassTeacherAssessmentMapper; private SchoolAclassTeacherAssessmentMapper schoolAclassTeacherAssessmentMapper;
@Autowired
ISchoolAclassTeacherAssessmentService schoolAclassTeacherAssessmentService;
/** /**
* 查询班主任考核 * 查询班主任考核
* *
...@@ -39,6 +43,194 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School ...@@ -39,6 +43,194 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School
} }
/** /**
* 校验数据
* @param detailList
* @return
*/
@Override
public AjaxResult saveCheckedDate(List<SchoolAclassTeacherAssessment> detailList) {
String s = this.dataCheck(detailList);
if (!StringUtils.isEmpty(s)){
return AjaxResult.error(s);
}
boolean b = schoolAclassTeacherAssessmentService.saveBatch(detailList);
return AjaxResult.success("导入数据:"+detailList.size()+"条");
}
public String dataCheck(List<SchoolAclassTeacherAssessment> list){
StringBuffer sb = new StringBuffer();
SchoolCheckVo schoolCheckVo = null;
for (SchoolAclassTeacherAssessment date :list) {
//非空验证
//学年
if (StringUtils.isEmpty(date.getSchoolYear())) {
sb.append("学年 字段不能为空");
sb.append("<br/>");
}
//学期
if (StringUtils.isEmpty(date.getSemester())) {
sb.append("学期字段不能为空");
sb.append("<br/>");
}
//届别
if (StringUtils.isEmpty(date.getYear())) {
sb.append("届别字段不能为空");
sb.append("<br/>");
}
//年纪
if (StringUtils.isEmpty(date.getGrade())) {
sb.append("年纪字段不能为空");
sb.append("<br/>");
}
//教师姓名
if (StringUtils.isEmpty(date.getTeacherName())) {
sb.append("教师姓名字段不能为空");
sb.append("<br/>");
}
//班级
if (StringUtils.isEmpty(date.getClassName())) {
sb.append("班级字段不能为空");
sb.append("<br/>");
}
//身份证号
if (StringUtils.isEmpty(date.getIdCard())) {
sb.append("身份证号字段不能为空");
sb.append("<br/>");
}
//德育考核成绩
if (date.getMoralEduCheckAchievement() == null) {
sb.append("德育考核成绩字段不能为空");
sb.append("<br/>");
}
//智育考核成绩
if (date.getIntellEduCheckAchievement() == null) {
sb.append("智育考核成绩字段不能为空");
sb.append("<br/>");
}
//总考核成绩
if (date.getTotalCheckAchievement() == null) {
sb.append("总考核成绩字段不能为空");
sb.append("<br/>");
}
//班级类型
if (StringUtils.isEmpty(date.getClassType())) {
sb.append("班级类型字段不能为空");
sb.append("<br/>");
}
//学科
if (StringUtils.isEmpty(date.getSub())) {
sb.append("班学科字段不能为空");
sb.append("<br/>");
}
}
if (!StringUtils.isEmpty(sb.toString())){
return sb.toString();
}
for (SchoolAclassTeacherAssessment date :list) {
//类型验证
//学年
schoolCheckVo = checkeDicet("yearda", date.getSchoolYear());
if (schoolCheckVo !=null){
if (schoolCheckVo.getFlag()){
date.setSchoolYear(schoolCheckVo.getVal());
}else {
sb.append(date.getTeacherName()+"用户 学年 录入不符合选择项:"+schoolCheckVo.getVal() );
sb.append("<br/>");
}
}
//学期
schoolCheckVo = checkeDicet("semester_jsdzda", date.getSemester());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setSemester(schoolCheckVo.getVal());
} else {
sb.append(date.getTeacherName() + "用户 学期 录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
//届别
schoolCheckVo = checkeDicet("rankda", date.getYear());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setYear(schoolCheckVo.getVal());
} else {
sb.append(date.getTeacherName() + "用户 届别 录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
//年级
schoolCheckVo = checkeDicet("grade_da", date.getGrade());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setGrade(schoolCheckVo.getVal());
} else {
sb.append(date.getTeacherName() + "用户 年级 录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
//学科
schoolCheckVo = checkeDicet("teaching_subjects", date.getSub());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setSub(schoolCheckVo.getVal());
} else {
sb.append(date.getTeacherName() + "用户 学科 录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
//身份证号
if (date.getIdCard().length() != 18){
sb.append(date.getTeacherName()+"用户 身份证号 录入信息错误");
sb.append("<br/>");
}
}
return sb.toString();
}
/**
* 校验字典数据
* @param type 类型 vlaue 值
* @return
* @throws ParseException
*/
public SchoolCheckVo checkeDicet(String type, String value){
SchoolCheckVo sc = new SchoolCheckVo();
if (StringUtils.isEmpty(value)){
return null;
}
if (StringUtils.isEmpty(value)){
sc.setFlag(false);
sc.setVal(value);
return sc;
}
//解析值
String val = DictUtils.getDictValue(type, value, ",");
if (StringUtils.isEmpty(val)){
sc.setFlag(false);
sc.setVal(value);
return sc;
}
if (StringUtils.isEmpty(val)){
sc.setFlag(false);
sc.setVal(value);
}else {
sc.setFlag(true);
sc.setVal(val);
}
return sc;
}
/**
* 查询班主任考核列表 * 查询班主任考核列表
* *
* @param * @param
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolAworkloadServiceImpl.java
package yangtz.cs.liu.campus.service.impl.schoolNewTeacherDzdn; package yangtz.cs.liu.campus.service.impl.schoolNewTeacherDzdn;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkload; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkload;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadExport; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadExport;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolCheckVo;
import yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolAworkloadMapper; import yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolAworkloadMapper;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAworkloadService; import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAworkloadService;
...@@ -24,6 +31,9 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp ...@@ -24,6 +31,9 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
@Autowired @Autowired
private SchoolAworkloadMapper schoolAworkloadMapper; private SchoolAworkloadMapper schoolAworkloadMapper;
@Autowired
private ISchoolAworkloadService iSchoolAworkloadService;
/** /**
* 查询工作量信息 * 查询工作量信息
* *
...@@ -34,11 +44,254 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp ...@@ -34,11 +44,254 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
public SchoolAworkload selectSchoolAworkloadById(Long id) public SchoolAworkload selectSchoolAworkloadById(Long id)
{ {
SchoolAworkload date = schoolAworkloadMapper.selectSchoolAworkloadById(id); SchoolAworkload date = schoolAworkloadMapper.selectSchoolAworkloadById(id);
date.setAmountTo(date.getEarlyReading()+date.getRequiredCourses()+date.getEveningSelfStudy()); date.setAmountTo(date.getEarlyReading().add(date.getRequiredCourses()).add(date.getEveningSelfStudy()));
return date; return date;
} }
/** /**
* 新增并校验
* @return
*/
@Override
public AjaxResult saveAndChecked(List<SchoolAworkload> list) {
String s = this.dataCheck(list);
if (!StringUtils.isEmpty(s)){
return AjaxResult.error(s);
}
//1.插入数据
boolean b = iSchoolAworkloadService.saveBatch(list);
return AjaxResult.success("导入数据:"+list.size());
}
public String dataCheck(List<SchoolAworkload> list){
StringBuffer sb = new StringBuffer();
SchoolCheckVo schoolCheckVo = null;
for (SchoolAworkload date: list) {
//非空验证
//学年
if (StringUtils.isEmpty(date.getSchoolYear())) {
sb.append("学年字段不能为空");
sb.append("<br/>");
}
//学期
if (StringUtils.isEmpty(date.getSemester())) {
sb.append("学期字段不能为空");
sb.append("<br/>");
}
//届别
if (StringUtils.isEmpty(date.getYear())) {
sb.append("届别字段不能为空");
sb.append("<br/>");
}
//年纪
if (StringUtils.isEmpty(date.getGrade())) {
sb.append("年纪字段不能为空");
sb.append("<br/>");
}
//姓名
if (StringUtils.isEmpty(date.getName())) {
sb.append("姓名字段不能为空");
sb.append("<br/>");
}
//学科
if (StringUtils.isEmpty(date.getSub())) {
sb.append("学科字段不能为空");
sb.append("<br/>");
}
//身份证号
if (StringUtils.isEmpty(date.getIdCard())) {
sb.append("身份证号不能为空");
sb.append("<br/>");
}
//聘任岗位
if (StringUtils.isEmpty(date.getAppointmentPost())) {
sb.append("聘任岗位不能为空");
sb.append("<br/>");
}
//班级
if (StringUtils.isEmpty(date.getClassName())) {
sb.append("班级不能为空");
sb.append("<br/>");
}
//班级类型
if (StringUtils.isEmpty(date.getClassType())) {
sb.append("班级类型不能为空");
sb.append("<br/>");
}
//早读
if (date.getEarlyReading() == null) {
sb.append("早读不能为空");
sb.append("<br/>");
}
//正科
if (date.getRequiredCourses() == null) {
sb.append("正科不能为空");
sb.append("<br/>");
}
//晚自习
if (date.getEveningSelfStudy() == null) {
sb.append("晚自习不能为空");
sb.append("<br/>");
}
//证明人
if (date.getEveningSelfStudy() == null) {
sb.append("证明人不能为空");
sb.append("<br/>");
}
}
if (!StringUtils.isEmpty(sb.toString())){
return sb.toString();
}
//格式验证
for (SchoolAworkload date: list) {
//学年
schoolCheckVo = checkeDicet("yearda", date.getSchoolYear());
if (schoolCheckVo !=null){
if (schoolCheckVo.getFlag()){
date.setSchoolYear(schoolCheckVo.getVal());
}else {
sb.append(date.getName()+"用户 学年 录入不符合选择项:"+schoolCheckVo.getVal() );
sb.append("<br/>");
}
}
//学期
schoolCheckVo = checkeDicet("semester_jsdzda", date.getSemester());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setSemester(schoolCheckVo.getVal());
} else {
sb.append(date.getName() + "用户 学期 录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
//届别
schoolCheckVo = checkeDicet("rankda", date.getYear());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setYear(schoolCheckVo.getVal());
} else {
sb.append(date.getName() + "用户 届别 录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
//年级
schoolCheckVo = checkeDicet("grade_da", date.getGrade());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setGrade(schoolCheckVo.getVal());
} else {
sb.append(date.getName() + "用户 年级 录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
//学科
schoolCheckVo = checkeDicet("teaching_subjects", date.getSub());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setSub(schoolCheckVo.getVal());
} else {
sb.append(date.getName() + "用户 学科 录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
//身份证号
if (date.getIdCard().length() != 18){
sb.append(date.getName()+"用户 身份证号 录入信息错误");
sb.append("<br/>");
}
//聘任岗位
schoolCheckVo = checkeDicet("appointment_positions", date.getAppointmentPost());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setAppointmentPost(schoolCheckVo.getVal());
} else {
sb.append(date.getName() + "用户 聘任岗位 录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
//聘任情况
schoolCheckVo = checkeDicet("appointment_situation", date.getAppointmentSituation());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setAppointmentPost(schoolCheckVo.getVal());
} else {
sb.append(date.getName() + "用户 聘任情况 录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
}
return sb.toString();
}
/**
* 校验时间
* @param date
* @return
*/
public SchoolCheckVo checkeDateTime(Date date){
SchoolCheckVo sc = new SchoolCheckVo();
if (null == date){
sc.setFlag(false);
sc.setVal(null);
return sc;
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
try {
String format = sdf.format(date);
sc.setFlag(true);
sc.setVal(format);
sc.setDate( DateUtils.parseDate(format));
}catch (Exception e){
sc.setFlag(false);
sc.setVal(date.toString());
}
return sc;
}
/**
* 校验字典数据
* @param type 类型 vlaue 值
* @return
* @throws ParseException
*/
public SchoolCheckVo checkeDicet(String type,String value){
SchoolCheckVo sc = new SchoolCheckVo();
if (StringUtils.isEmpty(value)){
return null;
}
if (StringUtils.isEmpty(value)){
sc.setFlag(false);
sc.setVal(value);
return sc;
}
//解析值
String val = DictUtils.getDictValue(type, value, ",");
if (StringUtils.isEmpty(val)){
sc.setFlag(false);
sc.setVal(value);
return sc;
}
if (StringUtils.isEmpty(val)){
sc.setFlag(false);
sc.setVal(value);
}else {
sc.setFlag(true);
sc.setVal(val);
}
return sc;
}
/**
* 查询工作量信息列表 * 查询工作量信息列表
* *
* @param schoolAworkload 工作量信息 * @param schoolAworkload 工作量信息
...@@ -50,7 +303,7 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp ...@@ -50,7 +303,7 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
List<SchoolAworkloadVo> schoolAworkloadVos = schoolAworkloadMapper.selectSchoolAworkloadList(schoolAworkload); List<SchoolAworkloadVo> schoolAworkloadVos = schoolAworkloadMapper.selectSchoolAworkloadList(schoolAworkload);
//计算合计 //计算合计
for (SchoolAworkloadVo date : schoolAworkloadVos){ for (SchoolAworkloadVo date : schoolAworkloadVos){
date.setAmountTo(date.getEarlyReading()+date.getRequiredCourses()+date.getEveningSelfStudy()); date.setAmountTo(date.getEarlyReading().add(date.getRequiredCourses()).add(date.getEveningSelfStudy()));
} }
return schoolAworkloadVos; return schoolAworkloadVos;
} }
...@@ -62,7 +315,7 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp ...@@ -62,7 +315,7 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadMapper.selectAworkloadList(schoolAworkload); List<SchoolAworkloadExport> schoolAworkloadVos = schoolAworkloadMapper.selectAworkloadList(schoolAworkload);
//计算合计 //计算合计
for (SchoolAworkloadExport date : schoolAworkloadVos){ for (SchoolAworkloadExport date : schoolAworkloadVos){
date.setAmountTo(date.getEarlyReading()+date.getRequiredCourses()+date.getEveningSelfStudy()); date.setAmountTo(date.getEarlyReading().add(date.getRequiredCourses()).add(date.getEveningSelfStudy()));
} }
return schoolAworkloadVos; return schoolAworkloadVos;
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationServicelmpl.java
...@@ -7,10 +7,12 @@ import com.ruoyi.common.core.domain.AjaxResult; ...@@ -7,10 +7,12 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.UnPackeUtil; import com.ruoyi.common.utils.UnPackeUtil;
import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.MimeTypeUtils; import com.ruoyi.common.utils.file.MimeTypeUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.mapper.SysDictDataMapper; import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
...@@ -40,6 +42,7 @@ import yangtz.cs.liu.campus.service.impl.teacherFiles.IdCardNumberUtils; ...@@ -40,6 +42,7 @@ import yangtz.cs.liu.campus.service.impl.teacherFiles.IdCardNumberUtils;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.SchoolTeacherBasichlnformationService; import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.SchoolTeacherBasichlnformationService;
import yangtz.cs.liu.campus.vo.fudao.FudaoStudentVo; import yangtz.cs.liu.campus.vo.fudao.FudaoStudentVo;
import yangtz.cs.liu.campus.vo.fudao.FudaoTeacherVo; import yangtz.cs.liu.campus.vo.fudao.FudaoTeacherVo;
import yangtz.cs.liu.campus.vo.schoolAnnualAssessment.SchoolAnnualAssessmentVo;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.*; import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.*;
import java.io.*; import java.io.*;
...@@ -94,14 +97,39 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo ...@@ -94,14 +97,39 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
* @param schoolTeacherBasicInformations * @param schoolTeacherBasicInformations
* @return * @return
*/ */
@Transactional
@Override @Override
public Boolean saveOrUpdateList(List<SchoolTeacherBasicInformation> schoolTeacherBasicInformations) { public AjaxResult saveOrUpdateList(List<SchoolTeacherBasicInformation> schoolTeacherBasicInformations) {
//1查询所有老师信息 //与统计 几百条 //1查询所有老师信息 //与统计 几百条
String s = this.dataCheck(schoolTeacherBasicInformations);
if (!StringUtils.isEmpty(s)){
return AjaxResult.error(s);
}
Map<String,Long> mapList = new HashMap<>(); Map<String,Long> mapList = new HashMap<>();
List<SchoolIdCardQuerReq> schoolIdCardQuerReqs = teacherBasichlnformationMapper.selectByIdCardMap(); List<SchoolIdCardQuerReq> schoolIdCardQuerReqs = teacherBasichlnformationMapper.selectByIdCardMap();
for(SchoolIdCardQuerReq req :schoolIdCardQuerReqs){ for(SchoolIdCardQuerReq req :schoolIdCardQuerReqs){
mapList.put(req.getIdCard(),req.getId()); mapList.put(req.getIdCard(),req.getId());
} }
//
// for (SchoolTeacherBasicInformation date : schoolTeacherBasicInformations){
//// //1.处理出生日期
//// String birthDayFromIdCard = IdCardNumberUtils.getBirthDayFromIdCard(date.getIdCard());
//// date.setBirthDate(birthDayFromIdCard);
//// //2.处理性别
//// Map<String, Object> sexFromIdCard = IdCardNumberUtils.getSexFromIdCard(date.getIdCard());
//// Integer sex = (Integer) sexFromIdCard.get(IdCardNumberUtils.SEX_BY_INT_MAP_KEY);
//// if (null == sex){
////// return AjaxResult;
//// }
//// if (sex == 1){
//// date.setSex("0");
//// }else {
//// date.setSex("1");
//// }
// }
//2.讲数据存储到map中 //2.讲数据存储到map中
try { try {
for (SchoolTeacherBasicInformation date :schoolTeacherBasicInformations){ for (SchoolTeacherBasicInformation date :schoolTeacherBasicInformations){
...@@ -114,13 +142,297 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo ...@@ -114,13 +142,297 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
teacherBasichlnformationMapper.insert(date); teacherBasichlnformationMapper.insert(date);
} }
} }
return true; // return true;
}catch (Exception e){ }catch (Exception e){
throw new RuntimeException("新导用户信息失败:"+e.getMessage()); throw new RuntimeException("新导用户信息失败:"+e.getMessage());
} }
return AjaxResult.success("导入成功，共计:"+schoolTeacherBasicInformations.size()+"条;");
}
/**
* 数据校验
* @param
* @return
* @throws ParseException
*/
public String dataCheck(List<SchoolTeacherBasicInformation> schoolTeacherBasicInformations){
StringBuilder sb = new StringBuilder();
SchoolCheckVo schoolCheckVo = null;
for (SchoolTeacherBasicInformation date: schoolTeacherBasicInformations) {
//非空验证
if (StringUtils.isEmpty(date.getName())) {
sb.append("用户姓名不可为空");
sb.append("<br/>");
}
//身份证号
if (StringUtils.isEmpty(date.getIdCard())) {
sb.append("用户身份证号不可为空");
sb.append("<br/>");
}
//任教科目
if (StringUtils.isEmpty(date.getTeachingSubject())) {
sb.append("用户任教学科不可为空");
sb.append("<br/>");
}
//手机号
if (StringUtils.isEmpty(date.getTeachingSubject())) {
sb.append("用户任手机号不可为空");
sb.append("<br/>");
}
//到二中工作日期
if (null == date.getToSecondMiddleSchoolTime()) {
sb.append("用户任到二中工作日期不可为空");
sb.append("<br/>");
}
}
if (!StringUtils.isEmpty(sb.toString())){
return sb.toString();
}
for (SchoolTeacherBasicInformation date: schoolTeacherBasicInformations) {
//1 档案出生日期验证
schoolCheckVo = this.checkeDateTime(date.getFileBirthDate());
if (schoolCheckVo.getFlag()){
date.setFileBirthDate(schoolCheckVo.getDate());
}else {
sb.append(date.getName()+"用户档案出生年月日格式错误");
sb.append("<br/>");
}
//2 入党时间验证
schoolCheckVo = this.checkeDateTime(date.getPartyMembershipTime());
if (schoolCheckVo.getFlag()){
date.setPartyMembershipTime(schoolCheckVo.getDate());
}else {
sb.append(date.getName()+"用户入党时间格式错误");
sb.append("<br/>");
}
//3 手机号数数量验证
if (date.getDdPhone() ==null || date.getDdPhone().length() != 11){
sb.append(date.getName()+"用户手机号格式错误:"+date.getDdPhone() );
sb.append("<br/>");
}
//4 身份证验证
//1.处理出生日期
String birthDayFromIdCard = IdCardNumberUtils.getBirthDayFromIdCard(date.getIdCard());
date.setBirthDate(birthDayFromIdCard);
//2.处理性别
Map<String, Object> sexFromIdCard = IdCardNumberUtils.getSexFromIdCard(date.getIdCard());
Integer sex = (Integer) sexFromIdCard.get(IdCardNumberUtils.SEX_BY_INT_MAP_KEY);
if (null == sex ){
sb.append(date.getName()+"用户身份证信息格式错误:"+date.getIdCard() );
sb.append("<br/>");
}else {
if (sex == 1){
date.setSex("0");
}else {
date.setSex("1");
}
}
//5现职称
schoolCheckVo = checkeDicet("current_professional", date.getCurrentProfessionalTitle());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setCurrentProfessionalTitle(schoolCheckVo.getVal());
} else {
sb.append(date.getName() + "用户现职称录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
//6 先职称取得时间
schoolCheckVo = this.checkeDateTime(date.getCurrentProfessionalTitleTime());
if (schoolCheckVo.getFlag()){
date.setCurrentProfessionalTitleTime(schoolCheckVo.getDate());
}else {
sb.append(date.getName()+"用户现职称取得资格时间格式错误");
sb.append("<br/>");
}
//7 先聘岗位
schoolCheckVo = checkeDicet("current_position", date.getCurrentPosition());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setCurrentPosition(schoolCheckVo.getVal());
} else {
sb.append(date.getName() + "用户现聘岗位录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
//任教学科
schoolCheckVo = checkeDicet("teaching_subjects", date.getTeachingSubject());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setTeachingSubject(schoolCheckVo.getVal());
} else {
sb.append(date.getName() + "用户任教学科录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
//政治面貌
schoolCheckVo = checkeDicet("politics_tatusls", date.getPoliticalLandscape());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setPoliticalLandscape(schoolCheckVo.getVal());
} else {
sb.append(date.getName() + "用户政治面貌录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
//现聘职称
schoolCheckVo = checkeDicet("current_professional", date.getCurrentHiringProfessionalTitle());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setCurrentHiringProfessionalTitle(schoolCheckVo.getVal());
} else {
sb.append(date.getName() + "用户现聘职称录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
//8 现岗位等级
schoolCheckVo = checkeDicet("current_joblevel", date.getCurrentJobLevel());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setCurrentJobLevel(schoolCheckVo.getVal());
} else {
sb.append(date.getName() + "用户现岗位等级录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
} }
//9现岗位等级聘任时间
schoolCheckVo = this.checkeDateTime(date.getCurrentJobLevelAppointmentTime());
if (schoolCheckVo.getFlag()){
date.setCurrentJobLevelAppointmentTime(schoolCheckVo.getDate());
}else {
sb.append(date.getName()+"用户现岗位等级聘任时间格式错误");
sb.append("<br/>");
}
//参加工作时间
schoolCheckVo = this.checkeDateTime(DateUtils.parseDate(date.getWorkingHours()));
if (schoolCheckVo.getFlag()){
date.setWorkingHours(schoolCheckVo.getVal());
}else {
sb.append(date.getName()+"用户参加工作时间格式错误");
sb.append("<br/>");
}
//到二中工作时间
schoolCheckVo = this.checkeDateTime(date.getToSecondMiddleSchoolTime());
if (schoolCheckVo.getFlag()){
date.setToSecondMiddleSchoolTime(schoolCheckVo.getDate());
}else {
sb.append(date.getName()+"用户到二中工作时间格式错误" );
sb.append("<br/>");
}
//在岗情况
schoolCheckVo = checkeDicet("duty_situation", date.getOnDutySituation());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setOnDutySituation(schoolCheckVo.getVal());
} else {
sb.append(date.getName() + "用户 在岗情况录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
//在编情况
schoolCheckVo = checkeDicet("current_situation", date.getCurrentSituation());
if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) {
date.setCurrentSituation(schoolCheckVo.getVal());
} else {
sb.append(date.getName() + "用户 在编情况录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>");
}
}
//毕业时间1
schoolCheckVo = this.checkeDateTime(date.getGraduationTime1());
if (schoolCheckVo.getFlag()){
date.setGraduationTime1(schoolCheckVo.getDate());
}else {
sb.append(date.getName()+"用户 毕业时间1 格式错误");
sb.append("<br/>");
}
//毕业时间2
schoolCheckVo = this.checkeDateTime(date.getGraduationTime2());
if (schoolCheckVo.getFlag()){
date.setGraduationTime2(schoolCheckVo.getDate());
}else {
sb.append(date.getName()+"用户 毕业时间2 格式错误");
sb.append("<br/>");
}
//毕业时间3
schoolCheckVo = this.checkeDateTime(date.getGraduationTime3());
if (schoolCheckVo.getFlag()){
date.setGraduationTime3(schoolCheckVo.getDate());
}else {
sb.append(date.getName()+"用户 毕业时间3 格式错误");
sb.append("<br/>");
}
}
return sb.toString();
}
/**
* 校验时间
* @param date
* @return
*/
public SchoolCheckVo checkeDateTime(Date date){
SchoolCheckVo sc = new SchoolCheckVo();
if (null == date){
sc.setFlag(false);
sc.setVal(null);
return sc;
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
try {
String format = sdf.format(date);
sc.setFlag(true);
sc.setVal(format);
sc.setDate( DateUtils.parseDate(format));
}catch (Exception e){
sc.setFlag(false);
sc.setVal(date.toString());
}
return sc;
}
/**
* 校验字典数据
* @param type 类型 vlaue 值 不会验证必填项
* @return
* @throws ParseException
*/
public SchoolCheckVo checkeDicet(String type,String value){
SchoolCheckVo sc = new SchoolCheckVo();
if (StringUtils.isEmpty(value)){
return null;
}
//解析值
String val = DictUtils.getDictValue(type, value, ",");
if (StringUtils.isEmpty(val)){
sc.setFlag(false);
sc.setVal(value);
return sc;
}
if (StringUtils.isEmpty(val)){
sc.setFlag(false);
sc.setVal(value);
}else {
sc.setFlag(true);
sc.setVal(val);
}
return sc;
}
@Override @Override
public SchoolTeacherBasicInformationVo getByIds(Long id) throws ParseException { public SchoolTeacherBasicInformationVo getByIds(Long id) throws ParseException {
...@@ -1078,7 +1390,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo ...@@ -1078,7 +1390,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
comperhensiveVo.setFudaoStudent(querylist1); comperhensiveVo.setFudaoStudent(querylist1);
//7 年度考核 //7 年度考核
SchoolAnnualAssessment schoolAnnualAssessment = new SchoolAnnualAssessment(); SchoolAnnualAssessmentVo schoolAnnualAssessment = new SchoolAnnualAssessmentVo();
schoolAnnualAssessment.setIdCard(basicInformation.getIdCard()); schoolAnnualAssessment.setIdCard(basicInformation.getIdCard());
List<SchoolAnnualAssessment> schoolAnnualAssessments = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessment); List<SchoolAnnualAssessment> schoolAnnualAssessments = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessment);
comperhensiveVo.setSchoolAnnualAssessment(schoolAnnualAssessments); comperhensiveVo.setSchoolAnnualAssessment(schoolAnnualAssessments);
...@@ -1246,7 +1558,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo ...@@ -1246,7 +1558,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
comperhensiveVo.setFudaoStudent(querylist1); comperhensiveVo.setFudaoStudent(querylist1);
//7 年度考核 //7 年度考核
SchoolAnnualAssessment schoolAnnualAssessment = new SchoolAnnualAssessment(); SchoolAnnualAssessmentVo schoolAnnualAssessment = new SchoolAnnualAssessmentVo();
schoolAnnualAssessment.setIdCard(basicInformation.getIdCard()); schoolAnnualAssessment.setIdCard(basicInformation.getIdCard());
List<SchoolAnnualAssessment> schoolAnnualAssessments = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessment); List<SchoolAnnualAssessment> schoolAnnualAssessments = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessment);
comperhensiveVo.setSchoolAnnualAssessment(schoolAnnualAssessments); comperhensiveVo.setSchoolAnnualAssessment(schoolAnnualAssessments);
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolXteachingAchievementsServiceImpl.java
...@@ -83,18 +83,17 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt ...@@ -83,18 +83,17 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt
public int insertSchoolXteachingAchievements(SchoolXteachingAchievements schoolXteachingAchievements) public int insertSchoolXteachingAchievements(SchoolXteachingAchievements schoolXteachingAchievements)
{ {
//根据身份证号查询用户，是否存在 //根据身份证号查询用户，是否存在
SchoolTeacher schoolTeacher = schoolTeacherMapper.selectTeacher(schoolXteachingAchievements.getIdCard()); // SchoolTeacher schoolTeacher = schoolTeacherMapper.selectTeacher(schoolXteachingAchievements.getIdCard());
if (StringUtils.isNotNull(schoolTeacher)){ // if (StringUtils.isNotNull(schoolTeacher)){
schoolXteachingAchievements.setUserId(schoolTeacher.getId()); // schoolXteachingAchievements.setUserId(schoolTeacher.getId());
}else { // }else {
schoolXteachingAchievements.setUserId(null); // schoolXteachingAchievements.setUserId(null);
} // }
// if (StringUtils.isNull(schoolTeacher)){ // if (StringUtils.isNull(schoolTeacher)){
// throw new ServiceException("用户不存在，请重新输入！"); // throw new ServiceException("用户不存在，请重新输入！");
// } else if (!schoolTeacher.getTeacherName().contains(schoolXteachingAchievements.getUserName())){ // } else if (!schoolTeacher.getTeacherName().contains(schoolXteachingAchievements.getUserName())){
// throw new ServiceException("姓名和身份证姓名不匹配，请重新输入！"); // throw new ServiceException("姓名和身份证姓名不匹配，请重新输入！");
// } // }
schoolXteachingAchievements.setUserId(schoolTeacher.getId());
//判断班级是否正确 //判断班级是否正确
String className = schoolXteachingAchievements.getClassName(); String className = schoolXteachingAchievements.getClassName();
//将所有中文逗号替换成英文逗号 //将所有中文逗号替换成英文逗号
...@@ -126,12 +125,12 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt ...@@ -126,12 +125,12 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt
public int updateSchoolXteachingAchievements(SchoolXteachingAchievements schoolXteachingAchievements) public int updateSchoolXteachingAchievements(SchoolXteachingAchievements schoolXteachingAchievements)
{ {
//根据身份证号查询用户，是否存在 //根据身份证号查询用户，是否存在
SchoolTeacher schoolTeacher = schoolTeacherMapper.selectTeacher(schoolXteachingAchievements.getIdCard()); // SchoolTeacher schoolTeacher = schoolTeacherMapper.selectTeacher(schoolXteachingAchievements.getIdCard());
if (StringUtils.isNotNull(schoolTeacher)){ // if (StringUtils.isNotNull(schoolTeacher)){
schoolXteachingAchievements.setUserId(schoolTeacher.getId()); // schoolXteachingAchievements.setUserId(schoolTeacher.getId());
}else { // }else {
schoolXteachingAchievements.setUserId(null); // schoolXteachingAchievements.setUserId(null);
} // }
// if (StringUtils.isNull(schoolTeacher)){ // if (StringUtils.isNull(schoolTeacher)){
// throw new ServiceException("用户不存在，请重新输入！"); // throw new ServiceException("用户不存在，请重新输入！");
// } else if (!schoolTeacher.getTeacherName().contains(schoolXteachingAchievements.getUserName())){ // } else if (!schoolTeacher.getTeacherName().contains(schoolXteachingAchievements.getUserName())){
...@@ -225,6 +224,7 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt ...@@ -225,6 +224,7 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt
* @param list * @param list
*/ */
@Override @Override
@Transactional
public void checkImport(List<SchoolXteachingAchievements> list) { public void checkImport(List<SchoolXteachingAchievements> list) {
//检验是否为空 //检验是否为空
if (StringUtils.isNull(list) || list.size() == 0) { if (StringUtils.isNull(list) || list.size() == 0) {
...@@ -252,7 +252,7 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt ...@@ -252,7 +252,7 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt
failureMsg.append("<br/>" + failureNum + "、学期为空,请您重新输入! "); failureMsg.append("<br/>" + failureNum + "、学期为空,请您重新输入! ");
} else if (StringUtils.isNull(schoolXteachingAchievements.getExamTime())) { } else if (StringUtils.isNull(schoolXteachingAchievements.getExamTime())) {
failureNum++; failureNum++;
failureMsg.append("<br/>" + failureNum + "、考试时间为空,请您重新输入! "); failureMsg.append("<br/>" + failureNum + "、考试时间为空或输入错误,请您重新输入! ");
} else if (StringUtils.isEmpty(schoolXteachingAchievements.getExamType())) { } else if (StringUtils.isEmpty(schoolXteachingAchievements.getExamType())) {
failureNum++; failureNum++;
failureMsg.append("<br/>" + failureNum + "、考试类型为空,请您重新输入! "); failureMsg.append("<br/>" + failureNum + "、考试类型为空,请您重新输入! ");
...@@ -297,92 +297,95 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt ...@@ -297,92 +297,95 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt
} else if (!(split[0].matches("\\d+") && split[1].matches("\\d+"))){ } else if (!(split[0].matches("\\d+") && split[1].matches("\\d+"))){
failureNum++; failureNum++;
failureMsg.append("<br/>" + failureNum + "、学年输入格式错误,请您重新输入! "); failureMsg.append("<br/>" + failureNum + "、学年输入格式错误,请您重新输入! ");
} }else {
}
//判断学期是否正确 //判断学期是否正确
String semester1 = "";
for (SysDictData sysDictData : semester) { for (SysDictData sysDictData : semester) {
if (!sysDictData.getDictValue().equals(schoolXteachingAchievements.getSemester())){ if (schoolXteachingAchievements.getSemester().equals(sysDictData.getDictLabel())){
failureNum++; semester1 = sysDictData.getDictValue();
failureMsg.append("<br/>" + failureNum + "、学期输入错误,请您重新输入! ");
} }
} }
if (StringUtils.isEmpty(semester1)){
//判断考试时间是否符合格式
Date examTime = schoolXteachingAchievements.getExamTime();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
try {
sdf.parse(examTime.toString());
} catch (ParseException e) {
failureNum++; failureNum++;
failureMsg.append("<br/>" + failureNum + "、考试时间输入格式有误,请您重新输入! "); failureMsg.append("<br/>" + failureNum + "、学期输入错误,请您重新输入! ");
} }else {
schoolXteachingAchievements.setSemester(semester1);
//判断考试类型是否正确 //判断考试类型是否正确
String examType1 = "";
for (SysDictData sysDictData : examType) { for (SysDictData sysDictData : examType) {
if (!sysDictData.getDictValue().equals(schoolXteachingAchievements.getExamType())){ if (schoolXteachingAchievements.getExamType().equals(sysDictData.getDictLabel())){
failureNum++; examType1 = sysDictData.getDictValue();
failureMsg.append("<br/>" + failureNum + "、考试类型输入错误,请您重新输入! ");
} }
} }
if (StringUtils.isEmpty(examType1)){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、考试类型输入错误,请您重新输入! ");
}else {
schoolXteachingAchievements.setExamType(examType1);
//判断届别是否正确 //判断届别是否正确
if (!schoolXteachingAchievements.getYear().matches("\\d+")){ if (!schoolXteachingAchievements.getYear().matches("\\d+")){
failureNum++; failureNum++;
failureMsg.append("<br/>" + failureNum + "、届别输入错误,请您重新输入! "); failureMsg.append("<br/>" + failureNum + "、届别输入错误,请您重新输入! ");
} }else {
//判断年级是否正确 //判断年级是否正确
String grade1 = "";
for (SysDictData sysDictData : grade) { for (SysDictData sysDictData : grade) {
if (!sysDictData.getDictValue().equals(schoolXteachingAchievements.getGrade())){ if (schoolXteachingAchievements.getGrade().equals(sysDictData.getDictLabel())){
failureNum++; grade1 = sysDictData.getDictValue();
failureMsg.append("<br/>" + failureNum + "、年级输入错误,请您重新输入! ");
} }
} }
//判断学科是否正确 //判断学科是否正确
String sub1 = "";
for (SysDictData sysDictData : sub) { for (SysDictData sysDictData : sub) {
if (!sysDictData.getDictValue().equals(schoolXteachingAchievements.getSub())){ if (schoolXteachingAchievements.getSub().equals(sysDictData.getDictLabel())){
failureNum++; sub1 = sysDictData.getDictValue();
failureMsg.append("<br/>" + failureNum + "、学科输入错误,请您重新输入! ");
} }
} }
if (StringUtils.isEmpty(grade1)){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、年级输入错误,请您重新输入! ");
}else if (StringUtils.isEmpty(sub1)){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、学科输入错误,请您重新输入! ");
}else {
//判断班级是否正确 //判断班级是否正确
String className = schoolXteachingAchievements.getClassName(); String className = schoolXteachingAchievements.getClassName();
//将所有中文逗号替换成英文逗号 //将所有中文逗号替换成英文逗号
String newClassName = className.replaceAll("，", ","); String newClassName = className.replaceAll("，", ",");
String[] split = newClassName.split(","); String[] spl = newClassName.split(",");
for (int i = 0; i < split.length; i++) { for (int i = 0; i < spl.length; i++) {
if (!split[i].matches("\\d+")){ if (!spl[i].matches("\\d+")){
failureNum++; failureNum++;
failureMsg.append("<br/>" + failureNum + "、班级输入错误,请您重新输入! "); failureMsg.append("<br/>" + failureNum + "、班级输入错误,请您重新输入! ");
break;
} }
} }
schoolXteachingAchievements.setClassName(newClassName); schoolXteachingAchievements.setClassName(newClassName);
//判断班级类型是否正确 //判断班级类型是否正确
String classType1 = "";
String classType = schoolXteachingAchievements.getClassType(); String classType = schoolXteachingAchievements.getClassType();
//将所有中文逗号换成英文逗号 //将所有中文逗号换成英文逗号
String newClassType = classType.replaceAll("，", ","); String newClassType = classType.replaceAll("，", ",");
String[] split1 = newClassType.split(","); String[] split1 = newClassType.split(",");
for (String ctype : split1) { for (String ctype : split1) {
for (SysDictData sysDictData : type) { for (SysDictData sysDictData : type) {
if (!ctype.equals(sysDictData.getDictLabel())){ if (ctype.equals(sysDictData.getDictLabel())){
failureNum++; classType1 += ctype;
failureMsg.append("<br/>" + failureNum + "、班级类型输入错误,请您重新输入! ");
} }
} }
} }
if (StringUtils.isEmpty(classType1)){
//判断考核分是否正确 failureNum++;
if (!schoolXteachingAchievements.getAssessmentScore().toString().matches("\\d+(\\.\\d+)?")){ failureMsg.append("<br/>" + failureNum + "、班级类型输入错误,请您重新输入! ");
}else if (!schoolXteachingAchievements.getAssessmentScore().toString().matches("\\d+(\\.\\d+)?")){
failureNum++; failureNum++;
failureMsg.append("<br/>" + failureNum + "、考核分输入错误,请您重新输入! "); failureMsg.append("<br/>" + failureNum + "、考核分输入错误,请您重新输入! ");
} }else if(schoolXteachingAchievements.getIdCard().length() == 18){
//校验身份证
if(schoolXteachingAchievements.getIdCard().length() == 18){
//校验前十七位是否为数字 //校验前十七位是否为数字
for (int i = 0; i < 17; i++) { for (int i = 0; i < 17; i++) {
if (!Character.isDigit(schoolXteachingAchievements.getIdCard().charAt(i))){ if (!Character.isDigit(schoolXteachingAchievements.getIdCard().charAt(i))){
...@@ -392,10 +395,11 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt ...@@ -392,10 +395,11 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt
} }
} }
} }
//根据身份证号查询用户，是否存在 }
SchoolTeacher schoolTeacher = schoolTeacherMapper.selectTeacher(schoolXteachingAchievements.getIdCard()); }
if (StringUtils.isNotNull(schoolTeacher)){ }
schoolXteachingAchievements.setUserId(schoolTeacher.getId()); }
}
} }
} }
} }
...@@ -411,6 +415,7 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt ...@@ -411,6 +415,7 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt
* @return * @return
*/ */
@Override @Override
@Transactional
public String importData(List<SchoolXteachingAchievements> list) { public String importData(List<SchoolXteachingAchievements> list) {
StringBuilder successMsg = new StringBuilder(); StringBuilder successMsg = new StringBuilder();
//批量导入年度考核数据 //批量导入年度考核数据
...@@ -433,6 +438,16 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt ...@@ -433,6 +438,16 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt
} }
/** /**
* 查询本部门下所有教师身份证号
* @param deptId
* @return
*/
@Override
public List<String> getUserIdCardsByDeptId(Long deptId) {
return schoolXteachingAchievementsMapper.getUserIdCardsByDeptId(deptId);
}
/**
* 查询所有级部id * 查询所有级部id
* @return * @return
*/ */
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolAnnualAssessment/ISchoolAnnualAssessmentService.java
...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.service.schoolAnnualAssessment; ...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.service.schoolAnnualAssessment;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment; import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
import yangtz.cs.liu.campus.vo.schoolAnnualAssessment.SchoolAnnualAssessmentVo;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
...@@ -26,10 +27,10 @@ public interface ISchoolAnnualAssessmentService extends IService<SchoolAnnualAss ...@@ -26,10 +27,10 @@ public interface ISchoolAnnualAssessmentService extends IService<SchoolAnnualAss
/** /**
* 查询年度考核列表 * 查询年度考核列表
* *
* @param schoolAnnualAssessment 年度考核 * @param schoolAnnualAssessmentVo 年度考核
* @return 年度考核集合 * @return 年度考核集合
*/ */
public List<SchoolAnnualAssessment> selectSchoolAnnualAssessmentList(SchoolAnnualAssessment schoolAnnualAssessment); public List<SchoolAnnualAssessment> selectSchoolAnnualAssessmentList(SchoolAnnualAssessmentVo schoolAnnualAssessmentVo);
/** /**
* 新增年度考核 * 新增年度考核
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolAclassTeacherAssessmentService.java
package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn; package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.AjaxResult;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessment; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessment;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentReq; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentReq;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentVo; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAclassTeacherAssessmentVo;
...@@ -23,6 +24,7 @@ public interface ISchoolAclassTeacherAssessmentService extends IService<SchoolA ...@@ -23,6 +24,7 @@ public interface ISchoolAclassTeacherAssessmentService extends IService<SchoolA
*/ */
public SchoolAclassTeacherAssessment selectSchoolAclassTeacherAssessmentById(Long id); public SchoolAclassTeacherAssessment selectSchoolAclassTeacherAssessmentById(Long id);
AjaxResult saveCheckedDate(List<SchoolAclassTeacherAssessment> detailList);
/** /**
* 查询班主任考核列表 * 查询班主任考核列表
* *
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolAworkloadService.java
package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn; package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.AjaxResult;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkload; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkload;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadExport; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadExport;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolAworkloadVo;
...@@ -23,6 +24,7 @@ public interface ISchoolAworkloadService extends IService<SchoolAworkload> ...@@ -23,6 +24,7 @@ public interface ISchoolAworkloadService extends IService<SchoolAworkload>
*/ */
public SchoolAworkload selectSchoolAworkloadById(Long id); public SchoolAworkload selectSchoolAworkloadById(Long id);
public AjaxResult saveAndChecked(List<SchoolAworkload> list);
/** /**
* 查询工作量信息列表 * 查询工作量信息列表
* *
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolXteachingAchievementsService.java
...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn; ...@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.SysUser; 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.schoolAnnualAssessment.SchoolAnnualAssessment;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteachingAchievements; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteachingAchievements;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo; import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo;
...@@ -99,6 +100,13 @@ public interface ISchoolXteachingAchievementsService extends IService<SchoolXtea ...@@ -99,6 +100,13 @@ public interface ISchoolXteachingAchievementsService extends IService<SchoolXtea
List<Long> getUserIdsByDeptId(Long deptId); List<Long> getUserIdsByDeptId(Long deptId);
/** /**
* 查询本部门下所有教师身份证号
* @param deptId
* @return
*/
List<String> getUserIdCardsByDeptId(Long deptId);
/**
* 查询所有级部id * 查询所有级部id
* @return * @return
*/ */
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationService.java
...@@ -20,7 +20,7 @@ public interface SchoolTeacherBasichlnformationService extends IService<SchoolT ...@@ -20,7 +20,7 @@ public interface SchoolTeacherBasichlnformationService extends IService<SchoolT
int updateInformationById(SchoolTeacherBasicInformation information); int updateInformationById(SchoolTeacherBasicInformation information);
Boolean saveOrUpdateList( List<SchoolTeacherBasicInformation> schoolTeacherBasicInformations); AjaxResult saveOrUpdateList( List<SchoolTeacherBasicInformation> schoolTeacherBasicInformations);
/** /**
* 综合信息查询 * 综合信息查询
......
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; ...@@ -7,6 +7,7 @@ import com.ruoyi.common.annotation.Excel;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
import java.util.List;
@Data @Data
public class SchoolXacademicWorksVo public class SchoolXacademicWorksVo
...@@ -45,6 +46,9 @@ public class SchoolXacademicWorksVo ...@@ -45,6 +46,9 @@ public class SchoolXacademicWorksVo
@Excel(name = "论文论著-成果名称") @Excel(name = "论文论著-成果名称")
private String resultName; private String resultName;
/** 获奖人id集合 */
private List<Long> userIds;
/** 获奖人id */ /** 获奖人id */
private Long userId; 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; ...@@ -7,6 +7,7 @@ import com.ruoyi.common.annotation.Excel;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
import java.util.List;
@Data @Data
public class SchoolXlectureAwardsVo public class SchoolXlectureAwardsVo
...@@ -45,6 +46,9 @@ public class SchoolXlectureAwardsVo ...@@ -45,6 +46,9 @@ public class SchoolXlectureAwardsVo
@Excel(name = "讲课获奖-成果名称") @Excel(name = "讲课获奖-成果名称")
private String resultName; private String resultName;
/** 获奖人id集合 */
private List<Long> userIds;
/** 获奖人id */ /** 获奖人id */
private Long userId; 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; ...@@ -7,6 +7,7 @@ import com.ruoyi.common.annotation.Excel;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
import java.util.List;
@Data @Data
public class SchoolXprojectResearchVo { public class SchoolXprojectResearchVo {
...@@ -45,6 +46,9 @@ public class SchoolXprojectResearchVo { ...@@ -45,6 +46,9 @@ public class SchoolXprojectResearchVo {
@Excel(name = "课题研究-成果名称") @Excel(name = "课题研究-成果名称")
private String resultName; private String resultName;
/** 获奖人id集合 */
private List<Long> userIds;
/** 获奖人id */ /** 获奖人id */
private Long userId; 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; ...@@ -7,6 +7,7 @@ import com.ruoyi.common.annotation.Excel;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
import java.util.List;
@Data @Data
public class SchoolXteacherAwardsVo public class SchoolXteacherAwardsVo
...@@ -47,6 +48,9 @@ public class SchoolXteacherAwardsVo ...@@ -47,6 +48,9 @@ public class SchoolXteacherAwardsVo
@Excel(name = "教学获奖-成果名称") @Excel(name = "教学获奖-成果名称")
private String resultName; private String resultName;
/** 获奖人id集合 */
private List<Long> userIds;
/** 获奖人id */ /** 获奖人id */
private Long userId; private Long userId;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolNewTeacherDzdn/SchoolXteachingAchievementsVo.java
...@@ -8,6 +8,7 @@ import lombok.Data; ...@@ -8,6 +8,7 @@ import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List;
@Data @Data
public class SchoolXteachingAchievementsVo { public class SchoolXteachingAchievementsVo {
...@@ -53,6 +54,9 @@ public class SchoolXteachingAchievementsVo { ...@@ -53,6 +54,9 @@ public class SchoolXteachingAchievementsVo {
@Excel(name = "姓名") @Excel(name = "姓名")
private String userName; private String userName;
/** 身份证号集合 */
private List<String> idCards;
/** 身份证号 */ /** 身份证号 */
private String idCard; private String idCard;
......
smart-campus/src/main/resources/mapper/fudao/FudaoStudentMapper.xml
...@@ -90,8 +90,8 @@ ...@@ -90,8 +90,8 @@
<if test="awardtype != null">#{awardtype},</if> <if test="awardtype != null">#{awardtype},</if>
<if test="awardrank != null">#{awardrank},</if> <if test="awardrank != null">#{awardrank},</if>
<if test="awardlevel != null">#{awardlevel},</if> <if test="awardlevel != null">#{awardlevel},</if>
<if test="auditstate != null">#{auditstate},</if>
<if test="resultname !=null">#{resultname},</if> <if test="resultname !=null">#{resultname},</if>
<if test="auditstate != null">#{auditstate},</if>
<if test="guidanceteacher != null">#{guidanceteacher},</if> <if test="guidanceteacher != null">#{guidanceteacher},</if>
<if test="userid != null">#{userid},</if> <if test="userid != null">#{userid},</if>
<if test="username != null">#{username},</if> <if test="username != null">#{username},</if>
......
smart-campus/src/main/resources/mapper/schoolAnnualAssessment/SchoolAnnualAssessmentMapper.xml
...@@ -22,7 +22,7 @@ ...@@ -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 select id, year, name, id_card, check_result, remark, create_by, create_Time, update_by, update_time, del_flag from school_annual_assessment
</sql> </sql>
<select id="selectSchoolAnnualAssessmentList" parameterType="SchoolAnnualAssessment" resultMap="SchoolAnnualAssessmentResult"> <select id="selectSchoolAnnualAssessmentList" parameterType="yangtz.cs.liu.campus.vo.schoolAnnualAssessment.SchoolAnnualAssessmentVo" resultMap="SchoolAnnualAssessmentResult">
<include refid="selectSchoolAnnualAssessmentVo"/> <include refid="selectSchoolAnnualAssessmentVo"/>
<where> <where>
del_flag = '0' del_flag = '0'
...@@ -35,6 +35,12 @@ ...@@ -35,6 +35,12 @@
<if test="createTime != null "> and create_time = #{createTime}</if> <if test="createTime != null "> and create_time = #{createTime}</if>
<if test="updateBy != null and updateBy != ''"> and update_by = #{updateBy}</if> <if test="updateBy != null and updateBy != ''"> and update_by = #{updateBy}</if>
<if test="updateTime != null"> and update_time = #{updateTime}</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> </where>
order by create_time DESC order by create_time DESC
</select> </select>
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXacademicWorksMapper.xml
...@@ -48,6 +48,12 @@ ...@@ -48,6 +48,12 @@
<if test="pictureUrl != null and pictureUrl != ''"> and picture_url = #{pictureUrl}</if> <if test="pictureUrl != null and pictureUrl != ''"> and picture_url = #{pictureUrl}</if>
<if test="auditState != null and auditState != ''"> and audit_state != #{auditState}</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="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> </where>
order by create_time DESC order by create_time DESC
</select> </select>
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXlectureAwardsMapper.xml
...@@ -48,6 +48,12 @@ ...@@ -48,6 +48,12 @@
<if test="pictureUrl != null and pictureUrl != ''"> and picture_url = #{pictureUrl}</if> <if test="pictureUrl != null and pictureUrl != ''"> and picture_url = #{pictureUrl}</if>
<if test="auditState != null and auditState != ''"> and audit_state != #{auditState}</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="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> </where>
order by create_time DESC order by create_time DESC
</select> </select>
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXprojectResearchMapper.xml
...@@ -47,6 +47,12 @@ ...@@ -47,6 +47,12 @@
<if test="pictureUrl != null and pictureUrl != ''"> and picture_url = #{pictureUrl}</if> <if test="pictureUrl != null and pictureUrl != ''"> and picture_url = #{pictureUrl}</if>
<if test="auditState != null and auditState != ''"> and audit_state != #{auditState}</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="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> </where>
order by create_time DESC order by create_time DESC
</select> </select>
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXteacherAwardsMapper.xml
...@@ -48,6 +48,12 @@ ...@@ -48,6 +48,12 @@
<if test="pictureUrl != null and pictureUrl != ''"> and picture_url = #{pictureUrl}</if> <if test="pictureUrl != null and pictureUrl != ''"> and picture_url = #{pictureUrl}</if>
<if test="auditState != null and auditState != ''"> and audit_state != #{auditState}</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="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> </where>
order by create_time DESC order by create_time DESC
</select> </select>
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXteachingAchievementsMapper.xml
...@@ -49,6 +49,12 @@ ...@@ -49,6 +49,12 @@
<if test="classType != null and classType != ''"> and class_type = #{classType}</if> <if test="classType != null and classType != ''"> and class_type = #{classType}</if>
<if test="assessmentScore != null "> and assessment_score = #{assessmentScore}</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="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> </where>
order by create_time DESC order by create_time DESC
</select> </select>
...@@ -158,12 +164,28 @@ ...@@ -158,12 +164,28 @@
<select id="getUserIdsByDeptId" parameterType="Long" resultType="Long"> <select id="getUserIdsByDeptId" parameterType="Long" resultType="Long">
SELECT 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' 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 FROM
sys_user u sys_user u
LEFT JOIN sys_dept d ON u.dept_id = d.dept_id LEFT JOIN sys_dept d ON u.dept_id = d.dept_id
LEFT JOIN school_teacher t ON t.id = u.user_id
WHERE WHERE
u.del_flag = '0' u.del_flag = '0' AND d.del_flag = '0' AND t.del_flag = '0'
AND ( AND (
u.dept_id = #{deptId} u.dept_id = #{deptId}
OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set( #{deptId}, ancestors ) )) 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