错题集

zhongzheng-api/src/main/java/com/zhongzheng/controller/exam/ExamApplyController.java

@@ -12,6 +12,7 @@ import com.zhongzheng.modules.exam.service.IExamApplyGoodsService;
 import com.zhongzheng.modules.exam.service.IExamApplyService;
 import com.zhongzheng.modules.exam.service.IExamApplySiteService;
 import com.zhongzheng.modules.exam.vo.*;
+import com.zhongzheng.modules.user.bo.UserAppSubscribeEditBo;
 import com.zhongzheng.modules.user.bo.UserSubscribeAddBo;
 import com.zhongzheng.modules.user.bo.UserSubscribeEditBo;
 import com.zhongzheng.modules.user.bo.UserSubscribeQueryBo;
@@ -129,7 +130,7 @@ public class ExamApplyController extends BaseController {
     @ApiOperation("修改用户预约考试")
     @Log(title = "用户预约考试", businessType = BusinessType.UPDATE)
     @PostMapping("edit")
-    public AjaxResult<Void> edit(@RequestBody UserSubscribeEditBo bo) {
+    public AjaxResult<Void> edit(@RequestBody UserAppSubscribeEditBo bo) {
         return toAjax(iUserSubscribeService.updateByEditSingleBo(bo) ? 1 : 0);
     }
 }

zhongzheng-api/src/main/java/com/zhongzheng/controller/plan/UserPlanController.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.controller.plan;
 
+import java.text.ParseException;
 import java.util.List;
 import java.util.Arrays;
 
@@ -77,7 +78,9 @@ public class UserPlanController extends BaseController {
     @ApiOperation("新增学习计划")
     @Log(title = "学习计划", businessType = BusinessType.INSERT)
     @PostMapping()
-    public AjaxResult<Void> add(@RequestBody UserPlanAddBo bo) {
+    public AjaxResult<Void> add(@RequestBody UserPlanAddBo bo) throws ParseException {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
         return toAjax(iUserPlanService.insertByAddBo(bo) ? 1 : 0);
     }
 
@@ -86,8 +89,8 @@ public class UserPlanController extends BaseController {
      */
     @ApiOperation("修改学习计划")
     @Log(title = "学习计划", businessType = BusinessType.UPDATE)
-    @PutMapping()
-    public AjaxResult<Void> edit(@RequestBody UserPlanEditBo bo) {
+    @PostMapping("edit")
+    public AjaxResult<Void> edit(@RequestBody UserPlanEditBo bo) throws ParseException {
         return toAjax(iUserPlanService.updateByEditBo(bo) ? 1 : 0);
     }
 
@@ -97,7 +100,7 @@ public class UserPlanController extends BaseController {
      */
     @ApiOperation("获得展示的日历学习计划，不添加到数据库")
     @GetMapping("/listPlan")
-    public AjaxResult<UserPlanVo> listPlan(UserPlanEditBo bo) {
+    public AjaxResult<UserPlanVo> listPlan(UserPlanEditBo bo) throws ParseException {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         UserPlanVo list = iUserPlanService.listPlan(bo);

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

@@ -30,4 +30,6 @@ public interface ExamBeforeMapper extends BaseMapper<ExamBefore> {
     Integer beforeGoods(Long beforeId);
 
     Long verifyInfo(Long goodsId);
+
+    ExamBeforeVo verifyExamBeforeVo(ExamBeforeQueryBo examBeforeQueryBo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamBeforeServiceImpl.java

@@ -148,6 +148,10 @@ public class ExamBeforeServiceImpl extends ServiceImpl<ExamBeforeMapper, ExamBef
     @Override
     public ExamBeforeVo getAddressInfo(ExamBeforeQueryBo examBeforeQueryBo) {
         Long verLong = baseMapper.verifyInfo(examBeforeQueryBo.getGoodsId());
-        return null;
+        if (verLong < 1){
+            throw new IllegalArgumentException("您不符合考前刷题条件，请先预约考试，或者咨询相关工作人员，了解使用条件。");
+        }
+        ExamBeforeVo examBeforeVo = baseMapper.verifyExamBeforeVo(examBeforeQueryBo);
+        return examBeforeVo;
     }
 }

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

@@ -144,7 +144,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> placePlatOrder(OrderAddBo bo) {
+    public synchronized Map<String, Object> placePlatOrder(OrderAddBo bo) {
         List<OrderGoodsAddBo> goodsList = bo.getGoodsList();
         if(goodsList==null||goodsList.size()<1){
             throw new CustomException("商品列表为空");

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserAppSubscribeEditBo.java

@@ -0,0 +1,115 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 用户预约考试编辑对象 user_subscribe
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("用户预约考试编辑对象")
+public class UserAppSubscribeEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long subscribeId;
+
+    /** 绑定的商品 */
+    @ApiModelProperty("绑定的商品")
+    private Long goodsId;
+
+    /** 学员ID */
+    @ApiModelProperty("学员ID")
+    private Long userId;
+
+    /** 1正常 2取消 */
+    @ApiModelProperty("1正常 2取消")
+    private Integer subscribeStatus;
+
+    /** 1 已开通 */
+    @ApiModelProperty("1 已开通")
+    private Integer beforeStatus;
+
+    /** 0 待登记 1正常 2缺考 3作弊 4替考 */
+    @ApiModelProperty("0 待登记 1正常 2缺考 3作弊 4替考")
+    private Integer examStatus;
+
+    /** 成绩 */
+    @ApiModelProperty("成绩")
+    private Long performance;
+
+    /** 1通过 0不通过 */
+    @ApiModelProperty("1通过 0不通过")
+    private Integer result;
+
+    /** 证书编号 */
+    @ApiModelProperty("证书编号")
+    private String certificateCode;
+
+    /** 登记补充 */
+    @ApiModelProperty("登记补充")
+    private String remark;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long applyId;
+
+    /** 1非补考学员 2补考学员 */
+    @ApiModelProperty("1非补考学员 2补考学员")
+    private Integer studentType;
+
+    /** 1 消耗次数 */
+    @ApiModelProperty("1 消耗次数")
+    private Integer examExpend;
+
+    /** 1 前培次数消耗 */
+    @ApiModelProperty("1 前培次数消耗")
+    private Integer beforeExpend;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** 前培Id */
+    @ApiModelProperty("前培Id")
+    private Long beforeId;
+
+    /** 考试地点 */
+    @ApiModelProperty("考试地点")
+    private String applySiteAddress;
+
+    /** 考试开始时间段 */
+    @ApiModelProperty("考试开始时间段")
+    private String applySiteStartTime;
+
+    /** 考试结束时间段 */
+    @ApiModelProperty("考试结束时间段")
+    private String applySiteEndTime;
+
+    /** 考试日期 */
+    @ApiModelProperty("考试日期")
+    private Long applySiteExamTime;
+
+    /** 考培地点 */
+    @ApiModelProperty("考培地点")
+    private String applySiteAddressTrain;
+
+    /** 考培开始时间段 */
+    @ApiModelProperty("考培开始时间段")
+    private String applySiteStartTrainTime;
+
+    /** 考培结束时间段 */
+    @ApiModelProperty("考培结束时间段")
+    private String applySiteEndTrainTime;
+
+    /** 考培日期 */
+    @ApiModelProperty("考培日期")
+    private Long applySiteExamTrainTime;
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserPlanAddBo.java

@@ -32,7 +32,7 @@ public class UserPlanAddBo {
     private String reminderTime;
     /** 0周日  1周一 2周二 3周三 4周四 5周五 6周六 */
     @ApiModelProperty("0周日  1周一 2周二 3周三 4周四 5周五 6周六")
-    private String studyCount;
+    private Long[] studyCount;
     /** 复习天数 */
     @ApiModelProperty("复习天数")
     private Long studyDay;
@@ -57,4 +57,8 @@ public class UserPlanAddBo {
     /** 已学习节数 */
     @ApiModelProperty("已学习节数")
     private Long studyNum;
+
+    /** 生成计划的课程 */
+    @ApiModelProperty("生成计划的课程")
+    private Long[] goodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserPlanEditBo.java

@@ -42,7 +42,7 @@ public class UserPlanEditBo {
     /** 0周日  1周一 2周二 3周三 4周四 5周五 6周六 */
     @ApiModelProperty("0周日  1周一 2周二 3周三 4周四 5周五 6周六")
     @NotNull(message = "请填写频率")
-    private String studyCount;
+    private Long[] studyCount;
     /** 复习天数 */
     @ApiModelProperty("复习天数")
     @NotNull(message = "请填写复习天数")

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserPlanQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -64,7 +65,7 @@ public class UserPlanQueryBo extends BaseEntity {
 	private Long startTime;
 	/** 0 失效 1启用 */
 	@ApiModelProperty("0 失效 1启用")
-	private Integer status;
+	private List<Integer> status;
 	/** 总结数 */
 	@ApiModelProperty("总结数")
 	private Long pitchNum;

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

@@ -20,4 +20,6 @@ public interface UserPlanMapper extends BaseMapper<UserPlan> {
     List<GoodsVo> listGoods(UserPlanQueryBo bo);
 
     Integer selectCountGoods(UserPlanEditBo bo);
+
+    List<Long> selectGoods(Long goodsId);
 }

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

@@ -9,6 +9,7 @@ import com.zhongzheng.modules.user.bo.UserPlanAddBo;
 import com.zhongzheng.modules.user.bo.UserPlanEditBo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.text.ParseException;
 import java.util.Collection;
 import java.util.List;
 
@@ -35,14 +36,14 @@ public interface IUserPlanService extends IService<UserPlan> {
 	 * @param bo 学习计划新增业务对象
 	 * @return
 	 */
-	Boolean insertByAddBo(UserPlanAddBo bo);
+	Boolean insertByAddBo(UserPlanAddBo bo) throws ParseException;
 
 	/**
 	 * 根据编辑业务对象修改学习计划
 	 * @param bo 学习计划编辑业务对象
 	 * @return
 	 */
-	Boolean updateByEditBo(UserPlanEditBo bo);
+	Boolean updateByEditBo(UserPlanEditBo bo) throws ParseException;
 
 	/**
 	 * 校验并删除数据
@@ -52,7 +53,7 @@ public interface IUserPlanService extends IService<UserPlan> {
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
-    UserPlanVo listPlan(UserPlanEditBo bo);
+    UserPlanVo listPlan(UserPlanEditBo bo) throws ParseException;
 
 	List<GoodsVo> listGoods(UserPlanQueryBo bo);
 }

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

@@ -1,12 +1,9 @@
 package com.zhongzheng.modules.user.service;
 
-import com.zhongzheng.modules.user.bo.UserSubscribeCertificateEditBo;
+import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.UserSubscribe;
 import com.zhongzheng.modules.user.vo.UserSubscribeImport;
 import com.zhongzheng.modules.user.vo.UserSubscribeVo;
-import com.zhongzheng.modules.user.bo.UserSubscribeQueryBo;
-import com.zhongzheng.modules.user.bo.UserSubscribeAddBo;
-import com.zhongzheng.modules.user.bo.UserSubscribeEditBo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Collection;
@@ -44,7 +41,7 @@ public interface IUserSubscribeService extends IService<UserSubscribe> {
 	 */
 	Boolean updateByEditBo(UserSubscribeEditBo bo);
 
-	Boolean updateByEditSingleBo(UserSubscribeEditBo bo);
+	Boolean updateByEditSingleBo(UserAppSubscribeEditBo bo);
 
 	/**
 	 * 校验并删除数据

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

@@ -4,9 +4,15 @@ import cn.hutool.core.bean.BeanUtil;
 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.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.course.vo.CourseVo;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
+import com.zhongzheng.modules.user.vo.CalendarStudyVo;
+import com.zhongzheng.modules.user.vo.DaySectionVo;
+import com.zhongzheng.modules.user.vo.DayStudyVo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -20,10 +26,10 @@ import com.zhongzheng.modules.user.mapper.UserPlanMapper;
 import com.zhongzheng.modules.user.vo.UserPlanVo;
 import com.zhongzheng.modules.user.service.IUserPlanService;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -37,8 +43,29 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
 
     @Override
     public UserPlanVo queryById(Long planId){
-        UserPlan db = this.baseMapper.selectById(planId);
-        return BeanUtil.toBean(db, UserPlanVo.class);
+        UserPlan userPlan = this.baseMapper.selectById(planId);
+        //得到日历日期
+        UserPlanVo userPlanVo = new UserPlanVo();
+        userPlanVo.setUserId(userPlan.getUserId());
+        userPlanVo.setExamDate(userPlan.getExamDate());
+        userPlanVo.setReminderTime(userPlan.getReminderTime());
+        userPlanVo.setStudyDay(userPlan.getStudyDay());
+        userPlanVo.setStartTime(userPlan.getStartTime());
+        userPlanVo.setEndTime(userPlan.getEndTime());
+        userPlanVo.setPitchNum(userPlan.getPitchNum());
+        userPlanVo.setStudyNum(userPlan.getStudyNum());
+        userPlanVo.setPlanId(userPlan.getPlanId());
+
+        //得到日历日期
+        List<CalendarStudyVo> calendarStudyVos = JSONObject.parseArray(userPlan.getSchedule(), CalendarStudyVo.class);
+        //得到学习的周
+        List<Long> cont = JSONObject.parseArray(userPlan.getStudyCount(), Long.class);
+        Long[] strings = new Long[cont.size()];
+        cont.toArray(strings);
+
+        userPlanVo.setCalendarStudyVo(calendarStudyVos);
+        userPlanVo.setStudyCount(strings);
+        return userPlanVo;
     }
 
     @Override
@@ -52,10 +79,36 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
         lqw.eq(bo.getStudyDay() != null, UserPlan::getStudyDay, bo.getStudyDay());
         lqw.eq(bo.getEndTime() != null, UserPlan::getEndTime, bo.getEndTime());
         lqw.eq(bo.getStartTime() != null, UserPlan::getStartTime, bo.getStartTime());
-        lqw.eq(bo.getStatus() != null, UserPlan::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, UserPlan::getStatus, bo.getStatus());
         lqw.eq(bo.getPitchNum() != null, UserPlan::getPitchNum, bo.getPitchNum());
         lqw.eq(bo.getStudyNum() != null, UserPlan::getStudyNum, bo.getStudyNum());
-        return entity2Vo(this.list(lqw));
+        List<UserPlan> userPlans = this.list(lqw);
+        List<UserPlanVo> userPlanVos = new ArrayList<>();
+        for (UserPlan userPlan : userPlans) {
+            UserPlanVo userPlanVo = new UserPlanVo();
+            userPlanVo.setUserId(userPlan.getUserId());
+            userPlanVo.setExamDate(userPlan.getExamDate());
+            userPlanVo.setReminderTime(userPlan.getReminderTime());
+            userPlanVo.setStudyDay(userPlan.getStudyDay());
+            userPlanVo.setStartTime(userPlan.getStartTime());
+            userPlanVo.setEndTime(userPlan.getEndTime());
+            userPlanVo.setPitchNum(userPlan.getPitchNum());
+            userPlanVo.setStudyNum(userPlan.getStudyNum());
+            userPlanVo.setPlanId(userPlan.getPlanId());
+
+            //得到日历日期
+            List<CalendarStudyVo> calendarStudyVos = JSONObject.parseArray(userPlan.getSchedule(), CalendarStudyVo.class);
+            //得到学习的周
+            List<Long> cont = JSONObject.parseArray(userPlan.getStudyCount(), Long.class);
+            Long[] strings = new Long[cont.size()];
+            cont.toArray(strings);
+
+            userPlanVo.setCalendarStudyVo(calendarStudyVos);
+            userPlanVo.setStudyCount(strings);
+            userPlanVos.add(userPlanVo);
+        }
+
+        return userPlanVos;
     }
 
     /**
@@ -79,20 +132,130 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
     }
 
     @Override
-    public Boolean insertByAddBo(UserPlanAddBo bo) {
-        UserPlan add = BeanUtil.toBean(bo, UserPlan.class);
-        validEntityBeforeSave(add);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
+    public Boolean insertByAddBo(UserPlanAddBo bo) throws ParseException {
+        UserPlan userPlan = new UserPlan();
+        List<CalendarStudyVo> clCalendarStudyVos = findDates(bo.getStartTime(),bo.getEndTime());
+        Long sumUp=0L;
+        for (Long aLong : bo.getGoodsId()) {
+            //最近考试时间七天前到现在的天数，学习视频时长
+            Date date1 = new Date(bo.getEndTime() * 1000L);
+            //获得相隔天数
+            int dutyDays = getDutyDays(new Date(), date1, bo.getStudyCount(), bo.getStudyDay());
+
+            List<Long> seLongs = baseMapper.selectGoods(aLong);
+            Long allNum = 0L;
+            for (Long seLong : seLongs) {
+                allNum += seLong;
+            }
+            sumUp += allNum;
+            //计算每天需要学习多少节课
+            int Sec = (int) Math.ceil((double) allNum / dutyDays);
+            for (CalendarStudyVo clCalendarStudyVo : clCalendarStudyVos) {
+                for (DayStudyVo dayStudyVo : clCalendarStudyVo.getDayStudyList()) {
+                    if (Arrays.asList(bo.getStudyCount()).contains(dayStudyVo.getStudyDay())){
+                        if (dayStudyVo.getStudyCourseKnob() != null) {
+                            dayStudyVo.setStudyCourseKnob(dayStudyVo.getStudyCourseKnob() + Sec);
+                        }else {
+                            dayStudyVo.setStudyCourseKnob(Convert.toLong(Sec));
+                        }
+                        dayStudyVo.setPerform(0);
+                        List<DaySectionVo> daySectionList = new ArrayList<>();
+                        if (!CollectionUtils.isEmpty(dayStudyVo.getDaySectionList())) {
+                            daySectionList = dayStudyVo.getDaySectionList();
+                        }
+                        DaySectionVo daySectionVo = new DaySectionVo();
+                        daySectionVo.setGoodsId(aLong);
+                        daySectionVo.setStudyGoodsKnob(Convert.toLong(Sec));
+                        daySectionVo.setGoodsPerform(0);
+                        daySectionList.add(daySectionVo);
+                        dayStudyVo.setDaySectionList(daySectionList);
+
+                    }
+                }
+            }
+        }
+        String s = JSON.toJSONString(clCalendarStudyVos);
+        String s1 = JSON.toJSONString(bo.getStudyCount());
+        userPlan.setUserId(bo.getUserId());
+        userPlan.setSchedule(s);
+        userPlan.setStudyCount(s1);
+        userPlan.setPitchNum(sumUp);
+        userPlan.setStudyDay(bo.getStudyDay());
+        userPlan.setStudyNum(0L);
+        userPlan.setCreateTime(DateUtils.getNowTime());
+        userPlan.setUpdateTime(DateUtils.getNowTime());
+        userPlan.setExamDate(bo.getExamDate());
+        userPlan.setStatus(1);
+        userPlan.setUserId(bo.getUserId());
+        userPlan.setStartTime(bo.getStartTime());
+        userPlan.setEndTime(bo.getEndTime());
+        userPlan.setReminderTime(bo.getReminderTime());
+        this.save(userPlan);
+        return true;
     }
 
     @Override
-    public Boolean updateByEditBo(UserPlanEditBo bo) {
-        UserPlan update = BeanUtil.toBean(bo, UserPlan.class);
-        validEntityBeforeSave(update);
-        update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
+    public Boolean updateByEditBo(UserPlanEditBo bo) throws ParseException {
+        UserPlan userPlan = new UserPlan();
+        List<CalendarStudyVo> clCalendarStudyVos = findDates(bo.getStartTime(),bo.getEndTime());
+        Long sumUp=0L;
+        for (Long aLong : bo.getGoodsId()) {
+            //最近考试时间七天前到现在的天数，学习视频时长
+            Date date1 = new Date(bo.getEndTime() * 1000L);
+            //获得相隔天数
+            int dutyDays = getDutyDays(new Date(), date1, bo.getStudyCount(), bo.getStudyDay());
+
+            List<Long> seLongs = baseMapper.selectGoods(aLong);
+            Long allNum = 0L;
+            for (Long seLong : seLongs) {
+                allNum += seLong;
+            }
+            sumUp += allNum;
+            //计算每天需要学习多少节课
+            int Sec = (int) Math.ceil((double) allNum / dutyDays);
+            for (CalendarStudyVo clCalendarStudyVo : clCalendarStudyVos) {
+                for (DayStudyVo dayStudyVo : clCalendarStudyVo.getDayStudyList()) {
+                    if (Arrays.asList(bo.getStudyCount()).contains(dayStudyVo.getStudyDay())){
+                        if (dayStudyVo.getStudyCourseKnob() != null) {
+                            dayStudyVo.setStudyCourseKnob(dayStudyVo.getStudyCourseKnob() + Sec);
+                        }else {
+                            dayStudyVo.setStudyCourseKnob(Convert.toLong(Sec));
+                        }
+                        dayStudyVo.setPerform(0);
+                        List<DaySectionVo> daySectionList = new ArrayList<>();
+                        if (!CollectionUtils.isEmpty(dayStudyVo.getDaySectionList())) {
+                            daySectionList = dayStudyVo.getDaySectionList();
+                        }
+                        DaySectionVo daySectionVo = new DaySectionVo();
+                        daySectionVo.setGoodsId(aLong);
+                        daySectionVo.setStudyGoodsKnob(Convert.toLong(Sec));
+                        daySectionVo.setGoodsPerform(0);
+                        daySectionList.add(daySectionVo);
+                        dayStudyVo.setDaySectionList(daySectionList);
+
+                    }
+                }
+            }
+        }
+        String s = JSON.toJSONString(clCalendarStudyVos);
+        String s1 = JSON.toJSONString(bo.getStudyCount());
+        userPlan.setUserId(bo.getUserId());
+        userPlan.setSchedule(s);
+        userPlan.setStudyCount(s1);
+        userPlan.setPitchNum(sumUp);
+        userPlan.setStudyDay(bo.getStudyDay());
+        userPlan.setStudyNum(0L);
+        userPlan.setCreateTime(DateUtils.getNowTime());
+        userPlan.setUpdateTime(DateUtils.getNowTime());
+        userPlan.setExamDate(bo.getExamDate());
+        userPlan.setStatus(1);
+        userPlan.setUserId(bo.getUserId());
+        userPlan.setStartTime(bo.getStartTime());
+        userPlan.setEndTime(bo.getEndTime());
+        userPlan.setReminderTime(bo.getReminderTime());
+        userPlan.setPlanId(bo.getPlanId());
+        this.updateById(userPlan);
+        return true;
     }
 
     /**
@@ -113,9 +276,123 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
     }
 
     @Override
-    public UserPlanVo listPlan(UserPlanEditBo bo) {
+    public UserPlanVo listPlan(UserPlanEditBo bo) throws ParseException {
         validEntityPlanBeforeSave(bo);
-        return null;
+        UserPlanVo userPlanVo = new UserPlanVo();
+        List<CalendarStudyVo> clCalendarStudyVos = findDates(bo.getStartTime(),bo.getEndTime());
+        for (Long aLong : bo.getGoodsId()) {
+            //最近考试时间七天前到现在的天数，学习视频时长
+            Date date1 = new Date(bo.getEndTime() * 1000L);
+            //获得相隔天数
+            int dutyDays = getDutyDays(new Date(), date1, bo.getStudyCount(), bo.getStudyDay());
+
+            List<Long> seLongs = baseMapper.selectGoods(aLong);
+            Long allNum = 0L;
+            for (Long seLong : seLongs) {
+                allNum += seLong;
+            }
+            //计算每天需要学习多少节课
+            int Sec = (int) Math.ceil((double) allNum / dutyDays);
+            for (CalendarStudyVo clCalendarStudyVo : clCalendarStudyVos) {
+                for (DayStudyVo dayStudyVo : clCalendarStudyVo.getDayStudyList()) {
+                    if (Arrays.asList(bo.getStudyCount()).contains(dayStudyVo.getStudyDay())){
+                        if (dayStudyVo.getStudyCourseKnob() != null) {
+                            dayStudyVo.setStudyCourseKnob(dayStudyVo.getStudyCourseKnob() + Sec);
+                        }else {
+                            dayStudyVo.setStudyCourseKnob(Convert.toLong(Sec));
+                        }
+                        dayStudyVo.setPerform(0);
+                        List<DaySectionVo> daySectionList = new ArrayList<>();
+                        if (!CollectionUtils.isEmpty(dayStudyVo.getDaySectionList())) {
+                            daySectionList = dayStudyVo.getDaySectionList();
+                        }
+                        DaySectionVo daySectionVo = new DaySectionVo();
+                        daySectionVo.setGoodsId(aLong);
+                        daySectionVo.setStudyGoodsKnob(Convert.toLong(Sec));
+                        daySectionVo.setGoodsPerform(0);
+                        daySectionList.add(daySectionVo);
+                        dayStudyVo.setDaySectionList(daySectionList);
+
+                    }
+                }
+            }
+        }
+        userPlanVo.setCalendarStudyVo(clCalendarStudyVos);
+        userPlanVo.setStudyCourseKnob(clCalendarStudyVos.get(0).getDayStudyList().get(0).getStudyCourseKnob());
+        return userPlanVo;
+    }
+
+    //获得日历
+    public static List<CalendarStudyVo> findDates(Long dBegin, Long dEnd) throws ParseException, java.text.ParseException {
+        Long timeStamp = System.currentTimeMillis();  //获取当前时间戳
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+        String dBeginS = sdf.format(new Date(Long.parseLong(String.valueOf(dBegin*1000))));      // 时间戳转换成时间
+        String dEndS = sdf.format(new Date(Long.parseLong(String.valueOf(dEnd*1000))));      // 时间戳转换成时间
+
+        //日期工具类准备
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+
+        //设置开始时间
+        Calendar calBegin = Calendar.getInstance();
+        calBegin.setTime(format.parse(dBeginS));
+
+        //设置结束时间
+        Calendar calEnd = Calendar.getInstance();
+        calEnd.setTime(format.parse(dEndS));
+
+        //装返回的日期集合容器
+        List<CalendarStudyVo> Datelist = new ArrayList<CalendarStudyVo>();
+
+        CalendarStudyVo calendarStudyVo = new CalendarStudyVo();
+        List<DayStudyVo> dayStudyList = new ArrayList<>();
+        // 每次循环给calBegin日期加一天，直到calBegin.getTime()时间等于dEnd
+        while (format.parse(dEndS).after(calBegin.getTime()))  {
+            // 根据日历的规则，为给定的日历字段添加或减去指定的时间量
+            calBegin.add(Calendar.DAY_OF_MONTH, 1);
+            if (calendarStudyVo.getMonth() == null){
+                calendarStudyVo.setMonth(Convert.toLong(calBegin.get(java.util.Calendar.MONTH)+1));
+                calendarStudyVo.setYear(Convert.toLong(calBegin.get(java.util.Calendar.YEAR)));
+            }
+            if (calendarStudyVo.getMonth() != null && calendarStudyVo.getMonth() != (calBegin.get(java.util.Calendar.MONTH)+1)){
+                calendarStudyVo.setDayStudyList(dayStudyList);
+                Datelist.add(calendarStudyVo);
+                calendarStudyVo = new CalendarStudyVo();
+                dayStudyList = new ArrayList<>();
+                calendarStudyVo.setMonth(Convert.toLong(calBegin.get(java.util.Calendar.MONTH)+1));
+                calendarStudyVo.setYear(Convert.toLong(calBegin.get(java.util.Calendar.YEAR)));
+            }
+            DayStudyVo dayStudyVo = new DayStudyVo();
+            dayStudyVo.setDate(Convert.toLong(calBegin.get(Calendar.DATE)));
+            dayStudyVo.setStudyDay(Convert.toLong(calBegin.get(Calendar.DAY_OF_WEEK)-1));
+            dayStudyList.add(dayStudyVo);
+        }
+        calendarStudyVo.setDayStudyList(dayStudyList);
+        Datelist.add(calendarStudyVo);
+        System.out.println(Datelist);
+        return Datelist;
+    }
+
+    //获得可用学习天数
+    private static int getDutyDays(Date  startDateStr, Date endDateStr,Long[] longs,Long studyDay)  {
+        int result = 0;
+        Date endDate = endDateStr;
+        Calendar c = Calendar.getInstance();
+        c.setTime(endDate);
+        c.add(Calendar.DATE, - Convert.toInt(studyDay));
+        endDate = c.getTime();
+
+        Date startDate = startDateStr;
+
+        while (startDate.compareTo(endDate) <= 0) {
+            for (Long integer : longs) {
+                if (startDate.getDay() != integer) {
+                    result++;
+                    break;
+                }
+            }
+            startDate.setDate(startDate.getDate() + 1);
+        }
+        return result-1;
     }
 
     @Override
@@ -135,6 +412,5 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
         if (rank > 0){
             throw new IllegalArgumentException("此网课学习计划正在进行中，若想再次制定请将计划完成或删除");
         }
-
     }
 }

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

@@ -8,7 +8,7 @@ import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.exam.mapper.ExamApplyMapper;
 import com.zhongzheng.modules.exam.vo.ExamApplySiteTimeVo;
 import com.zhongzheng.modules.exam.vo.ExamApplySiteVo;
-import com.zhongzheng.modules.user.bo.UserSubscribeCertificateEditBo;
+import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.vo.UserSubscribeImport;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -16,9 +16,6 @@ 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.bo.UserSubscribeAddBo;
-import com.zhongzheng.modules.user.bo.UserSubscribeQueryBo;
-import com.zhongzheng.modules.user.bo.UserSubscribeEditBo;
 import com.zhongzheng.modules.user.domain.UserSubscribe;
 import com.zhongzheng.modules.user.mapper.UserSubscribeMapper;
 import com.zhongzheng.modules.user.vo.UserSubscribeVo;
@@ -118,7 +115,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
     }
 
     @Override
-    public Boolean updateByEditSingleBo(UserSubscribeEditBo bo) {
+    public Boolean updateByEditSingleBo(UserAppSubscribeEditBo bo) {
         UserSubscribe update = BeanUtil.toBean(bo, UserSubscribe.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/DaySectionVo.java

@@ -19,26 +19,16 @@ public class DaySectionVo {
 
     private static final long serialVersionUID = 1L;
 
-    /** 节ID */
-    @Excel(name = "节ID")
-    @ApiModelProperty("节ID")
-    private Long sectionId;
-    /** 模块ID */
-    @Excel(name = "模块ID")
-    @ApiModelProperty("模块ID")
-    private Long moduleId;
-    /** 章ID */
-    @Excel(name = "章ID")
-    @ApiModelProperty("章ID")
-    private Long chapterId;
-
-    /** 课程ID */
-    @ApiModelProperty("课程ID")
-    private Long courseId;
+    /** 商品ID */
+    @ApiModelProperty("商品ID")
+    private Long goodsId;
+
+    @ApiModelProperty("当天学习节数")
+    private Long studyGoodsKnob;
 
     /** 是否完成任务  0等待完成  1完成 2未完成*/
     @ApiModelProperty("当前节当天是否已完成  0等待完成  1完成 2未完成")
-    private Integer sectionPerform;
+    private Integer GoodsPerform;
 
 }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserPlanVo.java

@@ -60,20 +60,16 @@ public class UserPlanVo {
 	@Excel(name = "0 失效 1启用")
 	@ApiModelProperty("0 失效 1启用")
 	private Integer status;
+	@ApiModelProperty("当天学习节数")
+	private Long studyCourseKnob;
+
 	/** 总结数 */
-	@Excel(name = "总结数")
 	@ApiModelProperty("总结数")
 	private Long pitchNum;
 	/** 已学习节数 */
-	@Excel(name = "已学习节数")
 	@ApiModelProperty("已学习节数")
 	private Long studyNum;
 
-	/** 学习课程 */
-	@Excel(name = "学习课程")
-	@ApiModelProperty("学习课程")
-	private List<CoursePlanVo> coursePlanVo;
-
 	/** 日历计划学习时间 */
 	@Excel(name = "日历计划学习时间")
 	@ApiModelProperty("日历计划学习时间")

zhongzheng-system/src/main/resources/mapper/modules/exam/ExamApplyMapper.xml

@@ -298,7 +298,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             exam_before eb
                 LEFT JOIN exam_before_goods ebg on eb.before_id=ebg.before_id
         WHERE
-            ebg.goods_id =3
+            ebg.goods_id =#{goodsId}
           and eb.`status`=1
     </select>
 

zhongzheng-system/src/main/resources/mapper/modules/exam/ExamBeforeMapper.xml

@@ -122,6 +122,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	AND eb.`status` =1
     </select>
 
+    <select id="verifyInfo" parameterType="long" resultType="integer">
+        SELECT
+            COUNT(1)
+        FROM
+            user_subscribe us
+        WHERE
+            1 =1
+          AND us.goods_id = #{goodsId}
+          AND us.exam_status = 0
+          AND us.subscribe_status = 1
+          AND us.before_status =1
+    </select>
+
+
+    <select id="verifyExamBeforeVo" parameterType="long" resultType="integer">
+        SELECT
+            eb.*,
+            ebu.url_name,
+            ebu.url
+        FROM
+            exam_before eb
+                LEFT JOIN exam_before_goods ebg ON eb.before_id = ebg.before_id
+                LEFT JOIN exam_before_url ebu on eb.before_url=ebu.before_url_id
+        where ebg.goods_id =#{goodsId}
+          and eb.`status` =1
+            LIMIT 1
+    </select>
+
     <select id="queryBefore" parameterType="com.zhongzheng.modules.exam.bo.ExamBeforeQueryBo" resultMap="ExamBeforeVo">
         SELECT
             *,

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

@@ -97,13 +97,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         user_plan up
         LEFT JOIN user_plan_goods upg ON up.plan_id = upg.plan_id
         <if test="goodsId != null and goodsId !=''">
-            and c.source_id in
+            and upg.source_id in
             <foreach collection="goodsId" open="(" separator="," close=")" item="goodsId">
                 #{goodsId}
             </foreach>
         </if>
         <if test="userId != null and userId !=''">
-            and u.user_id = #{userId}
+            and up.user_id = #{userId}
+        </if>
+    </select>
+
+    <select id="selectGoods" parameterType="long"  resultType="Long">
+        SELECT
+            (
+                SELECT
+                        COUNT( id )+(
+                        SELECT
+                            COUNT( n.id )
+                        FROM
+                            course_chapter_section n
+                                LEFT JOIN course_module_chapter p ON n.chapter_id = p.chapter_id
+                                LEFT JOIN course_menu m ON m.menu_id = p.module_id
+                        WHERE
+                            m.course_id = r.course_id
+                          AND m.type IN ( 1 ))+(
+                            SELECT
+                                COUNT( n.id )
+                            FROM
+                                course_chapter_section n
+                                    LEFT JOIN course_menu m ON m.menu_id = n.chapter_id
+                            WHERE
+                                m.course_id = r.course_id
+                              AND m.type IN ( 2 ))
+                FROM
+                    course_menu m
+                WHERE
+                    m.course_id = r.course_id
+                  AND m.type IN ( 3 )) AS section_num
+        FROM
+            course r
+                LEFT JOIN goods_course c ON c.course_id = r.course_id
+        WHERE
+            1 = 1
+        <if test="goodsId != null">
+            and c.goods_id =#{goodsId}
         </if>
     </select>
 </mapper>

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

@@ -82,6 +82,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="goodsId != null and goodsId != '' ">
             and us.goods_id = #{goodsId}
         </if>
+        <if test="result != null ">
+            and us.result = #{result}
+        </if>
         <if test="subscribeId != null and subscribeId != '' ">
             and us.subscribe_id = #{subscribeId}
         </if>