学习计划

zhongzheng-api/src/main/java/com/zhongzheng/controller/course/CoursePeriodController.java

@@ -0,0 +1,56 @@
+package com.zhongzheng.controller.course;
+
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.*;
+import com.zhongzheng.framework.web.service.WxTokenService;
+import com.zhongzheng.modules.course.bo.CourseEducationTypeQueryBo;
+import com.zhongzheng.modules.course.service.ICourseEducationTypeService;
+import com.zhongzheng.modules.course.service.ICourseService;
+import com.zhongzheng.modules.course.vo.CourseEducationTypeVo;
+import com.zhongzheng.modules.goods.vo.GoodsPeriodVo;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
+import com.zhongzheng.modules.user.bo.UserPlanQueryBo;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 教育类型Controller
+ * 
+ * @author ruoyi
+ * @date 2021-10-08
+ */
+@Api(value = "我的学时", tags = {"我的学时"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/course/period")
+public class CoursePeriodController extends BaseController {
+
+    private final ICourseService courseService;
+
+    private final WxTokenService wxTokenService;
+
+    /**
+     * 查询学习计划列表
+     */
+    @ApiOperation("查询用户拥有商品的学时记录")
+    @PreAuthorize("@ss.hasPermi('system:plan:list')")
+    @GetMapping("/listGoods")
+    public TableDataInfo<GoodsPeriodVo> listGoods(UserPlanQueryBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        List<GoodsPeriodVo> list = courseService.listGoodsPeriodVo(bo);
+        return getDataTable(list);
+    }
+}

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

@@ -48,12 +48,13 @@ public class UserPlanController extends BaseController {
 
     private final IUserPlanService iUserPlanService;
 
-    private final WxTokenService WxTokenService;
+
+    @Autowired
+    private WxTokenService wxTokenService;
     /**
      * 查询学习计划列表
      */
     @ApiOperation("查询学习计划列表")
-    @PreAuthorize("@ss.hasPermi('system:plan:list')")
     @GetMapping("/list")
     public TableDataInfo<UserPlanVo> list(UserPlanQueryBo bo) {
         startPage();
@@ -66,7 +67,6 @@ public class UserPlanController extends BaseController {
      * 获取学习计划详细信息
      */
     @ApiOperation("获取学习计划详细信息")
-    @PreAuthorize("@ss.hasPermi('system:plan:query')")
     @GetMapping("/{planId}")
     public AjaxResult<UserPlanVo> getInfo(@PathVariable("planId" ) Long planId) {
         return AjaxResult.success(iUserPlanService.queryById(planId));
@@ -76,7 +76,6 @@ public class UserPlanController extends BaseController {
      * 新增学习计划
      */
     @ApiOperation("新增学习计划")
-    @PreAuthorize("@ss.hasPermi('system:plan:add')")
     @Log(title = "学习计划", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult<Void> add(@RequestBody UserPlanAddBo bo) {
@@ -87,7 +86,6 @@ public class UserPlanController extends BaseController {
      * 修改学习计划
      */
     @ApiOperation("修改学习计划")
-    @PreAuthorize("@ss.hasPermi('system:plan:edit')")
     @Log(title = "学习计划", businessType = BusinessType.UPDATE)
     @PutMapping()
     public AjaxResult<Void> edit(@RequestBody UserPlanEditBo bo) {
@@ -99,7 +97,6 @@ public class UserPlanController extends BaseController {
      * 查询学习计划列表
      */
     @ApiOperation("获得展示的日历学习计划，不添加到数据库")
-    @PreAuthorize("@ss.hasPermi('system:plan:list')")
     @GetMapping("/listPlan")
     public AjaxResult<UserPlanVo> listPlan(UserPlanEditBo bo) {
         UserPlanVo list = iUserPlanService.listPlan(bo);
@@ -109,13 +106,12 @@ public class UserPlanController extends BaseController {
     /**
      * 查询学习计划列表
      */
-    @ApiOperation("查询学员拥有商品能生成学习计划的商品")
-    @PreAuthorize("@ss.hasPermi('system:plan:list')")
+  /*  @ApiOperation("查询学员拥有商品能生成学习计划的商品")
     @GetMapping("/listGoods")
     public TableDataInfo<GoodsVo> listGoods(UserPlanQueryBo bo) {
         ClientLoginUser loginUser = WxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         List<GoodsVo> list = iUserPlanService.listGoods(bo);
         return getDataTable(list);
-    }
+    }*/
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseMapper.java

@@ -6,6 +6,8 @@ import com.zhongzheng.common.core.domain.entity.SysRole;
 import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.course.domain.Course;
 import com.zhongzheng.modules.course.vo.CourseVo;
+import com.zhongzheng.modules.goods.vo.GoodsPeriodVo;
+import com.zhongzheng.modules.user.bo.UserPlanQueryBo;
 
 import java.util.List;
 import java.util.Map;
@@ -23,6 +25,5 @@ public interface CourseMapper extends BaseMapper<Course> {
     List<CourseVo> selectCourseList(CourseQueryBo bo);
 
 
-
-
+    List<GoodsPeriodVo> listGoodsPeriodVo(UserPlanQueryBo bo);
 }

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

@@ -7,6 +7,8 @@ import com.zhongzheng.modules.course.bo.CourseEditBo;
 import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.course.domain.Course;
 import com.zhongzheng.modules.course.vo.CourseVo;
+import com.zhongzheng.modules.goods.vo.GoodsPeriodVo;
+import com.zhongzheng.modules.user.bo.UserPlanQueryBo;
 
 import java.util.Collection;
 import java.util.List;
@@ -54,4 +56,6 @@ public interface ICourseService extends IService<Course> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<GoodsPeriodVo> listGoodsPeriodVo(UserPlanQueryBo bo);
 }

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

@@ -16,6 +16,8 @@ import com.zhongzheng.modules.course.mapper.CourseSectionMapper;
 import com.zhongzheng.modules.course.service.ICourseSectionBusinessService;
 import com.zhongzheng.modules.course.service.ICourseService;
 import com.zhongzheng.modules.course.vo.CourseVo;
+import com.zhongzheng.modules.goods.vo.GoodsPeriodVo;
+import com.zhongzheng.modules.user.bo.UserPlanQueryBo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -136,6 +138,11 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
         return this.removeByIds(ids);
     }
 
+    @Override
+    public List<GoodsPeriodVo> listGoodsPeriodVo(UserPlanQueryBo bo) {
+        return baseMapper.listGoodsPeriodVo(bo);
+    }
+
     private boolean checkNameUnique(Course entity) {
         Course info = getOne(new LambdaQueryWrapper<Course>()
                 .eq(Course::getPrefixName,entity.getPrefixName()).eq(Course::getCourseName,entity.getCourseName()).last("limit 1"));

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

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.goods.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+/**
+ * 商品视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2021-10-12
+ */
+@Data
+@ApiModel("商品视图对象")
+public class GoodsPeriodVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long goodsId;
+
+	/** 年份 */
+	@Excel(name = "年份")
+	@ApiModelProperty("年份")
+	private Long year;
+
+
+	/** 商品名称 */
+	@Excel(name = "商品名称")
+	@ApiModelProperty("商品名称")
+	private String goodsName;
+
+
+	/** 商品名称 */
+	@Excel(name = "商品名称")
+	@ApiModelProperty("学时审核状态 -1 不可审核 1通过审核  2待审 3不通过")
+	private Long periodStatus;
+
+	/** 重修节数目 */
+	@Excel(name = "重修节数目")
+	@ApiModelProperty("重修节数目")
+	private Long rebuild;
+}

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

@@ -3,7 +3,11 @@ package com.zhongzheng.modules.user.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -32,6 +36,9 @@ import java.util.stream.Collectors;
 @Service
 public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, UserSubscribe> implements IUserSubscribeService {
 
+    @Autowired
+    private ExamApplyMapper examApplyMapper;
+
     @Override
     public UserSubscribeVo queryById(Long subscribeId){
         UserSubscribe db = this.baseMapper.selectById(subscribeId);
@@ -120,7 +127,22 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
 
     @Override
     public List<UserSubscribeVo> listSubscribe(UserSubscribeQueryBo bo) {
-        return baseMapper.listSubscribe(bo);
+        List<UserSubscribeVo> userSubscribeVos = baseMapper.listSubscribe(bo);
+        for (UserSubscribeVo userSubscribeVo : userSubscribeVos) {
+            List<ExamApplySiteVo> examApplySite = examApplyMapper.addressExam(userSubscribeVo.getApplyId(),1L);
+            for (ExamApplySiteVo examApplySiteVo : examApplySite) {
+                List<ExamApplySiteTimeVo> examApplySiteTime = examApplyMapper.addressTimeExam(examApplySiteVo.getId());
+                examApplySiteVo.setExamApplySiteTime(examApplySiteTime);
+            }
+            List<ExamApplySiteVo> examApplySiteTrain = examApplyMapper.addressExam(userSubscribeVo.getApplyId(),2L);
+            for (ExamApplySiteVo examApplySiteVo : examApplySiteTrain) {
+                List<ExamApplySiteTimeVo> examApplySiteTime = examApplyMapper.addressTimeExam(examApplySiteVo.getId());
+                examApplySiteVo.setExamApplySiteTime(examApplySiteTime);
+            }
+            userSubscribeVo.setExamApplySite(examApplySite);
+            userSubscribeVo.setExamApplySiteTrain(examApplySiteTrain);
+        }
+        return userSubscribeVos;
     }
 
     @Override

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -56,6 +56,13 @@
         <result property="subjectName" column="subject_name"/>
         <collection property="goodsList" column="course_id" select="findGoodsList"/>
     </resultMap>
+    <resultMap type="com.zhongzheng.modules.goods.vo.GoodsPeriodVo" id="GoodsPeriodVo">
+        <result property="goodsId" column="goods_id"/>
+        <result property="year" column="year"/>
+        <result property="goodsName" column="goods_name"/>
+        <result property="periodStatus" column="period_status"/>
+        <result property="rebuild" column="rebuild"/>
+    </resultMap>
 
     <select id="findGoodsList" resultMap="CourseGoodsListResult">
         SELECT
@@ -188,4 +195,8 @@
         WHERE
             course_id = #{id}
     </select>
+
+    <select id="listGoodsPeriodVo" parameterType="com.zhongzheng.modules.user.bo.UserPlanQueryBo"  resultMap="GoodsPeriodVo">
+
+    </select>
 </mapper>