fix 导入身份证

zhongzheng-admin/src/main/java/com/zhongzheng/controller/bank/QuestionController.java

@@ -104,7 +104,7 @@ public class QuestionController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:question:add')")
     @Log(title = "题库题目", businessType = BusinessType.INSERT)
     @PostMapping()
-    public AjaxResult<Long> add(@RequestBody QuestionAddBo bo) {
+    public AjaxResult<Question> add(@RequestBody QuestionAddBo bo) {
         return AjaxResult.success(iQuestionService.insertByAddBo(bo));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/IQuestionService.java

@@ -43,7 +43,7 @@ public interface IQuestionService extends IService<Question> {
 	 * @param bo 题库题目新增业务对象
 	 * @return
 	 */
-	Long insertByAddBo(QuestionAddBo bo);
+	Question insertByAddBo(QuestionAddBo bo);
 
 	/**
 	 * 根据编辑业务对象修改题库题目

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -131,7 +131,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Long insertByAddBo(QuestionAddBo bo) {
+    public Question insertByAddBo(QuestionAddBo bo) {
         Question add = BeanUtil.toBean(bo, Question.class);
         add.setCode(ServletUtils.getEncoded("TM"));
         if(bo.getOptionsList()!=null){
@@ -152,7 +152,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             }
             iQuestionBusinessService.saveBatch(coll);
         }
-        return add.getQuestionId();
+        return add;
     }
 
     @Override
@@ -211,7 +211,6 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         if (Validator.isNull(questionList) || questionList.size() == 0) {
             throw new CustomException("导入数据不能为空！");
         }
-
         String errorLog = "";
         String importNo = ServletUtils.getEncoded("IMPORT");
         int i=10;
@@ -283,7 +282,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             bo.setOptionsList(dealOptionsList(question));
             bo.setCreateBy(operName);
             bo.setImportNo(importNo);
-            bo.setPublishStatus(0);
+            bo.setPublishStatus(1);
             errorLog = insertByAddBoImport(bo,errorLog,i);
             i++;
         }

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

@@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         <if test="canCancel != null and canCancel == 1 ">
             and us.subscribe_status = 1
-            and LEFT(us.apply_site_start_time,2)*3600+us.apply_site_exam_time >  unix_timestamp(now())
+            and LEFT(us.apply_site_start_time,2)*3600+RIGHT(us.apply_site_start_time,2)*60+us.apply_site_exam_time >  unix_timestamp(now())
             and us.exam_status = 0
             and us.before_status = 0
         </if>
@@ -250,7 +250,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
         1 =1
           AND us.user_id = #{userId}
-          AND LEFT(us.apply_site_start_time,2)*3600+us.apply_site_exam_time >  unix_timestamp(now())
+          AND LEFT(us.apply_site_start_time,2)*3600+RIGHT(us.apply_site_start_time,2)*60+us.apply_site_exam_time >  unix_timestamp(now())
         ORDER by us.apply_site_exam_time  limit 1
     </select>
 </mapper>