fix 时间格式

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserSubscribeMapper.java

@@ -28,6 +28,8 @@ public interface UserSubscribeMapper extends BaseMapper<UserSubscribe> {
 
     Long selectApplyId(String applyName);
 
+    Long findApplyId(String applyName);
+
     Long selectSubscribeId(@Param("applyId") Long applyId,@Param("goodsId") Long goodsId,@Param("userId")  Long userId);
 
     Long selectAddSubscribeId(@Param("applyId") Long applyId,@Param("goodsId") Long goodsId,@Param("userId")  Long userId);

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

@@ -802,8 +802,6 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
-
-
             if (Validator.isNotEmpty(userSubscribeImport.getApplySiteExamTime())) {
                 try{
                     userSubscribeAddBo.setApplySiteExamTime(Convert.toLong(DateUtils.dateTimeThrow("yyyy/MM/dd",userSubscribeImport.getApplySiteExamTime()).getTime())/1000);
@@ -848,7 +846,13 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             userSubscribeAddBo.setApplySiteAddressTrain(userSubscribeImport.getApplySiteAddressTrain());
 
             if (userSubscribeImport.getApplySiteExamTrainTime() != null) {
-                userSubscribeAddBo.setApplySiteExamTrainTime(Convert.toLong(DateUtils.dateTime("yyyy/MM/dd",userSubscribeImport.getApplySiteExamTrainTime()).getTime()/1000));
+                try{
+                    userSubscribeAddBo.setApplySiteExamTrainTime(Convert.toLong(DateUtils.dateTimeThrow("yyyy/MM/dd",userSubscribeImport.getApplySiteExamTrainTime()).getTime()/1000));
+                }catch (ParseException e){
+                    userSubscribeImport.setCause("日期格式错误");
+                    userSubscribeImports.add(userSubscribeImport);
+                    continue;
+                }
             }
 
             if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteTrainTime())) {
@@ -1011,9 +1015,9 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
-            Long applyId = baseMapper.selectApplyId(userSubscribeImport.getApplyName());
+            Long applyId = baseMapper.findApplyId(userSubscribeImport.getApplyName());
             if (applyId == null) {
-                userSubscribeImport.setCause("考试标题有误或已过期或未开启");
+                userSubscribeImport.setCause("考试标题有误");
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
@@ -1048,7 +1052,14 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
 
 
             if (userSubscribeImport.getApplySiteExamTime() != null) {
-                userSbusciEditBo.setApplySiteExamTime(Convert.toLong(DateUtils.dateTime("yyyy/MM/dd",userSubscribeImport.getApplySiteExamTime()).getTime()/1000));
+                try{
+                    userSbusciEditBo.setApplySiteExamTime(Convert.toLong(DateUtils.dateTimeThrow("yyyy/MM/dd",userSubscribeImport.getApplySiteExamTime()).getTime()/1000));
+                }catch (ParseException e){
+                    userSubscribeImport.setCause("日期格式错误");
+                    userSubscribeImports.add(userSubscribeImport);
+                    continue;
+                }
+
             } else {
                 userSubscribeImport.setCause("考试时间未填");
                 userSubscribeImports.add(userSubscribeImport);

zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

@@ -178,6 +178,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT eb.before_id FROM exam_before eb where eb.before_name=#{beforeName} and eb.status = 1
     </select>
 
+    <select id="findApplyId" parameterType="map"  resultType="Long">
+        SELECT ea.apply_id FROM exam_apply ea where ea.apply_name=#{applyName} and ea.status != -1
+    </select>
+
     <select id="selectApplyId" parameterType="map"  resultType="Long">
         SELECT ea.apply_id FROM exam_apply ea where ea.apply_name=#{applyName} and ea.status = 1
     </select>