submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamApplyMapper.java

@@ -71,7 +71,7 @@ public interface ExamApplyMapper extends BaseMapper<ExamApply> {
 
     Long sitePeopleNum(ExamApplyQueryBo bo);
 
-    String siteTimeJson(ExamApplyQueryBo bo);
+    List<String> siteTimeJson(ExamApplyQueryBo bo);
 
     List<ExamApplyPlaceVo> getPlaceList(ExamApplyRoomQueryBo bo);
 

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

@@ -5,13 +5,15 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.qrcode.QRCodeWriter;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
 import com.zhongzheng.common.annotation.DataScope;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.redis.RedisCache;
@@ -23,22 +25,18 @@ import com.zhongzheng.common.utils.ToolsUtils;
 import com.zhongzheng.common.utils.file.FileUtils;
 import com.zhongzheng.modules.alioss.service.OssService;
 import com.zhongzheng.modules.alioss.vo.FileBean;
-import com.zhongzheng.modules.alisms.service.IAliSmsService;
 import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.base.bo.UserProfileFit;
-import com.zhongzheng.modules.course.domain.CourseBusiness;
 import com.zhongzheng.modules.course.domain.Major;
 import com.zhongzheng.modules.course.mapper.CourseMapper;
-import com.zhongzheng.modules.course.service.ICourseService;
 import com.zhongzheng.modules.course.service.IMajorService;
 import com.zhongzheng.modules.exam.bo.ExamApplyQueryBo;
 import com.zhongzheng.modules.exam.bo.ExamApplySiteTimeJson;
 import com.zhongzheng.modules.exam.mapper.ExamApplyMapper;
 import com.zhongzheng.modules.exam.service.IExamApplySiteService;
-import com.zhongzheng.modules.exam.vo.ExamApplySiteTimeVo;
+import com.zhongzheng.modules.exam.vo.ExamApplySiteTimeTwoVo;
 import com.zhongzheng.modules.exam.vo.ExamApplySiteVo;
 import com.zhongzheng.modules.exam.vo.ExamApplyVo;
-import com.zhongzheng.modules.exam.vo.ExamUserApplyVo;
 import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
@@ -51,23 +49,17 @@ import com.zhongzheng.modules.inform.vo.InformRemindVo;
 import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.domain.UserExamGoods;
+import com.zhongzheng.modules.user.domain.UserSubscribe;
+import com.zhongzheng.modules.user.mapper.UserSubscribeMapper;
 import com.zhongzheng.modules.user.service.IUserExamGoodsService;
 import com.zhongzheng.modules.user.service.IUserService;
+import com.zhongzheng.modules.user.service.IUserSubscribeService;
 import com.zhongzheng.modules.user.vo.*;
 import com.zhongzheng.modules.wx.service.IWxLoginService;
-import org.apache.poi.hpsf.Thumbnail;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
-import com.zhongzheng.modules.user.domain.UserSubscribe;
-import com.zhongzheng.modules.user.mapper.UserSubscribeMapper;
-import com.zhongzheng.modules.user.service.IUserSubscribeService;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 import org.thymeleaf.util.StringUtils;
 
 import javax.imageio.ImageIO;
@@ -78,8 +70,8 @@ import java.io.*;
 import java.net.URL;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
 import java.util.List;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.zip.ZipOutputStream;
@@ -304,7 +296,16 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             queryTimeBo.setApplySiteAddress(bo.getApplySiteAddress());
             //考点已申报人数
             Long sitePeopleNum = examApplyMapper.sitePeopleNum(queryTimeBo);
-            String siteTimeJson = examApplyMapper.siteTimeJson(queryTimeBo);
+            List<String> siteTimeJsonList = examApplyMapper.siteTimeJson(queryTimeBo);
+            String siteTimeJson = siteTimeJsonList.stream().filter(x -> {
+                List<ExamApplySiteTimeTwoVo> timeTwoVos = JSONArray.parseArray(x, ExamApplySiteTimeTwoVo.class);
+                ExamApplySiteTimeTwoVo timeTwoVo = timeTwoVos.get(0);
+                if (timeTwoVo.getStartTime().equals(queryTimeBo.getStartTime())
+                        && timeTwoVo.getEndTime().equals(queryTimeBo.getEndTime())) {
+                    return true;
+                }
+                return false;
+            }).findFirst().orElse(null);
             if (Validator.isEmpty(siteTimeJson)) {
                 throw new CustomException("考点数据错误");
             }
@@ -975,7 +976,16 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             //考点已申报人数
             Long sitePeopleNum = examApplyMapper.sitePeopleNum(queryTimeBo);
             System.out.println(queryTimeBo);
-            String siteTimeJson = examApplyMapper.siteTimeJson(queryTimeBo);
+            List<String> siteTimeJsonList = examApplyMapper.siteTimeJson(queryTimeBo);
+            String siteTimeJson = siteTimeJsonList.stream().filter(x -> {
+                List<ExamApplySiteTimeTwoVo> timeTwoVos = JSONArray.parseArray(x, ExamApplySiteTimeTwoVo.class);
+                ExamApplySiteTimeTwoVo timeTwoVo = timeTwoVos.get(0);
+                if (timeTwoVo.getStartTime().equals(queryTimeBo.getStartTime())
+                        && timeTwoVo.getEndTime().equals(queryTimeBo.getEndTime())) {
+                    return true;
+                }
+                return false;
+            }).findFirst().orElse(null);
             if (Validator.isEmpty(siteTimeJson)) {
                 userSubscribeImport.setCause("考点数据错误");
                 userSubscribeImports.add(userSubscribeImport);
@@ -1211,7 +1221,16 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             }
             //考点已申报人数
             Long sitePeopleNum = examApplyMapper.sitePeopleNum(queryTimeBo);
-            String siteTimeJson = examApplyMapper.siteTimeJson(queryTimeBo);
+            List<String> siteTimeJsonList = examApplyMapper.siteTimeJson(queryTimeBo);
+            String siteTimeJson = siteTimeJsonList.stream().filter(x -> {
+                List<ExamApplySiteTimeTwoVo> timeTwoVos = JSONArray.parseArray(x, ExamApplySiteTimeTwoVo.class);
+                ExamApplySiteTimeTwoVo timeTwoVo = timeTwoVos.get(0);
+                if (timeTwoVo.getStartTime().equals(queryTimeBo.getStartTime())
+                        && timeTwoVo.getEndTime().equals(queryTimeBo.getEndTime())) {
+                    return true;
+                }
+                return false;
+            }).findFirst().orElse(null);
             if (Validator.isEmpty(siteTimeJson)) {
                 userSubscribeImport.setCause("考点数据错误");
                 userSubscribeImports.add(userSubscribeImport);
@@ -1991,7 +2010,16 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             queryTimeBo.setApplySiteAddress(bo.getApplySiteAddress());
             //考点已申报人数
             Long sitePeopleNum = examApplyMapper.sitePeopleNum(queryTimeBo);
-            String siteTimeJson = examApplyMapper.siteTimeJson(queryTimeBo);
+            List<String> siteTimeJsonList = examApplyMapper.siteTimeJson(queryTimeBo);
+            String siteTimeJson = siteTimeJsonList.stream().filter(x -> {
+                List<ExamApplySiteTimeTwoVo> timeTwoVos = JSONArray.parseArray(x, ExamApplySiteTimeTwoVo.class);
+                ExamApplySiteTimeTwoVo timeTwoVo = timeTwoVos.get(0);
+                if (timeTwoVo.getStartTime().equals(queryTimeBo.getStartTime())
+                        && timeTwoVo.getEndTime().equals(queryTimeBo.getEndTime())) {
+                    return true;
+                }
+                return false;
+            }).findFirst().orElse(null);
             if (Validator.isEmpty(siteTimeJson)) {
                 throw new CustomException("考点数据错误");
             }