fix

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -423,7 +423,7 @@
         u.user_id,
         cgu.`status`,
         u.realname,
-        cgg.goods_id,
+        og.goods_id,
         u.id_card,
         cgu.grade_id,
         u.telphone,
@@ -453,16 +453,16 @@
         (SELECT og.service_end_time FROM order_goods og  where og.order_goods_id = cgu.order_goods_id ) as service_end_time,
         (SELECT COUNT(DISTINCT ubr.module_id,ubr.chapter_id,ubr.exam_id) FROM user_bank_record ubr  where ubr.`status`=1 and ubr.`type` in (1,3) and ubr.report_status=1 and ubr.order_goods_id = cgu.order_goods_id and ubr.grade_id = cgu.grade_id and ubr.user_id = cgu.user_id and ubr.current_status = 1) as record_num
         <if test="userPhoto == null">
-            ,(select COUNT(up.id) from user_period up LEFT JOIN user_period_status ups on up.id=ups.period_id where up.goods_id = (SELECT cgg.goods_id FROM class_grade_goods cgg where cg.grade_id=cgg.grade_id) and up.grade_id = cgu.grade_id and up.order_goods_id = cgu.order_goods_id and up.user_id = u.user_id
+            ,(select COUNT(up.id) from user_period up LEFT JOIN user_period_status ups on up.id=ups.period_id where up.goods_id = og.goods_id and up.grade_id = cgu.grade_id and up.order_goods_id = cgu.order_goods_id and up.user_id = u.user_id
             and ups.period_status=0 and ups.`status`=0 and (SELECT COUNT(upss.id) from user_period_status upss where upss.id = ups.id and upss.period_status = 1 and upss.`status` = 2) > 0 ) as rebuild_num
         </if>
         FROM
         class_grade_user cgu
         LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_id
-        LEFT JOIN class_grade_goods cgg on cg.grade_id=cgg.grade_id
+        LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
         LEFT JOIN `user` u ON u.user_id = cgu.user_id
-        LEFT JOIN user_profile up on u.user_id =up.user_id and up.goods_id = cgg.goods_id and cgu.order_goods_id = up.order_goods_id and up.type_status=1 and up.current_status = 1
-        LEFT JOIN goods g on cgg.goods_id = g.goods_id
+        LEFT JOIN user_profile up on u.user_id =up.user_id and up.goods_id = og.goods_id and cgu.order_goods_id = up.order_goods_id and up.type_status=1 and up.current_status = 1
+        LEFT JOIN goods g on og.goods_id = g.goods_id
         LEFT JOIN course_business cb ON g.business_id = cb.id
         LEFT JOIN (SELECT
         COUNT( m.id ) AS exam_num,
@@ -472,7 +472,7 @@
         LEFT JOIN goods_course c ON m.course_id = c.course_id
         where
         m.type in (1,3)
-        GROUP BY c.goods_id ) ge on cgg.goods_id = ge.goods_id
+        GROUP BY c.goods_id ) ge on og.goods_id = ge.goods_id
         where 1=1
         and cgu.`status` =1
         <if test="periodPlush != null and periodPlush != ''">
@@ -597,7 +597,7 @@
         u.user_id,
         cgu.`status`,
         u.realname,
-        cgg.goods_id,
+        og.goods_id,
         u.id_card,
         cgu.grade_id,
         u.telphone,
@@ -622,16 +622,16 @@
         </if>
         cgu.period_wait_time as end_time
         <if test="userPhoto == null">
