Skip to content

D
dd_school
Commit 65cfae5a by wangqi
Options

教师电子档案

parent c38d59f2
Showing with 62 additions and 36 deletions
ruoyi-admin/src/main/resources/application-druid.yml
...@@ -9,10 +9,14 @@ spring: ...@@ -9,10 +9,14 @@ spring:
# url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true # url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
# username: root # username: root
# password: password # password: password
# master:
# url: jdbc:mysql://1.116.38.25:3986/dd_smart_school?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
# username: henneg
# password: heneng2024
master: master:
url: jdbc:mysql://1.116.38.25:3986/dd_smart_school?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true url: jdbc:mysql://192.168.31.167:3306/dd_smart_school?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
username: henneg username: root
password: heneng2024 password: qianhe2024
# #二中 # #二中
# master: # master:
# url: jdbc:mysql://10.20.100.201:3306/dd_smart_school?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true # url: jdbc:mysql://10.20.100.201:3306/dd_smart_school?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationController.java
...@@ -416,16 +416,18 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -416,16 +416,18 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
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);
PDFUtil.addPdfPTitleCell("现职称", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("现具备专技资格", cellFont, pdfCell, pdfPTable, 20);
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.addPdfPCell(basicInformation.getCurrentProfessionalTitle(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("现职称取得资格时间", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("现具备专技资格时间", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(dateConversionString(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.addPdfPCell(basicInformation.getCurrentHiringProfessionalTitle(), cellcoentFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPTitleCell("现职称聘任时间", cellFont, pdfCell, pdfPTable, 20); PDFUtil.addPdfPTitleCell("现聘专技资格时间", cellFont, pdfCell, pdfPTable, 20);
PDFUtil.addPdfPCell(dateConversionString(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);
...@@ -515,7 +517,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -515,7 +517,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
document.add(pdfPTable); document.add(pdfPTable);
//2.表格 工作量信息 //2.表格 工作量信息
PdfPTable pdfPTablegz = PDFUtil.getPdfPTable(16, 100, 1500); PdfPTable pdfPTablegz = PDFUtil.getPdfPTable(13, 100, 1500);
Chunk qtchunkgz = PDFUtil.getChunk("工作量信息",font); Chunk qtchunkgz = PDFUtil.getChunk("工作量信息",font);
Paragraph qtParagraphgz = PDFUtil.getParagraph(qtchunkgz, Element.ALIGN_LEFT, 0, null); Paragraph qtParagraphgz = PDFUtil.getParagraph(qtchunkgz, Element.ALIGN_LEFT, 0, null);
qtParagraphgz.setSpacingAfter(5f); qtParagraphgz.setSpacingAfter(5f);
...@@ -535,10 +537,11 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -535,10 +537,11 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
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); PDFUtil.addPdfPTitleCell("证明人", cellFont, pdfCell, pdfPTablegz, 20);
for (SchoolAworkloadVo date: schoolAworkload){ for (SchoolAworkloadVo date: schoolAworkload){
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("yearda",date.getSchoolYear()), cellcoentFont, pdfCell, pdfPTablegz, 20); PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("yearda",date.getSchoolYear()), cellcoentFont, pdfCell, pdfPTablegz, 20);
...@@ -552,16 +555,17 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -552,16 +555,17 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("appointment_situation",date.getAppointmentSituation()), 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.getClassName(), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(date.getClassType(), 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.getEarlyReading()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(isNotString(date.getRequiredCourses()), 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.getEveningSelfStudy()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(isNotString(date.getAmountTo()), cellcoentFont, pdfCell, pdfPTablegz, 20); PDFUtil.addPdfPCell(isNotString(date.getAmountTo()), cellcoentFont, pdfCell, pdfPTablegz, 20);*/
PDFUtil.addPdfPCell(isNotString(date.getWeeklyClassHours()), cellcoentFont, pdfCell, pdfPTablegz, 20);
PDFUtil.addPdfPCell(isNotString(date.getUserName()), cellcoentFont, pdfCell, pdfPTablegz, 20); PDFUtil.addPdfPCell(isNotString(date.getUserName()), cellcoentFont, pdfCell, pdfPTablegz, 20);
} }
document.add(pdfPTablegz); document.add(pdfPTablegz);
//3.表格 班主任任职 //3.表格 班主任任职
PdfPTable pdfPTablebzr = PDFUtil.getPdfPTable(10, 100, 1500); PdfPTable pdfPTablebzr = PDFUtil.getPdfPTable(11, 100, 1500);
Chunk qtchunbzr = PDFUtil.getChunk("班主任任职", font); Chunk qtchunbzr = PDFUtil.getChunk("班主任任职", font);
Paragraph qtParagraphbzr = PDFUtil.getParagraph(qtchunbzr, Element.ALIGN_LEFT, 0, null); Paragraph qtParagraphbzr = PDFUtil.getParagraph(qtchunbzr, Element.ALIGN_LEFT, 0, null);
qtParagraphbzr.setSpacingAfter(5f); qtParagraphbzr.setSpacingAfter(5f);
...@@ -580,6 +584,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -580,6 +584,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
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){ for (SchoolAclassTeacherAssessmentVo date: schoolAclassTeacherAssessments){
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("yearda",date.getSchoolYear()), cellcoentFont, pdfCell, pdfPTablebzr, 20); PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("yearda",date.getSchoolYear()), cellcoentFont, pdfCell, pdfPTablebzr, 20);
...@@ -592,6 +597,8 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -592,6 +597,8 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("sub_dzdn",date.getSub()), 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);
PDFUtil.addPdfPCell(isNotString(date.getMoralEduCheckAchievement()), cellcoentFont, pdfCell, pdfPTablebzr, 20); PDFUtil.addPdfPCell(isNotString(date.getMoralEduCheckAchievement()), cellcoentFont, pdfCell, pdfPTablebzr, 20);
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("assessment_results",date.getAssessmentResults()), cellcoentFont, pdfCell, pdfPTablebzr, 20);
} }
document.add(pdfPTablebzr); document.add(pdfPTablebzr);
//4.表格 专业成长 //4.表格 专业成长
...@@ -654,7 +661,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -654,7 +661,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
} }
document.add(pdfPTablend); document.add(pdfPTablend);
//6.表格 教学成绩 //6.表格 教学成绩
PdfPTable pdfPTablejx = PDFUtil.getPdfPTable(13, 100, 1500); PdfPTable pdfPTablejx = PDFUtil.getPdfPTable(15, 100, 1500);
Chunk qtchunjx = PDFUtil.getChunk("教学成绩", font); Chunk qtchunjx = PDFUtil.getChunk("教学成绩", font);
Paragraph qtParagraphndjx = PDFUtil.getParagraph(qtchunjx, Element.ALIGN_LEFT, 0, null); Paragraph qtParagraphndjx = PDFUtil.getParagraph(qtchunjx, Element.ALIGN_LEFT, 0, null);
qtParagraphndjx.setSpacingAfter(5f); qtParagraphndjx.setSpacingAfter(5f);
...@@ -674,7 +681,9 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -674,7 +681,9 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
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){ for (SchoolXteachingAchievementsVo date: schoolXteachingAchievements){
...@@ -689,6 +698,8 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -689,6 +698,8 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
PDFUtil.addPdfPCell(sysDictDataService.selectDictLabel("sub_dzdn",date.getSub()), 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.getClassName(), cellcoentFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPCell( date.getClassType(), cellcoentFont, pdfCell, pdfPTablejx, 20); PDFUtil.addPdfPCell( date.getClassType(), cellcoentFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPCell(isNotString(date.getCgzl()), cellcoentFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPCell(isNotString(date.getYszl()), cellcoentFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPCell(isNotString(date.getAssessmentScore()), cellcoentFont, pdfCell, pdfPTablejx, 20); PDFUtil.addPdfPCell(isNotString(date.getAssessmentScore()), cellcoentFont, pdfCell, pdfPTablejx, 20);
PDFUtil.addPdfPCell(date.getRemark(), cellcoentFont, pdfCell, pdfPTablejx, 20); PDFUtil.addPdfPCell(date.getRemark(), cellcoentFont, pdfCell, pdfPTablejx, 20);
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasicInformation.java
...@@ -97,26 +97,26 @@ public class SchoolTeacherBasicInformation extends BaseEntity { ...@@ -97,26 +97,26 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
/** /**
* 现职称(1无、2初级、3中级、4副高、5正高) * 现职称(1无、2初级、3中级、4副高、5正高)
*/ */
@Excel(name = "现职称") @Excel(name = "现具备专技资格")
private String currentProfessionalTitle; private String currentProfessionalTitle;
/** /**
* 现职称取得资格时间 * 现职称取得资格时间
*/ */
@Excel(name = "现职称取得资格时间") @Excel(name = "现具备专技资格时间")
// @JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date currentProfessionalTitleTime; private Date currentProfessionalTitleTime;
/** /**
* 现聘职称(1无、2初级、3中级、4副高、5正高) * 现聘职称(1无、2初级、3中级、4副高、5正高)
*/ */
@Excel(name = "现聘职称") @Excel(name = "现聘专技资格")
private String currentHiringProfessionalTitle; private String currentHiringProfessionalTitle;
/** /**
* 现职称聘任时间 * 现职称聘任时间
*/ */
@Excel(name = "现职称聘任时间") @Excel(name = "现聘专技资格时间")
// @JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date currentHiringProfessionalTitleTime; private Date currentHiringProfessionalTitleTime;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasicInformationVo.java
...@@ -109,27 +109,27 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity { ...@@ -109,27 +109,27 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity {
/** /**
* 现职称(1无、2初级、3中级、4副高、5正高) * 现职称(1无、2初级、3中级、4副高、5正高)
*/ */
@Excel(name = "现职称" ,dictType= "current_professional") @Excel(name = "现具备专技资格")
private String currentProfessionalTitle; private String currentProfessionalTitle;
/** /**
* 现职称取得资格时间 * 现职称取得资格时间
*/ */
@Excel(name = "现职称取得时间" ,dateFormat="yyyy-MM-dd") @Excel(name = "现具备专技资格时间" ,dateFormat="yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
private Date currentProfessionalTitleTime; private Date currentProfessionalTitleTime;
/** /**
* 现聘职称(1无、2初级、3中级、4副高、5正高) * 现聘职称(1无、2初级、3中级、4副高、5正高)
*/ */
@Excel(name = "现聘职称",dictType= "current_professional") @Excel(name = "现聘专技资格")
private String currentHiringProfessionalTitle; private String currentHiringProfessionalTitle;
/** /**
* 现职称聘任时间 * 现职称聘任时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "现聘职称取得时间" ,dateFormat="yyyy-MM-dd") @Excel(name = "现聘专技资格时间" ,dateFormat="yyyy-MM-dd")
private Date currentHiringProfessionalTitleTime; private Date currentHiringProfessionalTitleTime;
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasiclnExport.java
...@@ -97,25 +97,25 @@ public class SchoolTeacherBasiclnExport { ...@@ -97,25 +97,25 @@ public class SchoolTeacherBasiclnExport {
/** /**
* 现职称(1无、2初级、3中级、4副高、5正高) * 现职称(1无、2初级、3中级、4副高、5正高)
*/ */
@Excel(name = "现职称" ,dictType= "current_professional") @Excel(name = "现具备专技资格")
private String currentProfessionalTitle; private String currentProfessionalTitle;
/** /**
* 现职称取得资格时间 * 现职称取得资格时间
*/ */
@Excel(name = "现职称取得时间" ,dateFormat="yyyy-MM-dd") @Excel(name = "现具备专技资格时间" ,dateFormat="yyyy-MM-dd")
private Date currentProfessionalTitleTime; private Date currentProfessionalTitleTime;
/** /**
* 现聘职称(1无、2初级、3中级、4副高、5正高) * 现聘职称(1无、2初级、3中级、4副高、5正高)
*/ */
@Excel(name = "现聘职称",dictType= "current_professional") @Excel(name = "现聘专技资格")
private String currentHiringProfessionalTitle; private String currentHiringProfessionalTitle;
/** /**
* 现职称聘任时间 * 现职称聘任时间
*/ */
@Excel(name = "现聘职称取得时间" ,dateFormat="yyyy-MM-dd") @Excel(name = "现聘专技资格时间" ,dateFormat="yyyy-MM-dd")
private Date currentHiringProfessionalTitleTime; private Date currentHiringProfessionalTitleTime;
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationServicelmpl.java
...@@ -244,27 +244,38 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo ...@@ -244,27 +244,38 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
} }
} }
//5现职称 //5现职称
schoolCheckVo = checkeDicet("current_professional", date.getCurrentProfessionalTitle()); /* schoolCheckVo = checkeDicet("current_professional", date.getCurrentProfessionalTitle());
if (schoolCheckVo !=null) { if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) { if (schoolCheckVo.getFlag()) {
date.setCurrentProfessionalTitle(schoolCheckVo.getVal()); date.setCurrentProfessionalTitle(schoolCheckVo.getVal());
} else { } else {
sb.append(date.getName() + "用户现职称录入不符合选择项:" + schoolCheckVo.getVal()); sb.append(date.getName() + "用户现具备专技资格录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>"); sb.append("<br/>");
} }
} }*/
//6 先职称取得时间 //6 先职称取得时间
if (null != date.getCurrentProfessionalTitleTime()){ if (null != date.getCurrentProfessionalTitleTime()){
schoolCheckVo = this.checkeDateTime(date.getCurrentProfessionalTitleTime()); schoolCheckVo = this.checkeDateTime(date.getCurrentProfessionalTitleTime());
if (schoolCheckVo.getFlag()){ if (schoolCheckVo.getFlag()){
date.setCurrentProfessionalTitleTime(schoolCheckVo.getDate()); date.setCurrentProfessionalTitleTime(schoolCheckVo.getDate());
}else { }else {
sb.append(date.getName()+"用户现职称取得资格时间格式错误"); sb.append(date.getName()+"用户现具备专技资格时间格式错误");
sb.append("<br/>"); sb.append("<br/>");
} }
} }
//6 现职称聘任时间
if (null != date.getCurrentHiringProfessionalTitleTime()){
schoolCheckVo = this.checkeDateTime(date.getCurrentHiringProfessionalTitleTime());
if (schoolCheckVo.getFlag()){
date.setCurrentProfessionalTitleTime(schoolCheckVo.getDate());
}else {
sb.append(date.getName()+"用户现聘专技资格时间格式错误");
sb.append("<br/>");
}
}
//7 先聘岗位 //7 先聘岗位
schoolCheckVo = checkeDicet("current_position", date.getCurrentPosition()); schoolCheckVo = checkeDicet("current_position", date.getCurrentPosition());
if (schoolCheckVo !=null) { if (schoolCheckVo !=null) {
...@@ -298,15 +309,15 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo ...@@ -298,15 +309,15 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
} }
} }
//现聘职称 //现聘职称
schoolCheckVo = checkeDicet("current_professional", date.getCurrentHiringProfessionalTitle()); /* schoolCheckVo = checkeDicet("current_professional", date.getCurrentHiringProfessionalTitle());
if (schoolCheckVo !=null) { if (schoolCheckVo !=null) {
if (schoolCheckVo.getFlag()) { if (schoolCheckVo.getFlag()) {
date.setCurrentHiringProfessionalTitle(schoolCheckVo.getVal()); date.setCurrentHiringProfessionalTitle(schoolCheckVo.getVal());
} else { } else {
sb.append(date.getName() + "用户现聘职称录入不符合选择项:" + schoolCheckVo.getVal()); sb.append(date.getName() + "用户现聘专技资格录入不符合选择项:" + schoolCheckVo.getVal());
sb.append("<br/>"); sb.append("<br/>");
} }
} }*/
//8 现岗位等级 //8 现岗位等级
schoolCheckVo = checkeDicet("current_joblevel", date.getCurrentJobLevel()); schoolCheckVo = checkeDicet("current_joblevel", date.getCurrentJobLevel());
......
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