he2802 %!s(int64=3) %!d(string=hai) anos
pai
achega
0f32ae4831

+ 18 - 0
zhongzheng-api/src/main/java/com/zhongzheng/controller/bank/QuestionController.java

@@ -22,10 +22,14 @@ import com.zhongzheng.modules.bank.vo.QuestionImport;
 import com.zhongzheng.modules.bank.vo.QuestionVo;
 import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
+import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsUserQuestionVo;
 import com.zhongzheng.modules.goods.vo.GoodsUserVo;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
+import com.zhongzheng.modules.order.vo.OrderGoodsVo;
+import com.zhongzheng.modules.user.bo.UserExamRecordQueryBo;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
+import com.zhongzheng.modules.user.service.IUserExamRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -54,6 +58,10 @@ public class QuestionController extends BaseController {
 
     private final WxTokenService wxTokenService;
 
+    private final IGoodsService iGoodsService;
+
+    private final IUserExamRecordService iUserExamRecordService;
+
 
     /**
      * 查询商品列表
@@ -65,6 +73,16 @@ public class QuestionController extends BaseController {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         List<GoodsUserQuestionVo> list = iQuestionService.listGoodsUserQuestionVo(bo);
+        for (GoodsUserQuestionVo g : list) {
+            UserExamRecordQueryBo userExamRecordQueryBo = new UserExamRecordQueryBo();
+            userExamRecordQueryBo.setGoodsId(g.getGoodsId());
+            userExamRecordQueryBo.setUserId(loginUser.getUser().getUserId());
+            Long doNum = iUserExamRecordService.selectDoNum(userExamRecordQueryBo);
+            Long totalNum = iGoodsService.getQuestionNum(g.getGoodsId());
+            g.setDoNum(doNum);
+            g.setTotalNum(totalNum);
+
+        }
         return getDataTable(list);
     }
 }

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsUserQuestionVo.java

@@ -226,4 +226,8 @@ public class GoodsUserQuestionVo {
 	@Excel(name = "前培和补考商品关联")
 	@ApiModelProperty("前培和补考商品关联编码")
 	private String makeGoodsCode;
+
+	private Long doNum;
+
+	private Long totalNum;
 }