|
|
@@ -764,7 +764,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
}
|
|
|
Major major = iMajorService.getOne(new LambdaQueryWrapper<Major>()
|
|
|
.eq(Major::getId, goods.getMajorId()));
|
|
|
- if("材料员".equals(major.getCategoryName())||"劳务员".equals(major.getCategoryName())||"资料员".equals(major.getCategoryName())){
|
|
|
+ /*if("材料员".equals(major.getCategoryName())||"劳务员".equals(major.getCategoryName())||"资料员".equals(major.getCategoryName())){
|
|
|
if(userVo.getEduLevel().equals("小学")||userVo.getEduLevel().equals("中学")){
|
|
|
userVo.setEduLevel("高中");
|
|
|
}
|
|
|
@@ -772,6 +772,15 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
if(userVo.getEduLevel().equals("小学")||userVo.getEduLevel().equals("中学")||userVo.getEduLevel().equals("职高")||userVo.getEduLevel().equals("高中")){
|
|
|
userVo.setEduLevel("专科");
|
|
|
}
|
|
|
+ }*/
|
|
|
+ if(userVo.getEduLevel().equals("小学")||userVo.getEduLevel().equals("中学")||userVo.getEduLevel().equals("高中")||userVo.getEduLevel().equals("中职（含技工学校）")){
|
|
|
+ userVo.setEduLevel("中职（含技工学校）");
|
|
|
+ }
|
|
|
+ else if(userVo.getEduLevel().equals("本科")||userVo.getEduLevel().equals("硕士研究生")||userVo.getEduLevel().equals("博士研究生")||userVo.getEduLevel().equals("本科及以上")){
|
|
|
+ userVo.setEduLevel("本科及以上");
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ userVo.setEduLevel("专科（含高职和技师学院）");
|
|
|
}
|
|
|
if (Validator.isEmpty(orderGoods.getSevenYear())) {
|
|
|
return "商品年份缺失";
|
he2802