fix 系统选新班

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

@@ -81,6 +81,15 @@ public class CourseController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation("查询用户商品重修状态")
+    @GetMapping("/goodsRebuildStatus")
+    public AjaxResult<Long> goodsRebuildStatus(CourseQueryBo bo) {
+        startPage();
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return AjaxResult.success(iCourseService.goodsRebuildStatus(bo));
+    }
+
     /**
      * 查询课程目录结构列表
      */

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

@@ -45,4 +45,6 @@ public interface CourseMapper extends BaseMapper<Course> {
     Long rebuildNext(ClassGradeUserQueryBo bo);
 
     ClassGradeVo gradeIdSelect(@Param("userId") Long userId, @Param("goodsId") Long goodsId);
+
+    Long goodsRebuildStatus(CourseQueryBo bo);
 }

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

@@ -41,6 +41,8 @@ public interface ICourseService extends IService<Course> {
 
 	List<CourseVo> selectList(CourseQueryBo bo);
 
+	Long goodsRebuildStatus(CourseQueryBo bo);
+
 	/**
 	 * 根据新增业务对象插入课程
 	 * @param bo 课程新增业务对象

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

@@ -130,6 +130,11 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
         return courseMapper.selectCourseList(bo);
     }
 
+    @Override
+    public Long goodsRebuildStatus(CourseQueryBo bo) {
+        return this.baseMapper.goodsRebuildStatus(bo);
+    }
+
     /**
     * 实体类转化成视图对象
     *

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

@@ -429,6 +429,10 @@
           and up.grade_id = #{gradeId}
     </select>
 
+    <select id="goodsRebuildStatus" parameterType="com.zhongzheng.modules.course.bo.CourseQueryBo"  resultType="Long">
+        SELECT case WHEN COUNT(1) >0 then 0 ELSE 1 end FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where up.goods_id = #{goodsId} AND ups.period_status =1  and up.user_id = #{userId} and ups.`status` =0
+    </select>
+
     <select id="goodsList" parameterType="com.zhongzheng.modules.course.bo.CourseQueryBo"  resultMap="GoodsUserVo">
         SELECT
         g.*,

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

@@ -140,8 +140,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (SELECT p.project_name FROM course_project_type p where p.id = g.business_id) as project_name,
         (SELECT s.school_name FROM school s  where s.id = g.school_id) as school_name,
         (SELECT e.education_name FROM course_education_type e  where e.id = g.education_type_id) as education_name,
-        (SELECT r.start_time FROM user_study_record r LEFT JOIN goods_course c on r.course_id= c.course_id where 1=1 AND g.goods_id=c.goods_id ORDER BY r.start_time ASC LIMIT 1) as start_time,
-        (SELECT r.end_time FROM user_study_record r LEFT JOIN goods_course c on r.course_id= c.course_id where 1=1 AND g.goods_id=c.goods_id ORDER BY r.start_time DESC LIMIT 1) as end_time
+        (SELECT r.start_time FROM user_study_record r LEFT JOIN goods_course c on r.course_id= c.course_id where 1=1  and r.user_id = #{userId} AND g.goods_id=c.goods_id ORDER BY r.start_time ASC LIMIT 1) as start_time,
+        (SELECT r.end_time FROM user_study_record r LEFT JOIN goods_course c on r.course_id= c.course_id where 1=1 and r.user_id = #{userId} AND g.goods_id=c.goods_id ORDER BY r.start_time DESC LIMIT 1) as end_time
         FROM
         class_grade_user u
         LEFT JOIN class_grade_goods d ON u.grade_id = d.grade_id