|
@@ -557,7 +557,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
|
|
- if (userSubscribeImport.getApplySiteExamTime() != null) {
|
|
|
|
|
|
+ if (userSubscribeImport.getApplySiteExamTime() != null||userSubscribeImport.getApplySiteExamTime().length()!=10) {
|
|
try{
|
|
try{
|
|
userSubscribeAddBo.setApplySiteExamTime(Convert.toLong(DateUtils.dateTimeThrow("yyyy/MM/dd",userSubscribeImport.getApplySiteExamTime()).getTime())/1000);
|
|
userSubscribeAddBo.setApplySiteExamTime(Convert.toLong(DateUtils.dateTimeThrow("yyyy/MM/dd",userSubscribeImport.getApplySiteExamTime()).getTime())/1000);
|
|
}catch (ParseException e){
|
|
}catch (ParseException e){
|
|
@@ -737,6 +737,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
if (CollectionUtils.isEmpty(userSubscribeImportList)) {
|
|
if (CollectionUtils.isEmpty(userSubscribeImportList)) {
|
|
throw new IllegalArgumentException("请勿导入空表格");
|
|
throw new IllegalArgumentException("请勿导入空表格");
|
|
}
|
|
}
|
|
|
|
+
|
|
List<UserSubscribeImport> userSubscribeImports = new ArrayList<>();
|
|
List<UserSubscribeImport> userSubscribeImports = new ArrayList<>();
|
|
List<UserSubscribeImport> successImports = new ArrayList<>();
|
|
List<UserSubscribeImport> successImports = new ArrayList<>();
|
|
for (UserSubscribeImport userSubscribeImport : userSubscribeImportList) {
|
|
for (UserSubscribeImport userSubscribeImport : userSubscribeImportList) {
|
|
@@ -848,7 +849,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
userSubscribeImports.add(userSubscribeImport);
|
|
userSubscribeImports.add(userSubscribeImport);
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
- if (Validator.isNotEmpty(userSubscribeImport.getApplySiteExamTime())) {
|
|
|
|
|
|
+ if (Validator.isNotEmpty(userSubscribeImport.getApplySiteExamTime())||userSubscribeImport.getApplySiteExamTime().length()!=10) {
|
|
try{
|
|
try{
|
|
userSubscribeAddBo.setApplySiteExamTime(Convert.toLong(DateUtils.dateTimeThrow("yyyy/MM/dd",userSubscribeImport.getApplySiteExamTime()).getTime())/1000);
|
|
userSubscribeAddBo.setApplySiteExamTime(Convert.toLong(DateUtils.dateTimeThrow("yyyy/MM/dd",userSubscribeImport.getApplySiteExamTime()).getTime())/1000);
|
|
}catch (ParseException e){
|
|
}catch (ParseException e){
|
|
@@ -929,8 +930,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
userSubscribeAddBo.setApplySiteAddressTrain(userSubscribeImport.getApplySiteAddressTrain());
|
|
userSubscribeAddBo.setApplySiteAddressTrain(userSubscribeImport.getApplySiteAddressTrain());
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
- if (userSubscribeImport.getApplySiteExamTrainTime() != null) {
|
|
|
|
|
|
+ if (userSubscribeImport.getApplySiteExamTrainTime() != null||userSubscribeImport.getApplySiteExamTrainTime().length()!=10) {
|
|
try{
|
|
try{
|
|
userSubscribeAddBo.setApplySiteExamTrainTime(Convert.toLong(DateUtils.dateTimeThrow("yyyy/MM/dd",userSubscribeImport.getApplySiteExamTrainTime()).getTime()/1000));
|
|
userSubscribeAddBo.setApplySiteExamTrainTime(Convert.toLong(DateUtils.dateTimeThrow("yyyy/MM/dd",userSubscribeImport.getApplySiteExamTrainTime()).getTime()/1000));
|
|
}catch (ParseException e){
|
|
}catch (ParseException e){
|
|
@@ -939,6 +939,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ System.out.println(userSubscribeAddBo.getApplySiteExamTrainTime()+"考培时间");
|
|
|
|
+
|
|
String startTrainTime = "";
|
|
String startTrainTime = "";
|
|
String endTrainTime = "";
|
|
String endTrainTime = "";
|
|
if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteTrainTime())) {
|
|
if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteTrainTime())) {
|