MERGE

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -570,13 +570,15 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
                         && (DateUtils.getNowTime() >= goodsUserVo.getServiceStartTime() && DateUtils.getNowTime() <= goodsUserVo.getServiceEndTime())){
                     UserSubscribe userSubscribe = iUserSubscribeService.getOne(new LambdaQueryWrapper<UserSubscribe>()
                             .eq(UserSubscribe::getUserId, bo.getUserId())
-                            .eq(UserSubscribe::getGoodsId, goodsUserVo.getGoodsId())
+                            .eq(UserSubscribe::getOrderGoodsId, goodsUserVo.getOrderGoodsId())
                             .eq(UserSubscribe::getSubscribeStatus, 1)
                             .orderByDesc(UserSubscribe::getCreateTime)
                             .last("limit 1"));
                     if (ObjectUtils.isNull(userSubscribe)){
                         goodsUserVo.setSubscribeSign(1);
-                    }else if (ObjectUtils.isNotNull(userSubscribe.getResult()) && userSubscribe.getResult() == 0){
+                    }else if (userSubscribe.getSubscribeStatus() == 1 && userSubscribe.getExamStatus() == 0){
+                        goodsUserVo.setSubscribeSign(4);
+                    } else if (ObjectUtils.isNotNull(userSubscribe.getResult()) && userSubscribe.getResult() == 0){
                         goodsUserVo.setSubscribeSign(3);
                     }
                 }
@@ -596,6 +598,13 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
                            String format = String.format("%s-%s", twoAddBo.getStartTime(), twoAddBo.getEndTime());
                             examApplyGoodsVo.setApplyTime(time);
                             examApplyGoodsVo.setApplyMoment(format);
