Browse Source

fix 学时审核资料状态

he2802 3 years ago
parent
commit
701501feaa

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodStudentVo.java

@@ -140,4 +140,6 @@ public class ClassPeriodStudentVo {
 	@ApiModelProperty("待重修节")
 	private Long waitRebuildNum;
 
+	@ApiModelProperty("审核状态  1通过 3不通过 2待审")
+	private Integer profileStatus;
 }

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

@@ -69,6 +69,7 @@
         <result property="studyStartTime" column="study_start_time"/>
         <result property="studyEndTime" column="study_end_time"/>
         <result property="rebuildNum" column="rebuild_num"/>
+        <result property="profileStatus" column="profile_status"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassPeriodUserVo" id="ClassPeriodUserVo">
@@ -208,10 +209,11 @@
         u.user_id,
         cgu.`status`,
         u.realname,
-        (SELECT cgg.goods_id FROM class_grade_goods cgg where cg.grade_id=cgg.grade_id) as goods_id,
+        cgg.goods_id,
         u.id_card,
         cgu.grade_id,
         u.telphone,
+        up.`status` as profile_status,
         (SELECT g.class_hours FROM goods g LEFT JOIN class_grade_goods cgg on cgg.goods_id = g.goods_id where
         cg.grade_id = cgg.grade_id) as class_hours,
         (SELECT g.study_start_time FROM goods g LEFT JOIN class_grade_goods cgg on cgg.goods_id = g.goods_id where
@@ -232,7 +234,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 `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 up.type_status=1 and up.current_status = 1
         where 1=1
         and cgu.`status` =1
         <if test="gradeId != null and gradeId !='' ">