Skip to content

D
dd_school
Commit b0715b15 by zhangzhiwei
Options

修改老师导出字段名称

parent 464c1c0b
Showing with 33 additions and 18 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationController.java
...@@ -416,18 +416,18 @@ public class SchoolTeacherBasiclnformationController extends BaseController { ...@@ -416,18 +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.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.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);
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasicInformation.java
...@@ -107,14 +107,16 @@ public class SchoolTeacherBasicInformation extends BaseEntity { ...@@ -107,14 +107,16 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
/** /**
* 现职称(1无、2初级、3中级、4副高、5正高) * 现职称(1无、2初级、3中级、4副高、5正高)
*/ */
@Excel(name = "现具备专技资格") // @Excel(name = "现具备专技资格")
@Excel(name = "现职称")
@TableField("current_professional_title") @TableField("current_professional_title")
private String currentProfessionalTitle; private String currentProfessionalTitle;
/** /**
* 现职称取得资格时间 * 现职称取得资格时间
*/ */
@Excel(name = "现具备专技资格时间") // @Excel(name = "现具备专技资格时间")
@Excel(name = "现职称取得时间")
// @JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@TableField("current_professional_title_time") @TableField("current_professional_title_time")
@DateTimeFormat(pattern = "yyyy-MM") @DateTimeFormat(pattern = "yyyy-MM")
...@@ -123,14 +125,16 @@ public class SchoolTeacherBasicInformation extends BaseEntity { ...@@ -123,14 +125,16 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
/** /**
* 现聘职称(1无、2初级、3中级、4副高、5正高) * 现聘职称(1无、2初级、3中级、4副高、5正高)
*/ */
@Excel(name = "现聘专技资格") // @Excel(name = "现聘专技资格")
@Excel(name = "现聘职称")
@TableField("current_hiring_professional_title") @TableField("current_hiring_professional_title")
private String currentHiringProfessionalTitle; private String currentHiringProfessionalTitle;
/** /**
* 现职称聘任时间 * 现职称聘任时间
*/ */
@Excel(name = "现聘专技资格时间") // @Excel(name = "现聘专技资格时间")
@Excel(name = "现聘职称时间")
// @JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@TableField("current_hiring_professional_title_time") @TableField("current_hiring_professional_title_time")
@DateTimeFormat(pattern = "yyyy-MM") @DateTimeFormat(pattern = "yyyy-MM")
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasicInformationVo.java
...@@ -117,27 +117,31 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity { ...@@ -117,27 +117,31 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity {
/** /**
* 现职称(1无、2初级、3中级、4副高、5正高) * 现职称(1无、2初级、3中级、4副高、5正高)
*/ */
@Excel(name = "现具备专技资格" ) // @Excel(name = "现具备专技资格" )
@Excel(name = "现职称" )
private String currentProfessionalTitle; private String currentProfessionalTitle;
/** /**
* 现职称取得资格时间 * 现职称取得资格时间
*/ */
@Excel(name = "现具备专技资格时间" ,dateFormat="yyyy-MM") // @Excel(name = "现具备专技资格时间" ,dateFormat="yyyy-MM")
@Excel(name = "现职称取得时间" ,dateFormat="yyyy-MM")
@JsonFormat(pattern = "yyyy-MM") @JsonFormat(pattern = "yyyy-MM")
private Date currentProfessionalTitleTime; private Date currentProfessionalTitleTime;
/** /**
* 现聘职称(1无、2初级、3中级、4副高、5正高) * 现聘职称(1无、2初级、3中级、4副高、5正高)
*/ */
@Excel(name = "现聘专技资格") // @Excel(name = "现聘专技资格")
@Excel(name = "现聘职称")
private String currentHiringProfessionalTitle; private String currentHiringProfessionalTitle;
/** /**
* 现职称聘任时间 * 现职称聘任时间
*/ */
@JsonFormat(pattern = "yyyy-MM") @JsonFormat(pattern = "yyyy-MM")
@Excel(name = "现聘专技资格时间" ,dateFormat="yyyy-MM") // @Excel(name = "现聘专技资格时间" ,dateFormat="yyyy-MM")
@Excel(name = "现聘职称时间" ,dateFormat="yyyy-MM")
private Date currentHiringProfessionalTitleTime; private Date currentHiringProfessionalTitleTime;
/** /**
...@@ -340,4 +344,6 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity { ...@@ -340,4 +344,6 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity {
private String workingHoursgtd; private String workingHoursgtd;
private String workingHourslt; private String workingHourslt;
private String workingHoursltd; private String workingHoursltd;
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasiclnExport.java
...@@ -104,25 +104,29 @@ public class SchoolTeacherBasiclnExport { ...@@ -104,25 +104,29 @@ public class SchoolTeacherBasiclnExport {
/** /**
* 现职称(1无、2初级、3中级、4副高、5正高) * 现职称(1无、2初级、3中级、4副高、5正高)
*/ */
@Excel(name = "现具备专技资格") // @Excel(name = "现具备专技资格")
@Excel(name = "现职称")
private String currentProfessionalTitle; private String currentProfessionalTitle;
/** /**
* 现职称取得资格时间 * 现职称取得资格时间
*/ */
@Excel(name = "现具备专技资格时间" ,dateFormat="yyyy-MM-dd") // @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 = "现聘专技资格") // @Excel(name = "现聘专技资格")
@Excel(name = "现聘职称")
private String currentHiringProfessionalTitle; private String currentHiringProfessionalTitle;
/** /**
* 现职称聘任时间 * 现职称聘任时间
*/ */
@Excel(name = "现聘专技资格时间" ,dateFormat="yyyy-MM-dd") // @Excel(name = "现聘专技资格时间" ,dateFormat="yyyy-MM-dd")
@Excel(name = "现聘职称时间" ,dateFormat="yyyy-MM-dd")
private Date currentHiringProfessionalTitleTime; private Date currentHiringProfessionalTitleTime;
/** /**
...@@ -306,4 +310,5 @@ public class SchoolTeacherBasiclnExport { ...@@ -306,4 +310,5 @@ public class SchoolTeacherBasiclnExport {
*/ */
private String ddPhone; private String ddPhone;
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationServicelmpl.java
...@@ -265,7 +265,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo ...@@ -265,7 +265,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
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/>");
} }
} }
...@@ -276,7 +276,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo ...@@ -276,7 +276,7 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
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/>");
} }
} }
......
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