he2802 3 gadi atpakaļ
vecāks
revīzija
eb30dc43b5

+ 3 - 0
zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -161,7 +161,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     @Override
     public List<UserVo> selectList(UserQueryBo bo) {
+        System.out.println(bo);
+        System.out.println("cc");
         List<UserVo> list = entity2UserVo(userMapper.selectList(bo));
+        System.out.println(list);
         for (UserVo userVo : list) {
             userVo.setStudentCode(userVo.getUserAccount());
             ClassGradeUserQueryBo classGradeUserQueryBo = new ClassGradeUserQueryBo();

+ 7 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -273,10 +273,17 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
     @Override
     public List<GoodsUserVo> goodsList(CourseQueryBo bo) {
         List<GoodsUserVo> goodsUserVos = baseMapper.goodsList(bo);
+        System.out.println(bo);
+        System.out.println(goodsUserVos.size()+"代销啊");
+        System.out.println("AAC");
         //用户课程得详细信息
         for (GoodsUserVo goodsUserVo : goodsUserVos) {
+            System.out.println(goodsUserVo.getUserId()+"AAC"+goodsUserVo.getGoodsId());
             //获得当前所在班级
             ClassGradeVo classGradeVo = baseMapper.gradeIdSelect(goodsUserVo.getUserId(),goodsUserVo.getGoodsId());
+            if(Validator.isEmpty(classGradeVo)){
+                continue;
+            }
             goodsUserVo.setGradeId(classGradeVo.getGradeId());
             goodsUserVo.setLearningStatus(classGradeVo.getLearningStatus());
             goodsUserVo.setLearningTimeStart(classGradeVo.getLearningTimeStart());

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseUserChapterSectionVo.java

@@ -115,4 +115,8 @@ public class CourseUserChapterSectionVo {
 
 	@ApiModelProperty("1及格 0不及格")
 	private Integer reportStatus;
+	@ApiModelProperty("回答次数")
+	private Long answerNum;
+	@ApiModelProperty("做次数")
+	private Long doNum;
 }

+ 11 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseChapterSectionMapper.xml

@@ -51,6 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="liveUrl" column="live_url"/>
         <result property="performance" column="performance"/>
         <result property="reportStatus" column="report_status"/>
+        <result property="answerNum" column="answer_num"/>
+        <result property="doNum" column="do_num"/>
     </resultMap>
 
 
@@ -121,6 +123,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cme.chapter_id,
             cme.section_id,
             e.exam_name as name,
+            e.answer_num,
+               (SELECT
+                    count(*)
+                FROM
+                    user_bank_record ubr
+                WHERE
+                    ubr.user_id = #{userId}
+                  AND ubr.exam_id = e.exam_id
+                  AND grade_id = #{gradeId}) do_num,
             e.exam_id as type_id,
             #{gradeId} as grade_id,
             2 as type,