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/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