fix 学时审核

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodUserVo.java

@@ -123,4 +123,10 @@ public class ClassPeriodUserVo {
 	private Long studyStartTime;
 	@ApiModelProperty("节时长(秒)")
 	private Long studyEndTime;
+
+	@ApiModelProperty("商品名称")
+	private String goodsName;
+
+	@ApiModelProperty("班级名称")
+	private String className;
 }

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

@@ -141,6 +141,8 @@
         <result property="periodStatus" column="period_status"/>
         <result property="studyStartTime" column="study_start_time"/>
         <result property="studyEndTime" column="study_end_time"/>
+        <result property="goodsName" column="goods_name"/>
+        <result property="className" column="class_name"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassPeriodVo" id="ClassPeriodVo">
@@ -578,7 +580,9 @@
         u.id_card,
         u.user_id,
         u.telphone,
-        (SELECT cgg.goods_id FROM class_grade_goods cgg where cg.grade_id=cgg.grade_id) as goods_id,
+        g.goods_id,
+        g.goods_name,
+        cg.class_name,
         u.one_inch_photos,
         u.id_card_img1,
         u.id_card_img2,
@@ -610,6 +614,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
         where 1=1
         <if test="userId != null and userId !='' ">
             and u.user_id = #{userId}