Skip to content

D
dd_school
Commit 31d79280 by baochunxin
Options

#G：电子教师综合查询导出pdf接口上传

parent 9f38a94d
Showing with 67 additions and 15 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationServicelmpl.java
...@@ -40,10 +40,7 @@ import yangtz.cs.liu.campus.service.impl.teacherFiles.IdCardNumberUtils; ...@@ -40,10 +40,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.schoolNewTeacherDzdn.SchoolXacademicWorksVo; import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.*;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXlectureAwardsVo;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteacherAwardsVo;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo;
import java.io.*; import java.io.*;
import java.text.ParseException; import java.text.ParseException;
...@@ -863,6 +860,8 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo ...@@ -863,6 +860,8 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
FudaoStudentImpl fudaoStudentImpl; FudaoStudentImpl fudaoStudentImpl;
@Autowired @Autowired
SchoolAnnualAssessmentServiceImpl schoolAnnualAssessmentService; SchoolAnnualAssessmentServiceImpl schoolAnnualAssessmentService;
@Autowired
SchoolXcomprehensiveHonorsServiceImpl schoolXcomprehensiveHonorsService;
/** /**
* 综合信息查询 * 综合信息查询
* @param req * @param req
...@@ -932,37 +931,88 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo ...@@ -932,37 +931,88 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
schoolXteachingAchievementsVo.setUserId(sysUser.getUserId()); schoolXteachingAchievementsVo.setUserId(sysUser.getUserId());
List<SchoolXteachingAchievementsVo> schoolXteachingAchievementsVos = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo); List<SchoolXteachingAchievementsVo> schoolXteachingAchievementsVos = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
comperhensiveVo.setSchoolXteachingAchievements(schoolXteachingAchievementsVos); comperhensiveVo.setSchoolXteachingAchievements(schoolXteachingAchievementsVos);
//* 4.3 综合成绩
List<SpecialityVo> specialityVos = new ArrayList<>(); List<SpecialityVo> specialityVos = new ArrayList<>();
// * 4.4 教师获奖 //* 4.3 综合成绩
SchoolXcomprehensiveHonorsVo vo = new SchoolXcomprehensiveHonorsVo();
vo.setUserId(sysUser.getUserId());
List<SchoolXcomprehensiveHonorsVo> schoolXcomprehensiveHonorsVos = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(vo);
for (SchoolXcomprehensiveHonorsVo date : schoolXcomprehensiveHonorsVos){
SpecialityVo specialityVo = new SpecialityVo();
specialityVo.setGrowthType("综合荣誉");
specialityVo.setSub(date.getSub());
specialityVo.setAwardtype(date.getAwardType());
specialityVo.setAwardlevel(date.getAwardLevel());
specialityVo.setAwardrank(date.getAwardRank());
specialityVo.setResultName(date.getResultName());
specialityVo.setUserId(date.getUserId());
specialityVo.setUserName(date.getUserName());
specialityVo.setOrg(date.getOrg());
specialityVo.setAwardTime(date.getAwardTime());
specialityVos.add(specialityVo);
}
// * 4.4 教师获奖
SchoolXteacherAwardsVo schoolXteacherAwardsVo = new SchoolXteacherAwardsVo(); SchoolXteacherAwardsVo schoolXteacherAwardsVo = new SchoolXteacherAwardsVo();
schoolXteacherAwardsVo.setUserId(sysUser.getUserId()); schoolXteacherAwardsVo.setUserId(sysUser.getUserId());
List<SchoolXteacherAwardsVo> schoolXteacherAwardsVos = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo); List<SchoolXteacherAwardsVo> schoolXteacherAwardsVos = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
schoolXteacherAwardsVos.forEach(date->{
for (SchoolXteacherAwardsVo date : schoolXteacherAwardsVos){
SpecialityVo specialityVo = new SpecialityVo(); SpecialityVo specialityVo = new SpecialityVo();
BeanUtils.copyProperties(date,specialityVo); specialityVo.setGrowthType("教学获奖");
specialityVo.setSub(date.getSub());
specialityVo.setAwardtype(date.getAwardType());
specialityVo.setAwardlevel(date.getAwardLevel());
specialityVo.setAwardrank(date.getAwardRank());
specialityVo.setResultName(date.getResultName());
specialityVo.setUserId(date.getUserId());
specialityVo.setUserName(date.getUserName());
specialityVo.setOrg(date.getOrg());
specialityVo.setAwardTime(date.getAwardTime());
specialityVos.add(specialityVo); specialityVos.add(specialityVo);
});
}
// * 4.5 讲课获奖 // * 4.5 讲课获奖
SchoolXlectureAwardsVo schoolXlectureAwardsVo = new SchoolXlectureAwardsVo(); SchoolXlectureAwardsVo schoolXlectureAwardsVo = new SchoolXlectureAwardsVo();
schoolXlectureAwardsVo.setUserId(sysUser.getUserId()); schoolXlectureAwardsVo.setUserId(sysUser.getUserId());
List<SchoolXlectureAwardsVo> schoolXlectureAwardsVos = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo); List<SchoolXlectureAwardsVo> schoolXlectureAwardsVos = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
schoolXlectureAwardsVos.forEach(date->{ for (SchoolXlectureAwardsVo date : schoolXlectureAwardsVos){
SpecialityVo specialityVo = new SpecialityVo(); SpecialityVo specialityVo = new SpecialityVo();
BeanUtils.copyProperties(date,specialityVo); specialityVo.setGrowthType("成长类型");
specialityVo.setSub(date.getSub());
specialityVo.setAwardtype(date.getAwardType());
specialityVo.setAwardlevel(date.getAwardLevel());
specialityVo.setAwardrank(date.getAwardRank());
specialityVo.setResultName(date.getResultName());
specialityVo.setUserId(date.getUserId());
specialityVo.setUserName(date.getUserName());
specialityVo.setOrg(date.getOrg());
specialityVo.setAwardTime(date.getAwardTime());
specialityVos.add(specialityVo); specialityVos.add(specialityVo);
});
}
// * 4.6 论文论著 // * 4.6 论文论著
SchoolXacademicWorksVo schoolXacademicWorksVo = new SchoolXacademicWorksVo(); SchoolXacademicWorksVo schoolXacademicWorksVo = new SchoolXacademicWorksVo();
schoolXacademicWorksVo.setUserId(sysUser.getUserId()); schoolXacademicWorksVo.setUserId(sysUser.getUserId());
List<SchoolXacademicWorksVo> schoolXacademicWorksVos = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo); List<SchoolXacademicWorksVo> schoolXacademicWorksVos = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
schoolXacademicWorksVos.forEach(date->{ for (SchoolXacademicWorksVo date : schoolXacademicWorksVos){
SpecialityVo specialityVo = new SpecialityVo(); SpecialityVo specialityVo = new SpecialityVo();
BeanUtils.copyProperties(date,specialityVo); specialityVo.setGrowthType("论文论著");
specialityVo.setSub(date.getSub());
specialityVo.setAwardtype(date.getAwardType());
specialityVo.setAwardlevel(date.getAwardLevel());
specialityVo.setAwardrank(date.getAwardRank());
specialityVo.setResultName(date.getResultName());
specialityVo.setUserId(date.getUserId());
specialityVo.setUserName(date.getUserName());
specialityVo.setOrg(date.getOrg());
specialityVo.setAwardTime(date.getAwardTime());
specialityVos.add(specialityVo); specialityVos.add(specialityVo);
}); }
comperhensiveVo.setSpecialityVos(specialityVos);
// * 4.7课题研究 // * 4.7课题研究
//5 辅导教师获奖 //5 辅导教师获奖
FudaoTeacherVo fudaoTeacher = new FudaoTeacherVo(); FudaoTeacherVo fudaoTeacher = new FudaoTeacherVo();
fudaoTeacher.setUserid(sysUser.getUserId()); fudaoTeacher.setUserid(sysUser.getUserId());
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentMapper.xml
...@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="semester != null and semester != ''"> and semester = #{semester}</if> <if test="semester != null and semester != ''"> and semester = #{semester}</if>
<if test="grade != null and grade != ''"> and grade = #{grade}</if> <if test="grade != null and grade != ''"> and grade = #{grade}</if>
<if test="classType != null and classType != ''"> and class_type = #{classType}</if> <if test="classType != null and classType != ''"> and class_type = #{classType}</if>
<if test="idCard != null and idCard != ''"> and id_card = #{idCard}</if>
<if test="className != null and className != ''"> and class_name like concat('%', #{className}, '%')</if> <if test="className != null and className != ''"> and class_name like concat('%', #{className}, '%')</if>
...@@ -69,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -69,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="grade != null and grade != ''"> and grade = #{grade}</if> <if test="grade != null and grade != ''"> and grade = #{grade}</if>
<if test="classType != null and classType != ''"> and class_type = #{classType}</if> <if test="classType != null and classType != ''"> and class_type = #{classType}</if>
<if test="className != null and className != ''"> and class_name like concat('%', #{className}, '%')</if> <if test="className != null and className != ''"> and class_name like concat('%', #{className}, '%')</if>
<if test="idCard != null and idCard != ''"> and id_card = #{idCard}</if>
<if test="moralEduCheckAchievement != null and moralEduCheckAchievement != ''"> and moral_edu_check_achievement = #{moralEduCheckAchievement}</if> <if test="moralEduCheckAchievement != null and moralEduCheckAchievement != ''"> and moral_edu_check_achievement = #{moralEduCheckAchievement}</if>
......
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