fix 考试导出模板

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

@@ -161,9 +161,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     @Override
     public List<UserVo> selectList(UserQueryBo bo) {
-
+        bo.setGetOrderNum(1L);
         List<UserVo> list = entity2UserVo(userMapper.selectList(bo));
-        System.out.println(list);
         for (UserVo userVo : list) {
             userVo.setStudentCode(userVo.getUserAccount());
             ClassGradeUserQueryBo classGradeUserQueryBo = new ClassGradeUserQueryBo();
@@ -173,10 +172,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             classGradeUserQueryBo.setStatus(status);
             List<ClassGradeUserGoodsVo> classGradeUserGoodsVos = iClassGradeUserService.listUser(classGradeUserQueryBo);
             userVo.setClassGradeUserGoodsVoList(classGradeUserGoodsVos);
-            CourseQueryBo courseQueryBo = new CourseQueryBo();
-            courseQueryBo.setUserId(userVo.getUserId());
-            List<GoodsUserVo> goodsList = iCourseService.goodsList(courseQueryBo);
-            userVo.setOrderNum(Convert.toLong(goodsList.size()));
         }
         return list;
     }

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -462,12 +462,12 @@
         (case WHEN(SELECT COUNT(1) from profile_tp where `status`=1 and FIND_IN_SET(g.goods_id,goods_ids) ) >0 then 1 ELSE 0 end) as profile_tp_status
         <if test="userId != null and userId != ''">
         ,
-        (SELECT exam_status from user_subscribe where user_id = 18 and goods_id = g.goods_id and subscribe_status = 1 ORDER BY subscribe_id desc limit 1)as sub_exam_status,
-        (SELECT performance from user_subscribe where user_id = 18 and goods_id = g.goods_id and subscribe_status = 1 ORDER BY subscribe_id desc limit 1)as sub_performance,
-        (SELECT `result` from user_subscribe where user_id = 18 and goods_id = g.goods_id and subscribe_status = 1 ORDER BY subscribe_id desc limit 1)as sub_result,
-        (SELECT apply_site_start_time from user_subscribe where user_id = 18 and goods_id = g.goods_id and subscribe_status = 1 ORDER BY subscribe_id desc limit 1)as sub_apply_site_start_time,
-        (SELECT apply_site_end_time from user_subscribe where user_id = 18 and goods_id = g.goods_id and subscribe_status = 1 ORDER BY subscribe_id desc limit 1)as sub_apply_site_end_time,
-        (SELECT apply_site_exam_time from user_subscribe where user_id = 18 and goods_id = g.goods_id and subscribe_status = 1 ORDER BY subscribe_id desc limit 1)as sub_apply_site_exam_time
+        (SELECT exam_status from user_subscribe where user_id = #{userId} and goods_id = g.goods_id and subscribe_status = 1 ORDER BY subscribe_id desc limit 1)as sub_exam_status,
+        (SELECT performance from user_subscribe where user_id = #{userId}and goods_id = g.goods_id and subscribe_status = 1 ORDER BY subscribe_id desc limit 1)as sub_performance,
+        (SELECT `result` from user_subscribe where user_id = #{userId} and goods_id = g.goods_id and subscribe_status = 1 ORDER BY subscribe_id desc limit 1)as sub_result,
+        (SELECT apply_site_start_time from user_subscribe where user_id = #{userId} and goods_id = g.goods_id and subscribe_status = 1 ORDER BY subscribe_id desc limit 1)as sub_apply_site_start_time,
+        (SELECT apply_site_end_time from user_subscribe where user_id = #{userId} and goods_id = g.goods_id and subscribe_status = 1 ORDER BY subscribe_id desc limit 1)as sub_apply_site_end_time,
+        (SELECT apply_site_exam_time from user_subscribe where user_id = #{userId} and goods_id = g.goods_id and subscribe_status = 1 ORDER BY subscribe_id desc limit 1)as sub_apply_site_exam_time
         </if>
         FROM
         `order` o

zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -154,6 +154,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN order_goods og ON o.order_sn = og.order_sn
             LEFT JOIN goods g ON og.goods_id = g.goods_id
             WHERE o.`status` = 1
+            AND og.refund_status in (0,1,3)
+            AND og.pay_status in (2,3)
             GROUP BY
             o.user_id
             ) ou ON u.user_id = ou.user_id