Commit 36540417 authored by hongguangwu's avatar hongguangwu

1.7.22-优化

parent a38d5ad4
...@@ -4298,29 +4298,33 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4298,29 +4298,33 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private String getHignEducationValue(String educationName) { private String getHignEducationValue(String educationName) {
String educationNameValue; String educationNameValue;
if (educationName.equals("文盲")) { if (Common.isNotNull(educationName)) {
educationNameValue = "1"; if (educationName.equals("文盲")) {
}else if (educationName.equals("小学")) { educationNameValue = "1";
educationNameValue = "2"; }else if (educationName.equals("小学")) {
}else if (educationName.equals("初中")) { educationNameValue = "2";
educationNameValue = "3"; }else if (educationName.equals("初中")) {
}else if (educationName.equals("高中")) { educationNameValue = "3";
educationNameValue = "4"; }else if (educationName.equals("高中")) {
}else if (educationName.equals("大专")) { educationNameValue = "4";
educationNameValue = "5"; }else if (educationName.equals("大专")) {
}else if (educationName.equals("本科")) { educationNameValue = "5";
educationNameValue = "6"; }else if (educationName.equals("本科")) {
}else if (educationName.equals("硕士")) { educationNameValue = "6";
educationNameValue = "7"; }else if (educationName.equals("硕士")) {
}else if (educationName.equals("博士")) { educationNameValue = "7";
educationNameValue = "8"; }else if (educationName.equals("博士")) {
}else if (educationName.equals("技工")) { educationNameValue = "8";
educationNameValue = "9"; }else if (educationName.equals("技工")) {
}else if (educationName.equals("职高")) { educationNameValue = "9";
educationNameValue = "10"; }else if (educationName.equals("职高")) {
}else if (educationName.equals("中专")) { educationNameValue = "10";
educationNameValue = "11"; }else if (educationName.equals("中专")) {
}else { educationNameValue = "11";
}else {
educationNameValue = null;
}
} else {
educationNameValue = null; educationNameValue = null;
} }
return educationNameValue; return educationNameValue;
...@@ -4329,7 +4333,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4329,7 +4333,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 获取是否大专及以上 // 获取是否大专及以上
private Integer getIsCollege(String educationName) { private Integer getIsCollege(String educationName) {
Integer isCollegeValue = CommonConstants.ZERO_INT; Integer isCollegeValue = CommonConstants.ZERO_INT;
if (educationName.equals("大专") || educationName.equals("本科") || educationName.equals("硕士") || educationName.equals("博士")) { if (Common.isNotNull(educationName)
&& ( educationName.equals("大专") || educationName.equals("本科")
|| educationName.equals("硕士") || educationName.equals("博士"))) {
isCollegeValue = CommonConstants.ONE_INT; isCollegeValue = CommonConstants.ONE_INT;
} }
return isCollegeValue; return isCollegeValue;
......
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