fix 题库列表

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -108,7 +108,14 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
     @Override
     public List<GoodsVo> selectList(GoodsQueryBo bo) {
-        return baseMapper.selectAllList(bo);
+        List<GoodsVo> list = baseMapper.selectAllList(bo);
+        if(Validator.isNotEmpty(bo.getGoodsType())&&bo.getGoodsType()==2){
+            for(GoodsVo vo : list){
+                Long totalNum = getExamNum(vo.getGoodsId());
+                vo.setTotalExamNum(totalNum);
+            }
+        }
+        return list;
     }
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -270,4 +270,8 @@ public class GoodsVo {
 	@Excel(name = "前培次数")
 	@ApiModelProperty("前培次数")
 	private Long doNumber;
+	@ApiModelProperty("总的试卷数量")
+	private Long totalExamNum;
+	@ApiModelProperty("订单")
+	private Long orderNum;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -573,7 +573,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 return "审核状态错误";
             }
             //只要待审核时间早于班级结束时间就允许推送
-            if ( userVo.getPeriodWaitTime().longValue()> userVo.getClassEndTime().longValue()) {
+            if ( userVo.getPeriodWaitTime().longValue()>= userVo.getClassEndTime().longValue()) {
                 return "班级有效期已结束";
             }
         }

zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionMapper.xml

@@ -458,7 +458,6 @@
         WHERE
         1 = 1
         AND g.goods_type = 5
-        AND og.`status` = 1
         AND og.pay_status IN ( 2, 3, 4 )
         AND og.refund_status IN (0,3,1)
         <if test="goodsId != null and goodsId != ''">

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -110,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="gradeName" column="grade_name"/>
         <result property="examNumber" column="exam_number"/>
         <result property="doNumber" column="do_number"/>
+        <result property="orderNum" column="order_num"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo" id="ExamNumberGoodsVoResult">
@@ -146,6 +147,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         , (SELECT count(*) FROM goods_course where goods_id =g.goods_id ) as course_num
         , (SELECT count(*) FROM class_grade cg  LEFT JOIN class_grade_goods cgg on cg.grade_id = cgg.grade_id where  cgg.goods_id = g.goods_id and cg.`status` = 1 ) as grade_num
         </if>
+        <if test="goodsType ==2">
+        , (SELECT count(*) from order_goods og where og.goods_id = g.goods_id and  og.pay_status IN ( 2, 3, 4 )
+            AND og.refund_status IN (0,3,1) ) as order_num
+        </if>
         FROM
         goods g
         LEFT JOIN pay_supply ps ON g.supply_id = ps.supply_id