he2802 3 жил өмнө
parent
commit
e397eff8d3

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/UserPeriodExportVo.java

@@ -33,7 +33,7 @@ public class UserPeriodExportVo {
 	private Long durationTime;
 	@Excel(name = "学习/做题时间")
 	private String studyTimeStr;
-	@Excel(name = "学习/做题时")
+	@Excel(name = "学习/做题时")
 	private String studyTimeLong;
 
 	/** 1 节类型  2试卷类型 */

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

@@ -261,7 +261,7 @@
         m.type = 1
         GROUP BY c.goods_id ) ge on cgg.goods_id = ge.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 up.type_status=1 and up.current_status = 1 and up.change_status = 1
+        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
         LEFT JOIN goods g on cgg.goods_id = g.goods_id
         where 1=1
         and cgu.`status` =1