|
@@ -456,7 +456,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- if (!StringUtils.isEmpty(userSubscribeImport.getStudentTypeName())) {
|
|
|
+ /* if (!StringUtils.isEmpty(userSubscribeImport.getStudentTypeName())) {
|
|
|
if (userSubscribeImport.getStudentTypeName().equals("非补考学员")) {
|
|
|
userSubscribeAddBo.setStudentType(1);
|
|
|
} else {
|
|
@@ -466,7 +466,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
|
userSubscribeImport.setCause("学员报名类型有误");
|
|
|
userSubscribeImports.add(userSubscribeImport);
|
|
|
continue;
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteAddress())) {
|
|
|
userSubscribeAddBo.setApplySiteAddress(userSubscribeImport.getApplySiteAddress());
|
|
@@ -476,6 +476,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
if (userSubscribeImport.getApplySiteExamTime() != null) {
|
|
|
userSubscribeAddBo.setApplySiteExamTime(Convert.toLong(userSubscribeImport.getApplySiteExamTime().getTime())/1000);
|
|
|
} else {
|
|
@@ -583,7 +584,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- if (!StringUtils.isEmpty(userSubscribeImport.getStudentTypeName())) {
|
|
|
+ /* if (!StringUtils.isEmpty(userSubscribeImport.getStudentTypeName())) {
|
|
|
if (userSubscribeImport.getStudentTypeName().equals("非补考学员")) {
|
|
|
userSubscribeAddBo.setStudentType(1);
|
|
|
} else {
|
|
@@ -593,7 +594,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
|
userSubscribeImport.setCause("学员报名类型有误");
|
|
|
userSubscribeImports.add(userSubscribeImport);
|
|
|
continue;
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteAddress())) {
|
|
|
userSubscribeAddBo.setApplySiteAddress(userSubscribeImport.getApplySiteAddress());
|