我的学时

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

@@ -0,0 +1,48 @@
+package com.zhongzheng.controller.course;
+
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.modules.course.bo.CourseAddBo;
+import com.zhongzheng.modules.course.bo.CourseEditBo;
+import com.zhongzheng.modules.course.bo.CourseQueryBo;
+import com.zhongzheng.modules.course.service.ICourseService;
+import com.zhongzheng.modules.course.vo.CourseVo;
+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.*;
+
+import java.util.List;
+
+/**
+ * 课程Controller
+ *
+ * @author hjl
+ * @date 2021-10-09
+ */
+@Api(value = "课程控制器", tags = {"课程管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/course")
+public class CourseController extends BaseController {
+
+    private final ICourseService iCourseService;
+
+    /**
+     * 查询课程列表
+     */
+    @ApiOperation("查询商品下的课程列表")
+    @GetMapping("/goodsList")
+    public TableDataInfo<CourseVo> goodsList(CourseQueryBo bo) {
+        startPage();
+        List<CourseVo> list = iCourseService.selectList(bo);
+        return getDataTable(list);
+    }
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseQueryBo.java

@@ -40,6 +40,15 @@ public class CourseQueryBo extends BaseEntity {
 	/** 前缀名称 */
 	@ApiModelProperty("前缀名称")
 	private String prefixName;
+
+	/** 班级Id */
+	@ApiModelProperty("班级Id")
+	private Long gradeId;
+
+	/** 商品Id */
+	@ApiModelProperty("商品Id")
+	private Long goodsId;
+
 	/** 封面地址 */
 	@ApiModelProperty("封面地址")
 	private String coverUrl;

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

@@ -214,6 +214,11 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
             userPeriodStatus.setPeriodStatus(0);
             userPeriodStatusService.updateById(userPeriodStatus);
             UserPeriodStatusAddBo userPeriodStatusAddBo = new UserPeriodStatusAddBo();
+            userPeriodStatusAddBo.setPeriodStatus(1);
+            userPeriodStatusAddBo.setPeriodId(goodsPeriodStatusVo.getPeriodId());
+            userPeriodStatusAddBo.setCreateTime(DateUtils.getNowTime());
+            userPeriodStatusAddBo.setUpdateTime(DateUtils.getNowTime());
+            userPeriodStatusAddBo.setStatus(3);
             userPeriodStatusService.insertByAddBo(userPeriodStatusAddBo);
         }
         return true;

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

@@ -138,5 +138,9 @@ public class UserQueryBo extends BaseEntity {
 	@ApiModelProperty("1在职 0离职")
 	private Long jobStatus;
 
+	/** 1空 */
+	@ApiModelProperty("1空")
+	private Long empty;
+
 
 }

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

@@ -67,6 +67,13 @@
         <result property="recordNum" column="record_num"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.goods.vo.GoodsPeriodStatusVo" id="GoodsPeriodStatusVo">
+        <result property="id" column="id"/>
+        <result property="type" column="type"/>
+        <result property="name" column="name"/>
+        <result property="periodId" column="period_id"/>
+    </resultMap>
+
     <select id="findGoodsList" resultMap="CourseGoodsListResult">
         SELECT
             g.goods_name,
@@ -229,7 +236,7 @@
         AND cg.status=1
     </select>
 
-    <select id="listSection" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo"  resultMap="CourseResultVo">
+    <select id="listSection" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo"  resultMap="GoodsPeriodStatusVo">
         SELECT
             ups.id,
             ups.period_id,

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

@@ -161,6 +161,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userId != null and userId != ''" >
             AND u.user_id = #{userId}
         </if>
+        <if test="empty != null and empty != ''" >
+           and u.realname is NOT NULL
+        </if>
         <if test="gradePoint != null and gradePoint == 1" >
             AND (SELECT COUNT(u.user_id) FROM class_grade_user cgu where 1=1 AND u.status in (1) and cgu.user_id= u.user_id) > 0
         </if>