he2802 1 năm trước cách đây
mục cha
commit
2e4f4f9f29

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeStudentVo.java

@@ -255,4 +255,7 @@ public class ClassGradeStudentVo {
 	@ApiModelProperty("学习结束")
 	private Long endTime;
 
+	@ApiModelProperty("审核状态  1通过 3不通过 2待审")
+	private Integer profileStatus;
+
 }

+ 4 - 1
zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -185,6 +185,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="companyName" column="company_name"/>
         <result property="gradeName" column="class_name"/>
         <result property="endTime" column="end_time"/>
+        <result property="profileStatus" column="profile_status"/>
     </resultMap>
 
 
@@ -616,7 +617,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ueg.exam_number,
         ueg.do_number,
         ueg.expend_number,
-        ueg.expend_before
+        ueg.expend_before,
+        up.`status` as profile_status
         FROM
         class_grade_user cgu
         LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_id
@@ -627,6 +629,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN course_business cb ON g.business_id = cb.id
         LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
         LEFT JOIN user_exam_goods ueg ON ueg.order_goods_id = og.order_goods_id
+        LEFT JOIN user_profile up on cgu.order_goods_id = up.order_goods_id and up.type_status=1 and up.current_status = 1
         where 1=1 and cgu.`status` = 1
         <if test="sevenCode != null and sevenCode !='' ">
             AND cg.seven_code = #{sevenCode}