he2802 3 سال پیش
والد
کامیت
fc0bd31f43

+ 6 - 4
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

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