学习计划

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

@@ -94,9 +94,8 @@ public class UserPlanController extends BaseController {
     @ApiOperation("获得展示的日历学习计划，不添加到数据库")
     @PreAuthorize("@ss.hasPermi('system:plan:list')")
     @GetMapping("/listPlan")
-    public TableDataInfo<UserPlanVo> listPlan(UserPlanQueryBo bo) {
-        startPage();
-        List<UserPlanVo> list = iUserPlanService.queryList(bo);
-        return getDataTable(list);
+    public AjaxResult<UserPlanVo> listPlan(UserPlanEditBo bo) {
+        UserPlanVo list = iUserPlanService.listPlan(bo);
+        return AjaxResult.success(list);
     }
 }

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

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 
@@ -31,26 +33,27 @@ public class UserPlanEditBo {
 
     /** 考试日期 */
     @ApiModelProperty("考试日期")
+    @NotNull(message = "请填写考试日期")
     private Long examDate;
-
     /** 提醒时间 */
     @ApiModelProperty("提醒时间")
+    @NotNull(message = "请填写提醒时间")
     private String reminderTime;
-
     /** 0周日  1周一 2周二 3周三 4周四 5周五 6周六 */
     @ApiModelProperty("0周日  1周一 2周二 3周三 4周四 5周五 6周六")
+    @NotNull(message = "请填写频率")
     private String studyCount;
-
     /** 复习天数 */
     @ApiModelProperty("复习天数")
+    @NotNull(message = "请填写复习天数")
     private Long studyDay;
-
     /** 结束时间 */
     @ApiModelProperty("结束时间")
+    @NotNull(message = "请填写结束时间")
     private Long endTime;
-
     /** 起始时间 */
     @ApiModelProperty("起始时间")
+    @NotNull(message = "请填写开始时间")
     private Long startTime;
 
     /** $column.columnComment */

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

@@ -11,6 +11,8 @@ import java.util.HashMap;
 
 import com.zhongzheng.common.core.domain.BaseEntity;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * 学习计划分页查询对象 user_plan
  *

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

@@ -49,4 +49,6 @@ public interface IUserPlanService extends IService<UserPlan> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    UserPlanVo listPlan(UserPlanEditBo bo);
 }

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

@@ -106,4 +106,9 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public UserPlanVo listPlan(UserPlanEditBo bo) {
+        return null;
+    }
 }

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

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.user.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * 【请填写功能名称】视图对象 mall_package
+ *
+ * @author change
+ * @date 2021-06-24
+ */
+@Data
+@ApiModel("【请填写功能名称】视图对象")
+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;
+
+    /** 是否完成任务  0等待完成  1完成 2未完成*/
+    @ApiModelProperty("当前节当天是否已完成  0等待完成  1完成 2未完成")
+    private Integer sectionPerform;
+
+}
+
+

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

@@ -36,7 +36,7 @@ public class DayStudyVo {
 
     /** 完成相应课节数 */
     @ApiModelProperty("完成相应课节数")
-    private Map<Long,Long> courseDayMap;
+    private List<DaySectionVo> DaySectionList;
 
 }
 

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

@@ -56,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
         1 = 1
         and g.status in(1)
+        and (SELECT COUNT(eng.id) FROM exam_number_goods eng LEFT JOIN exam_number en on eng.exam_number_id = en.exam_number_id where eng.goods_id =g.goods_id and en.`status` = 1) > 0
         <if test="businessId != null and businessId != ''">
             and g.business_id = #{businessId}
         </if>

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

@@ -53,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
         1 = 1
         and g.status in(1)
+        and (SELECT COUNT(eng.id) FROM exam_number_goods eng LEFT JOIN exam_number en on eng.exam_number_id = en.exam_number_id where eng.goods_id =g.goods_id and en.`status` = 1) > 0
         <if test="businessId != null and businessId != ''">
             and g.business_id = #{businessId}
         </if>