-            ,(select COUNT(up.id) from user_period up LEFT JOIN user_period_status ups on up.id=ups.period_id where up.goods_id = (SELECT cgg.goods_id FROM class_grade_goods cgg where cg.grade_id=cgg.grade_id) and up.grade_id = cgu.grade_id and up.user_id = u.user_id
+            ,(select COUNT(up.id) from user_period up LEFT JOIN user_period_status ups on up.id=ups.period_id where up.goods_id = og.goods_id and up.grade_id = cgu.grade_id and up.user_id = u.user_id
             and ups.period_status=0 and ups.`status`=0 and (SELECT COUNT(upss.id) from user_period_status upss where upss.id = ups.id and upss.period_status = 1 and upss.`status` = 2) > 0 ) as rebuild_num
         </if>
         FROM
         class_grade_user cgu
         LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_id
-        LEFT JOIN class_grade_goods cgg on cg.grade_id=cgg.grade_id
+        LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
         LEFT JOIN `user` u ON u.user_id = cgu.user_id
-        LEFT JOIN user_profile up on u.user_id =up.user_id and up.goods_id = cgg.goods_id and cgu.order_goods_id = up.order_goods_id and up.type_status=1 and up.current_status = 1
-        LEFT JOIN goods g on cgg.goods_id = g.goods_id
+        LEFT JOIN user_profile up on u.user_id =up.user_id and up.goods_id = og.goods_id and cgu.order_goods_id = up.order_goods_id and up.type_status=1 and up.current_status = 1
+        LEFT JOIN goods g on og.goods_id = g.goods_id
         LEFT JOIN course_business cb ON g.business_id = cb.id
         where 1=1
         and cgu.`status` =1
@@ -724,7 +724,7 @@
         u.user_id,
         cgu.`status`,
         u.realname,
-        cgg.goods_id,
+        og.goods_id,
         u.id_card,
         cgu.grade_id,
         u.telphone,
@@ -750,9 +750,9 @@
         FROM
         class_grade_user cgu
         LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_id
-        LEFT JOIN class_grade_goods cgg on cg.grade_id=cgg.grade_id
+        LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
         LEFT JOIN `user` u ON u.user_id = cgu.user_id
-        LEFT JOIN goods g on cgg.goods_id = g.goods_id
+        LEFT JOIN goods g on og.goods_id = g.goods_id
         LEFT JOIN course_business cb ON g.business_id = cb.id
         LEFT JOIN user_profile up on u.user_id =up.user_id and up.goods_id = g.goods_id and cgu.order_goods_id = up.order_goods_id and up.type_status=1 and up.current_status = 1
         where 1=1
@@ -914,8 +914,8 @@
         class_grade_user cgu
         LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_id
         LEFT JOIN `user` u ON u.user_id = cgu.user_id
-        LEFT JOIN class_grade_goods cgg ON cg.grade_id=cgg.grade_id
-        LEFT JOIN goods g ON g.goods_id = cgg.goods_id
+        LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
+        LEFT JOIN goods g ON g.goods_id = og.goods_id
         where 1=1
         <if test="userId != null and userId !='' ">
             and u.user_id = #{userId}
@@ -1461,13 +1461,13 @@
         cgu.order_goods_id,
         cg.class_start_time,
         cg.class_end_time,
-        cgg.goods_id,
+        og.goods_id,
         cg.grade_id
         FROM
         class_grade_user cgu
         LEFT JOIN class_grade cg on  cgu.grade_id = cg.grade_id
-        LEFT JOIN class_grade_goods cgg on cg.grade_id = cgg.grade_id
-        LEFT JOIN goods g on cgg.goods_id = g.goods_id
+        LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
+        LEFT JOIN goods g on og.goods_id = g.goods_id
         LEFT JOIN inform_remind_business irb on  irb.business_id = g.business_id
         where 1=1
         and irb.remind_id =5
@@ -1487,13 +1487,13 @@
         cgu.order_goods_id,
         cg.class_start_time,
         cg.class_end_time,
-        cgg.goods_id,
+        og.goods_id,
         cg.grade_id
         FROM
         class_grade_user cgu
         LEFT JOIN class_grade cg on  cgu.grade_id = cg.grade_id
-        LEFT JOIN class_grade_goods cgg on cg.grade_id = cgg.grade_id
-        LEFT JOIN goods g on cgg.goods_id = g.goods_id
+        LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
+        LEFT JOIN goods g on og.goods_id = g.goods_id
         LEFT JOIN inform_remind_business irb on  irb.business_id = g.business_id
         where 1=1
         and irb.remind_id =6
@@ -1509,13 +1509,13 @@
         cgu.order_goods_id,
         cg.class_start_time,
         cg.class_end_time,
-        cgg.goods_id,
+        og.goods_id,
         cg.grade_id
         FROM
         class_grade_user cgu
         LEFT JOIN class_grade cg on  cgu.grade_id = cg.grade_id
-        LEFT JOIN class_grade_goods cgg on cg.grade_id = cgg.grade_id
-        LEFT JOIN goods g on cgg.goods_id = g.goods_id
+        LEFT JOIN order_goods og ON cgu.order_goods_id = og.order_goods_id
+        LEFT JOIN goods g on og.goods_id = g.goods_id
         LEFT JOIN inform_remind_business irb on  irb.business_id = g.business_id
         where 1=1
         and irb.remind_id =7