+                            examApplyGoodsVo.setApplyNum(twoAddBo.getNum().intValue());
+                            //预约人数
+                            int count = iUserSubscribeService.count(new LambdaQueryWrapper<UserSubscribe>()
+                                    .eq(UserSubscribe::getSubscribeStatus, 1)
+                                    .eq(UserSubscribe::getExamStatus, 0)
+                                    .eq(UserSubscribe::getApplyId, examApplyGoodsVo.getApplyId()));
+                            examApplyGoodsVo.setSubscribeNum(count);
                         }
                     }
                     switch (examApply.getApplyNature()){

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamApplyGoodsVo.java

@@ -43,4 +43,8 @@ public class ExamApplyGoodsVo {
 	private String applyMoment;
 	@ApiModelProperty("考试时间")
 	private Long applyTime;
+	@ApiModelProperty("考场人数")
+	private Integer applyNum;
+	@ApiModelProperty("预约人数")
+	private Integer subscribeNum;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsUserVo.java

@@ -397,7 +397,7 @@ public class GoodsUserVo {
 	private Long periodWaitTime;
 	@ApiModelProperty("是否是二建二造")
 	private Boolean erJianErZao;
-	@ApiModelProperty("是否可以预约标识：1未参加考试 2已参加考试 3考试成绩未通过")
+	@ApiModelProperty("是否可以预约标识：1未参加考试 2已参加考试 3考试成绩未通过 4已预约未参加考试")
 	private Integer subscribeSign;
 	/** 学员编码 */
 	@Excel(name = "学员姓名")

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeStudentVo.java

@@ -229,4 +229,6 @@ public class ClassGradeStudentVo {
 	@ApiModelProperty("已消耗前培次数")
 	private Long expendBefore;
 
+	private String sevenYear;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -27,9 +28,12 @@ import com.zhongzheng.modules.course.service.ICourseMenuService;
 import com.zhongzheng.modules.course.service.ICourseSectionService;
 import com.zhongzheng.modules.course.vo.CourseLiveVo;
 import com.zhongzheng.modules.course.vo.CourseVo;
+import com.zhongzheng.modules.exam.bo.ExamApplySiteTimeTwoAddBo;
+import com.zhongzheng.modules.exam.domain.ExamApplySiteTime;
 import com.zhongzheng.modules.exam.domain.ExamApplyUser;
 import com.zhongzheng.modules.exam.domain.ExamBefore;
 import com.zhongzheng.modules.exam.service.IExamApplyGoodsService;
+import com.zhongzheng.modules.exam.service.IExamApplySiteTimeService;
 import com.zhongzheng.modules.exam.service.IExamApplyUserService;
 import com.zhongzheng.modules.exam.service.IExamBeforeService;
 import com.zhongzheng.modules.exam.vo.ExamApplyGoodsVo;
@@ -132,6 +136,9 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
     @Autowired
     private IUserSubscribeService iUserSubscribeService;
 
+    @Autowired
+    private IExamApplySiteTimeService iExamApplySiteTimeService;
+
     @Autowired
     private ICourseMenuService courseMenuService;
 
@@ -662,6 +669,8 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
                                 .last("limit 1"));
                         if (ObjectUtils.isNull(subscribe)){
                             goodsVo.setSubscribeSign(1);
+                        }else if (userSubscribe.getSubscribeStatus() == 1 && userSubscribe.getExamStatus() == 0){
+                            goodsVo.setSubscribeSign(4);
                         }else if (ObjectUtils.isNotNull(subscribe.getResult()) && subscribe.getResult() == 0){
                             goodsVo.setSubscribeSign(3);
                         }
@@ -670,6 +679,26 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
                     List<ExamApplyGoodsVo> examApplyGoodsVos = new ArrayList<>();
                     List<ExamApplyGoodsVo> examApplyGoodsVos2 = new ArrayList<>();
                     examApplyGoodsVoList.forEach(examApplyGoodsVo -> {
+                        List<ExamApplySiteTime> siteTimes = iExamApplySiteTimeService.list(new LambdaQueryWrapper<ExamApplySiteTime>()
+                                .eq(ExamApplySiteTime::getApplyId, examApplyGoodsVo.getApplyId()));
+                        if (CollectionUtils.isNotEmpty(siteTimes)){
+                            ExamApplySiteTime timeTime = siteTimes.get(0);
+                            List<ExamApplySiteTimeTwoAddBo> siteTimeTwoAddBos = JSONArray.parseArray(timeTime.getSiteTime(), ExamApplySiteTimeTwoAddBo.class);
+                            ExamApplySiteTimeTwoAddBo twoAddBo = siteTimeTwoAddBos.get(0);
+                            if (ObjectUtils.isNotNull(twoAddBo)){
+                                Long time = timeTime.getExamTime()+28800L;
+                                String format = String.format("%s-%s", twoAddBo.getStartTime(), twoAddBo.getEndTime());
+                                examApplyGoodsVo.setApplyTime(time);
+                                examApplyGoodsVo.setApplyMoment(format);
+                                examApplyGoodsVo.setApplyNum(twoAddBo.getNum().intValue());
+                                //预约人数
+                                int count = iUserSubscribeService.count(new LambdaQueryWrapper<UserSubscribe>()
+                                        .eq(UserSubscribe::getSubscribeStatus, 1)
+                                        .eq(UserSubscribe::getExamStatus, 0)
+                                        .eq(UserSubscribe::getApplyId, examApplyGoodsVo.getApplyId()));
+                                examApplyGoodsVo.setSubscribeNum(count);
+                            }
+                        }
                         LambdaQueryWrapper<ExamApplyUser> lqw = Wrappers.lambdaQuery();
                         lqw.eq(ExamApplyUser::getApplyId, examApplyGoodsVo.getApplyId());
                         List<ExamApplyUser> examApplyUserList = iExamApplyUserService.list(lqw);

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -1862,22 +1862,22 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
         ExamApplySiteTimeTwoAddBo timeTwoVo = new ExamApplySiteTimeTwoAddBo();
         timeTwoVo.setStartTime("09:00");
         timeTwoVo.setEndTime("11:00");
-        timeTwoVo.setNum(50L);
+        timeTwoVo.setNum(60L);
         list.add(timeTwoVo);
         ExamApplySiteTimeTwoAddBo timeTwoVo1 = new ExamApplySiteTimeTwoAddBo();
         timeTwoVo1.setStartTime("11:10");
         timeTwoVo1.setEndTime("13:10");
-        timeTwoVo1.setNum(50L);
+        timeTwoVo1.setNum(60L);
         list.add(timeTwoVo1);
         ExamApplySiteTimeTwoAddBo timeTwoVo2 = new ExamApplySiteTimeTwoAddBo();
         timeTwoVo2.setStartTime("14:00");
         timeTwoVo2.setEndTime("16:00");
-        timeTwoVo2.setNum(50L);
+        timeTwoVo2.setNum(60L);
         list.add(timeTwoVo2);
         ExamApplySiteTimeTwoAddBo timeTwoVo3 = new ExamApplySiteTimeTwoAddBo();
         timeTwoVo3.setStartTime("16:10");
         timeTwoVo3.setEndTime("18:10");
-        timeTwoVo3.setNum(50L);
+        timeTwoVo3.setNum(60L);
         list.add(timeTwoVo3);
         return list;
     }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -170,6 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reason" column="reason"/>
         <result property="projectName" column="project_name"/>
         <result property="businessName" column="business_name"/>
+        <result property="sevenYear" column="seven_year"/>
 
         <result property="userBindWx" column="user_bind_wx"/>
         <result property="userFollowWx" column="user_follow_wx"/>
@@ -426,6 +427,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         og.service_end_time,
         g.goods_name,
         og.order_sn,
+        og.seven_year,
         m.category_name,
         g.major_id,
         u.province,