Commit 31d79280 by baochunxin

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

parent 9f38a94d
...@@ -19,17 +19,18 @@ import org.springframework.beans.BeanUtils; ...@@ -19,17 +19,18 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.*; import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.*;
import yangtz.cs.liu.campus.service.impl.teacherFiles.IdCardNumberUtils; 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.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.*; import java.io.*;
import java.util.ArrayList; import java.text.SimpleDateFormat;
import java.util.Arrays; import java.util.*;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
...@@ -289,9 +290,14 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -289,9 +290,14 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
//创建表格(具体样式需要根据生成的PDF去调整) //创建表格(具体样式需要根据生成的PDF去调整)
PdfPTable pdfPTable = PDFUtil.getPdfPTable(8, 100, 1500); PdfPTable pdfPTable = PDFUtil.getPdfPTable(8, 100, 1500);
Chunk qtchunk = PDFUtil.getChunk("教师基本信息", PDFUtil.getFont(baseFont, 10, Font.NORMAL));
Font font = PDFUtil.getFont(baseFont, 12, Font.NORMAL);
font.setStyle(Font.BOLD);
Chunk qtchunk = PDFUtil.getChunk("教师基本信息", font);
Paragraph qtParagraph = PDFUtil.getParagraph(qtchunk, Element.ALIGN_LEFT, 0, null); Paragraph qtParagraph = PDFUtil.getParagraph(qtchunk, Element.ALIGN_LEFT, 0, null);
qtParagraph.setSpacingAfter(5f);
qtParagraph.setLeading(15f); //行间距
qtParagraph.setSpacingBefore(10f); //设置段落上空白
document.add(qtParagraph); document.add(qtParagraph);
//创建单元格对象 //创建单元格对象
...@@ -316,11 +322,13 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -316,11 +322,13 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
PDFUtil.addPdfPCell(basicInformation.getAge().toString(), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(basicInformation.getAge().toString(), cellcoentFont, pdfCell, pdfPTable, 20);
Image img = Image.getInstance(basicInformation.getPhotoUrl()); Image img = Image.getInstance(basicInformation.getPhotoUrl());
//测试图片
// Image img = Image.getInstance("https://img.dahepiao.com/uploads/allimg/191010/10540H550-0.jpg");
Font sonTitleFont = PDFUtil.getFont(baseFont, 11, Font.BOLD); Font sonTitleFont = PDFUtil.getFont(baseFont, 11, Font.BOLD);
PdfPCell nameplateCell = PDFUtil.getColSpanPdfCell(PDFUtil.getPhrase(" 照片 ", sonTitleFont), PdfPCell nameplateCell = PDFUtil.getColSpanPdfCell(PDFUtil.getPhrase(" 照片 ", sonTitleFont),
Element.ALIGN_CENTER, Element.ALIGN_MIDDLE, 15, Boolean.TRUE, 2,6); Element.ALIGN_CENTER, Element.ALIGN_MIDDLE, 15, Boolean.TRUE, 2,6);
img.scaleToFit(135f, 1000); // img.scaleToFit(135f, 1000);
img.setAlignment(Element.ALIGN_CENTER);
nameplateCell.setImage(img); nameplateCell.setImage(img);
pdfPTable.addCell(nameplateCell); pdfPTable.addCell(nameplateCell);
...@@ -338,13 +346,13 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -338,13 +346,13 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
PDFUtil.addPdfPTitleCell("档案出生年月", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("档案出生年月", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell( isNotString(basicInformation.getFileBirthDate()), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell( dateConversionString(basicInformation.getFileBirthDate()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("政治面貌", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("政治面貌", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("politics_tatusls",basicInformation.getPoliticalLandscape()), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("politics_tatusls",basicInformation.getPoliticalLandscape()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("入党时间", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("入党时间", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(isNotString(basicInformation.getPartyMembershipTime()), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(dateConversionString(basicInformation.getPartyMembershipTime()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("任教学科", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("任教学科", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("sub_dzdn",basicInformation.getTeachingSubject()), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("sub_dzdn",basicInformation.getTeachingSubject()), cellcoentFont, pdfCell, pdfPTable, 20);
...@@ -353,13 +361,13 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -353,13 +361,13 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("current_professional",basicInformation.getCurrentProfessionalTitle()), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("current_professional",basicInformation.getCurrentProfessionalTitle()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("现职称取得资格时间", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("现职称取得资格时间", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(isNotString(basicInformation.getCurrentProfessionalTitleTime()), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(dateConversionString(basicInformation.getCurrentProfessionalTitleTime()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("现聘职称", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("现聘职称", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("current_professional",basicInformation.getCurrentHiringProfessionalTitle()), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("current_professional",basicInformation.getCurrentHiringProfessionalTitle()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("现职称聘任时间", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("现职称聘任时间", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(isNotString(basicInformation.getCurrentHiringProfessionalTitleTime()), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(dateConversionString(basicInformation.getCurrentHiringProfessionalTitleTime()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("现聘岗位", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("现聘岗位", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("current_position",basicInformation.getCurrentPosition()), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("current_position",basicInformation.getCurrentPosition()), cellcoentFont, pdfCell, pdfPTable, 20);
...@@ -368,7 +376,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -368,7 +376,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("current_joblevel",basicInformation.getCurrentJobLevel()), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("current_joblevel",basicInformation.getCurrentJobLevel()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("现岗位等级聘任时间", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("现岗位等级聘任时间", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(isNotString(basicInformation.getCurrentJobLevelAppointmentTime()), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(dateConversionString(basicInformation.getCurrentJobLevelAppointmentTime()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("职务", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("职务", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getDuties(), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(basicInformation.getDuties(), cellcoentFont, pdfCell, pdfPTable, 20);
...@@ -384,19 +392,19 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -384,19 +392,19 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
PDFUtil.addPdfPCell(basicInformation.getWorkingHours(), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(basicInformation.getWorkingHours(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("到二中工作时间", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("到二中工作时间", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(isNotString(basicInformation.getToSecondMiddleSchoolTime()), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(dateConversionString(basicInformation.getToSecondMiddleSchoolTime()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("二中工作年龄", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("二中工作年龄", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getToSecondAge().toString(), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(basicInformation.getToSecondAge().toString(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("教龄起算时间", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("教龄起算时间", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(isNotString(basicInformation.getLengthOfTeacherTime()), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(dateConversionString(basicInformation.getLengthOfTeacherTime()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("工龄起算时间", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("工龄起算时间", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(isNotString(basicInformation.getLengthOfTeacherTime()), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(dateConversionString(basicInformation.getLengthOfTeacherTime()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("工龄年限", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("工龄年限", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getSeniority().toString(), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(isNotString(basicInformation.getSeniority()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("在岗情况", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("在岗情况", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("current_situation",basicInformation.getOnDutySituation()), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("current_situation",basicInformation.getOnDutySituation()), cellcoentFont, pdfCell, pdfPTable, 20);
...@@ -412,7 +420,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -412,7 +420,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
PDFUtil.addPdfPCell(basicInformation.getMajor1(), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(basicInformation.getMajor1(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("毕业时间1", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("毕业时间1", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(isNotString(basicInformation.getGraduationTime1()), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(dateConversionString(basicInformation.getGraduationTime1()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("毕业学院2", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("毕业学院2", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getGraduationInstitution2(), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(basicInformation.getGraduationInstitution2(), cellcoentFont, pdfCell, pdfPTable, 20);
...@@ -421,7 +429,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -421,7 +429,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
PDFUtil.addPdfPCell(basicInformation.getMajor2(), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(basicInformation.getMajor2(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("毕业时间2", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("毕业时间2", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(isNotString(basicInformation.getGraduationTime2()), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(dateConversionString(basicInformation.getGraduationTime2()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("毕业学院3", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("毕业学院3", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getGraduationInstitution3(), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(basicInformation.getGraduationInstitution3(), cellcoentFont, pdfCell, pdfPTable, 20);
...@@ -430,7 +438,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -430,7 +438,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
PDFUtil.addPdfPCell(basicInformation.getMajor3(), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(basicInformation.getMajor3(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("毕业时间3", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("毕业时间3", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(isNotString(basicInformation.getGraduationTime3()), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(dateConversionString(basicInformation.getGraduationTime3()), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("第一学历", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("第一学历", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getFirstDegree(), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(basicInformation.getFirstDegree(), cellcoentFont, pdfCell, pdfPTable, 20);
...@@ -441,20 +449,223 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -441,20 +449,223 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
PDFUtil.addPdfPTitleCell("学位", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("学位", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(basicInformation.getDegree(), cellcoentFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPCell(basicInformation.getDegree(), cellcoentFont, pdfCell, pdfPTable, 20);
//将表格添加至文中
document.add(pdfPTable);
//2.表格 工作量信息 //2.表格 工作量信息
PdfPTable pdfPTablegz = PDFUtil.getPdfPTable(16, 100, 1500);
Chunk qtchunkgz = PDFUtil.getChunk("工作量信息",font);
Paragraph qtParagraphgz = PDFUtil.getParagraph(qtchunkgz, Element.ALIGN_LEFT, 0, null);
qtParagraphgz.setSpacingAfter(5f);
qtParagraphgz.setLeading(15f); //行间距
qtParagraphgz.setSpacingBefore(10f); //设置段落上空白
document.add(qtParagraphgz);
List<SchoolAworkloadVo> schoolAworkload = comprehensive.getSchoolAworkload();
PDFUtil.addPdfPTitleCell("学年", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("学期", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("届别", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("年级", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("姓名", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("学科", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("聘任岗位", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("聘任职务", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("聘任情况", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("班级", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("班级类型", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("早读", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("正课", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("晚自习", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("合计", cellFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPTitleCell("证明人", cellFont, pdfCell, pdfPTablegz, 20);
for (SchoolAworkloadVo date: schoolAworkload){
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("yearda",date.getSchoolYear()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("semester_jsdzda",date.getSemester()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("rankda",date.getYear()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("grade_da",date.getGrade()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(date.getName(), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("sub_dzdn",date.getSub()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("appointment_positions",date.getAppointmentPost()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(date.getAppointmentPosition(), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("appointment_situation",date.getAppointmentSituation()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(date.getClassName(), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(date.getClassType(), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(isNotString(date.getEarlyReading()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(isNotString(date.getRequiredCourses()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(isNotString(date.getEveningSelfStudy()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(isNotString(date.getAmountTo()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(isNotString(date.getUserName()), cellcoentFont, pdfCell, pdfPTablegz, 20);
}
document.add(pdfPTablegz);
//3.表格 班主任任职 //3.表格 班主任任职
PdfPTable pdfPTablebzr = PDFUtil.getPdfPTable(10, 100, 1500);
Chunk qtchunbzr = PDFUtil.getChunk("班主任任职", font);
Paragraph qtParagraphbzr = PDFUtil.getParagraph(qtchunbzr, Element.ALIGN_LEFT, 0, null);
qtParagraphbzr.setSpacingAfter(5f);
qtParagraphbzr.setLeading(15f); //行间距
qtParagraphbzr.setSpacingBefore(10f); //设置段落上空白
document.add(qtParagraphbzr);
List<SchoolAclassTeacherAssessmentVo> schoolAclassTeacherAssessments = comprehensive.getSchoolAclassTeacherAssessments();
PDFUtil.addPdfPTitleCell("学年", cellFont, pdfCell, pdfPTablebzr, 20);
PDFUtil.addPdfPTitleCell("学期", cellFont, pdfCell, pdfPTablebzr, 20);
PDFUtil.addPdfPTitleCell("届别", cellFont, pdfCell, pdfPTablebzr, 20);
PDFUtil.addPdfPTitleCell("年级", cellFont, pdfCell, pdfPTablebzr, 20);
PDFUtil.addPdfPTitleCell("班级", cellFont, pdfCell, pdfPTablebzr, 20);
PDFUtil.addPdfPTitleCell("班级类型", cellFont, pdfCell, pdfPTablebzr, 20);
PDFUtil.addPdfPTitleCell("教师姓名", cellFont, pdfCell, pdfPTablebzr, 20);
PDFUtil.addPdfPTitleCell("学科", cellFont, pdfCell, pdfPTablebzr, 20);
PDFUtil.addPdfPTitleCell("德育考核成绩", cellFont, pdfCell, pdfPTablebzr, 20);
PDFUtil.addPdfPTitleCell("智育考核成绩", cellFont, pdfCell, pdfPTablebzr, 20);
for (SchoolAclassTeacherAssessmentVo date: schoolAclassTeacherAssessments){
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("yearda",date.getSchoolYear()), cellcoentFont, pdfCell, pdfPTablebzr, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("semester_jsdzda",date.getSemester()), cellcoentFont, pdfCell, pdfPTablebzr, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("rankda",date.getYear()), cellcoentFont, pdfCell, pdfPTablebzr, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("grade_da",date.getGrade()), cellcoentFont, pdfCell, pdfPTablebzr, 20);
PDFUtil.addPdfPCell(date.getClassName(), cellcoentFont, pdfCell, pdfPTablebzr, 20);
PDFUtil.addPdfPCell(date.getClassType(), cellcoentFont, pdfCell, pdfPTablebzr, 20);
PDFUtil.addPdfPCell(date.getTeacherName(), cellcoentFont, pdfCell, pdfPTablebzr, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("sub_dzdn",date.getSub()), cellcoentFont, pdfCell, pdfPTablebzr, 20);
PDFUtil.addPdfPCell(isNotString(date.getMoralEduCheckAchievement()), cellcoentFont, pdfCell, pdfPTablebzr, 20);
PDFUtil.addPdfPCell(isNotString(date.getMoralEduCheckAchievement()), cellcoentFont, pdfCell, pdfPTablebzr, 20);
}
document.add(pdfPTablebzr);
//4.表格 专业成长 //4.表格 专业成长
PdfPTable pdfPTablezy = PDFUtil.getPdfPTable(9, 100, 1500);
Chunk qtchunzy = PDFUtil.getChunk("专业成长", font);
Paragraph qtParagraphzy = PDFUtil.getParagraph(qtchunzy, Element.ALIGN_LEFT, 0, null);
qtParagraphzy.setSpacingAfter(5f);
qtParagraphzy.setLeading(15f); //行间距
qtParagraphzy.setSpacingBefore(10f); //设置段落上空白
document.add(qtParagraphzy);
List<SpecialityVo> specialityVos = comprehensive.getSpecialityVos();
PDFUtil.addPdfPTitleCell("成长类型", cellFont, pdfCell, pdfPTablezy, 20);
PDFUtil.addPdfPTitleCell("学科", cellFont, pdfCell, pdfPTablezy, 20);
PDFUtil.addPdfPTitleCell("获奖类别", cellFont, pdfCell, pdfPTablezy, 20);
PDFUtil.addPdfPTitleCell("获奖等级", cellFont, pdfCell, pdfPTablezy, 20);
PDFUtil.addPdfPTitleCell("获奖级别", cellFont, pdfCell, pdfPTablezy, 20);
PDFUtil.addPdfPTitleCell("成果名称", cellFont, pdfCell, pdfPTablezy, 20);
PDFUtil.addPdfPTitleCell("教师姓名", cellFont, pdfCell, pdfPTablezy, 20);
PDFUtil.addPdfPTitleCell("主办单位", cellFont, pdfCell, pdfPTablezy, 20);
PDFUtil.addPdfPTitleCell("获奖时间", cellFont, pdfCell, pdfPTablezy, 20);
if (null != specialityVos){
for (SpecialityVo date: specialityVos){
PDFUtil.addPdfPCell(date.getGrowthType(), cellcoentFont, pdfCell, pdfPTablezy, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("sub_dzdn",date.getSub()), cellcoentFont, pdfCell, pdfPTablezy, 20);
PDFUtil.addPdfPCell( conversionType(date.getGrowthType(),date.getAwardtype()), cellcoentFont, pdfCell, pdfPTablezy, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("award_rank",date.getAwardlevel()), cellcoentFont, pdfCell, pdfPTablezy, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("awards_level",date.getAwardrank()), cellcoentFont, pdfCell, pdfPTablezy, 20);
PDFUtil.addPdfPCell(date.getResultName(), cellcoentFont, pdfCell, pdfPTablezy, 20);
PDFUtil.addPdfPCell(date.getUserName(), cellcoentFont, pdfCell, pdfPTablezy, 20);
PDFUtil.addPdfPCell(date.getOrg(), cellcoentFont, pdfCell, pdfPTablezy, 20);
PDFUtil.addPdfPCell(dateConversionString(date.getAwardTime()), cellcoentFont, pdfCell, pdfPTablezy, 20);
}
}
document.add(pdfPTablezy);
//5.表格 年度考核 //5.表格 年度考核
PdfPTable pdfPTablend = PDFUtil.getPdfPTable(5, 100, 1500);
Chunk qtchunnd = PDFUtil.getChunk("年度考核", font);
Paragraph qtParagraphnd = PDFUtil.getParagraph(qtchunnd, Element.ALIGN_LEFT, 0, null);
qtParagraphnd.setSpacingAfter(5f);
qtParagraphnd.setLeading(15f); //行间距
qtParagraphnd.setSpacingBefore(10f); //设置段落上空白
document.add(qtParagraphnd);
List<SchoolAnnualAssessment> schoolAnnualAssessment = comprehensive.getSchoolAnnualAssessment();
PDFUtil.addPdfPTitleCell("年度", cellFont, pdfCell, pdfPTablend, 20);
PDFUtil.addPdfPTitleCell("姓名", cellFont, pdfCell, pdfPTablend, 20);
PDFUtil.addPdfPTitleCell("身份证", cellFont, pdfCell, pdfPTablend, 20);
PDFUtil.addPdfPTitleCell("考核结果", cellFont, pdfCell, pdfPTablend, 20);
PDFUtil.addPdfPTitleCell("备注", cellFont, pdfCell, pdfPTablend, 20);
for (SchoolAnnualAssessment date: schoolAnnualAssessment){
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("rankda",date.getYear().toString()), cellcoentFont, pdfCell, pdfPTablend, 20);
PDFUtil.addPdfPCell(date.getName(), cellcoentFont, pdfCell, pdfPTablend, 20);
PDFUtil.addPdfPCell(date.getIdCard(), cellcoentFont, pdfCell, pdfPTablend, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("check_result",date.getCheckResult()), cellcoentFont, pdfCell, pdfPTablend, 20);
PDFUtil.addPdfPCell(date.getRemark(), cellcoentFont, pdfCell, pdfPTablend, 20);
}
document.add(pdfPTablend);
//6.表格 教学成绩 //6.表格 教学成绩
PdfPTable pdfPTablejx = PDFUtil.getPdfPTable(13, 100, 1500);
Chunk qtchunjx = PDFUtil.getChunk("教学成绩", font);
Paragraph qtParagraphndjx = PDFUtil.getParagraph(qtchunjx, Element.ALIGN_LEFT, 0, null);
qtParagraphndjx.setSpacingAfter(5f);
qtParagraphndjx.setLeading(15f); //行间距
qtParagraphndjx.setSpacingBefore(10f); //设置段落上空白
document.add(qtParagraphndjx);
List<SchoolXteachingAchievementsVo> schoolXteachingAchievements = comprehensive.getSchoolXteachingAchievements();
PDFUtil.addPdfPTitleCell("学年", cellFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPTitleCell("学期", cellFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPTitleCell("年级", cellFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPTitleCell("届别", cellFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPTitleCell("姓名", cellFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPTitleCell("身份证号", cellFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPTitleCell("考试时间", cellFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPTitleCell("考试类型", cellFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPTitleCell("学科", cellFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPTitleCell("班级", cellFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPTitleCell("班级类型", cellFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPTitleCell("考核分", cellFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPTitleCell("备注", cellFont, pdfCell, pdfPTablejx, 20);
for (SchoolXteachingAchievementsVo date: schoolXteachingAchievements){
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("yearda",date.getSchoolYear()), cellcoentFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("semester_jsdzda",date.getSemester()), cellcoentFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("grade_da",date.getGrade()), cellcoentFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPCell(date.getGrade(), cellcoentFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPCell(date.getUserName(), cellcoentFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPCell(date.getIdCard(), cellcoentFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPCell(dateConversionString(date.getExamTime()), cellcoentFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("exam_typeda",date.getExamType()), cellcoentFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("sub_dzdn",date.getSub()), cellcoentFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPCell(date.getClassName(), cellcoentFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPCell( date.getClassType(), cellcoentFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPCell(isNotString(date.getAssessmentScore()), cellcoentFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPCell(date.getRemark(), cellcoentFont, pdfCell, pdfPTablejx, 20);
}
document.add(pdfPTablejx);
//7.表格 高考成绩 //7.表格 高考成绩
PdfPTable pdfPTablegk = PDFUtil.getPdfPTable(10, 100, 1500);
Chunk qtchungk = PDFUtil.getChunk("高考成绩", font);
Paragraph qtParagraphndgk = PDFUtil.getParagraph(qtchungk, Element.ALIGN_LEFT, 0, null);
//将表格添加至文中 qtParagraphndgk.setSpacingAfter(5f);
document.add(pdfPTable); qtParagraphndgk.setLeading(15f); //行间距
qtParagraphndgk.setSpacingBefore(10f); //设置段落上空白
document.add(qtParagraphndgk);
List<SchoolGkAchievementVo> schoolGkAchievement = comprehensive.getSchoolGkAchievement();
PDFUtil.addPdfPTitleCell("届别", cellFont, pdfCell, pdfPTablegk, 20);
PDFUtil.addPdfPTitleCell("学科", cellFont, pdfCell, pdfPTablegk, 20);
PDFUtil.addPdfPTitleCell("教师姓名", cellFont, pdfCell, pdfPTablegk, 20);
PDFUtil.addPdfPTitleCell("授课班级", cellFont, pdfCell, pdfPTablegk, 20);
PDFUtil.addPdfPTitleCell("班级类型", cellFont, pdfCell, pdfPTablegk, 20);
PDFUtil.addPdfPTitleCell("高考评优", cellFont, pdfCell, pdfPTablegk, 20);
PDFUtil.addPdfPTitleCell("尖子生培养", cellFont, pdfCell, pdfPTablegk, 20);
PDFUtil.addPdfPTitleCell("增量情况", cellFont, pdfCell, pdfPTablegk, 20);
PDFUtil.addPdfPTitleCell("有效数情况", cellFont, pdfCell, pdfPTablegk, 20);
PDFUtil.addPdfPTitleCell("其他情况", cellFont, pdfCell, pdfPTablegk, 20);
for (SchoolGkAchievementVo date: schoolGkAchievement){
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("rankda",date.getYear()), cellcoentFont, pdfCell, pdfPTablegk, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("sub_dzdn",date.getSub()), cellcoentFont, pdfCell, pdfPTablegk, 20);
PDFUtil.addPdfPCell(date.getTeacherName(), cellcoentFont, pdfCell, pdfPTablegk, 20);
PDFUtil.addPdfPCell(date.getTeachingClassName(), cellcoentFont, pdfCell, pdfPTablegk, 20);
PDFUtil.addPdfPCell(date.getClassType(), cellcoentFont, pdfCell, pdfPTablegk, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("gk_appraising",date.getGkAppraising()), cellcoentFont, pdfCell, pdfPTablegk, 20);
PDFUtil.addPdfPCell(date.getTopStudentsCulture(), cellcoentFont, pdfCell, pdfPTablegk, 20);
PDFUtil.addPdfPCell(date.getIncrementSituation(), cellcoentFont, pdfCell, pdfPTablegk, 20);
PDFUtil.addPdfPCell(date.getEffectiveNumSituation(), cellcoentFont, pdfCell, pdfPTablegk, 20);
PDFUtil.addPdfPCell(date.getOther(), cellcoentFont, pdfCell, pdfPTablegk, 20);
}
document.add(pdfPTablegk);
//导出 //导出
PDFUtil.exportPDF(document, response, outStream); PDFUtil.exportPDF(document, response, outStream);
}catch (Exception e){ }catch (Exception e){
...@@ -472,4 +683,26 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -472,4 +683,26 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
} }
} }
private String dateConversionString(Date date){
if (null == date){
return "";
}
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
String format = sdf1.format(date);
return format;
}
private String conversionType(String type,String value){
switch (type){
case "综合荣誉": return value;
case "教学获奖": return sysDictDataService.selectDictLabel("award_categoriesjs",value);
case "成长类型": return sysDictDataService.selectDictLabel("award_categoriesjk",value);
case "论文论著": return sysDictDataService.selectDictLabel("award_categories",value);
}
return "";
}
} }
...@@ -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());
......
...@@ -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