搜索条件新增

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

@@ -53,7 +53,7 @@ public class CoursePeriodController extends BaseController {
     @GetMapping("/listGoods")
     public TableDataInfo<GoodsPeriodVo> listGoods(UserPlanQueryBo bo) {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setUserId(loginUser.getUser().getUserId());
+        bo.setUserId(18L);
         List<GoodsPeriodVo> list = courseService.listGoodsPeriodVo(bo);
         return getDataTable(list);
     }

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

@@ -227,7 +227,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
                 goodsPeriodVo.setPeriodStatus(-1L);
             }
             if (goodsPeriodVo.getRebuildNum() > 0){
-                goodsPeriodVo.setPeriodStatus(-1L);
+                goodsPeriodVo.setPeriodStatus(3L);
             }
         }
         return goodsPeriodVos;

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

@@ -332,7 +332,7 @@
             g.goods_id,
             g.goods_name,
             g.`year`,
-            (SELECT COUNT(1) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where up.goods_id = g.goods_id AND ups.period_status =1 and ups.`status` =0 or ups.`status` =3) as rebuild,
+            (SELECT COUNT(1) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where up.goods_id = g.goods_id AND ups.period_status =1 and ups.`status` =0 or ups.`status` =3 and up.grade_id = cgu.grade_id) as rebuild,
             (case WHEN (SELECT COUNT(1) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where up.goods_id = g.goods_id AND ups.period_status =1 and ups.`status` =0) >0 then 0 ELSE 1 end) as rebuild_status,
             cgu.grade_id,
             (SELECT COUNT(m.id) FROM course_menu_exam m LEFT JOIN goods_course c on m.course_id=c.course_id LEFT JOIN class_grade_goods cgg on cgg.goods_id = c.goods_id where cg.grade_id=cgg.grade_id and m.type = 1 ) as exam_num,
@@ -340,7 +340,7 @@
             (SELECT COUNT(up.id) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where
                 ups.`status` =1 and ups.period_status = 1 and up.goods_id=g.goods_id and up.user_id = cgu.user_id and up.type = 1) as pass,
             (SELECT COUNT(up.id) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where
-                ups.`status` =3 and ups.period_status = 1 and up.goods_id=g.goods_id and up.user_id = cgu.user_id and up.type = 1) as rebuildNum,
+                ups.`status` =3 and ups.period_status = 1 and up.goods_id=g.goods_id and up.user_id = cgu.user_id and up.type = 1 and up.grade_id = cgu.grade_id) as rebuildNum,
             (SELECT
                  COUNT(up.id) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where ups.`status`
                 =0 and ups.period_status = 1 and up.goods_id=g.goods_id and up.user_id = cgu.user_id and up.type = 1) as cheat,