merge

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.controller.bank;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
@@ -23,9 +24,11 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 题库题目Controller
@@ -111,17 +114,21 @@ public class QuestionController extends BaseController {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         List<GoodsUserQuestionVo> list = iQuestionService.listUserFreeUnionBuyGoodsList(bo);
-        for (GoodsUserQuestionVo g : list) {
-            UserExamRecordQueryBo userExamRecordQueryBo = new UserExamRecordQueryBo();
-            userExamRecordQueryBo.setOrderGoodsId(g.getOrderGoodsId());
-            userExamRecordQueryBo.setUserId(loginUser.getUser().getUserId());
-            Long doNum = iUserExamRecordService.selectDoNum(userExamRecordQueryBo);
-            Long totalNum = iGoodsService.getQuestionNum(g.getGoodsId());
-            g.setDoNum(doNum);
-            g.setTotalNum(totalNum);
-            //试卷类型
-            List<ExamPaperVo> paperVos = iExamPaperService.getGoodsExamPaper(g.getGoodsId());
-            g.setPaperVos(paperVos);
+        if (!CollectionUtils.isEmpty(list)){
+            for (GoodsUserQuestionVo g : list) {
+                UserExamRecordQueryBo userExamRecordQueryBo = new UserExamRecordQueryBo();
+                userExamRecordQueryBo.setOrderGoodsId(g.getOrderGoodsId());
+                userExamRecordQueryBo.setUserId(loginUser.getUser().getUserId());
+                Long doNum = iUserExamRecordService.selectDoNum(userExamRecordQueryBo);
+                Long totalNum = iGoodsService.getQuestionNum(g.getGoodsId());
+                g.setDoNum(doNum);
+                g.setTotalNum(totalNum);
+                //试卷类型
+                List<ExamPaperVo> paperVos = iExamPaperService.getGoodsExamPaperByGoodsId(g.getGoodsId());
+                paperVos = paperVos.stream().filter(x -> ObjectUtils.isNotNull(x.getPaperId())).collect(Collectors.collectingAndThen(Collectors
+                             .toCollection(() -> new TreeSet<>(Comparator.comparing(item -> item.getPaperId()))), ArrayList::new));
+                g.setPaperVos(paperVos);
+            }
         }
         return getDataTable(list);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamPaperMapper.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.exam.mapper;
 import com.zhongzheng.modules.exam.domain.ExamPaper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.exam.vo.ExamPaperVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +15,8 @@ import java.util.List;
  */
 public interface ExamPaperMapper extends BaseMapper<ExamPaper> {
     List<ExamPaperVo> getGoodsExamPaper(Long goodsId);
+
+    List<ExamPaperVo> getGoodsExamPaperByGoodsIds(@Param("goodsIds") List<Long> goodsIds);
+
+    List<ExamPaperVo> getGoodsExamPaperByGoodsId(@Param("goodsId") Long goodsId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/IExamPaperService.java

@@ -51,4 +51,8 @@ public interface IExamPaperService extends IService<ExamPaper> {
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
 	List<ExamPaperVo> getGoodsExamPaper(Long goodsId);
+
+	List<ExamPaperVo> getGoodsExamPaperByGoodsIds(List<Long> goodsId);
+
+	List<ExamPaperVo> getGoodsExamPaperByGoodsId(Long goodsId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamPaperServiceImpl.java

@@ -128,4 +128,14 @@ public class ExamPaperServiceImpl extends ServiceImpl<ExamPaperMapper, ExamPaper
     public List<ExamPaperVo> getGoodsExamPaper(Long goodsId) {
         return this.baseMapper.getGoodsExamPaper(goodsId);
     }
+
+    @Override
+    public List<ExamPaperVo> getGoodsExamPaperByGoodsIds(List<Long> goodsId) {
+        return this.baseMapper.getGoodsExamPaperByGoodsIds(goodsId);
+    }
+
+    @Override
+    public List<ExamPaperVo> getGoodsExamPaperByGoodsId(Long goodsId) {
+        return this.baseMapper.getGoodsExamPaperByGoodsId(goodsId);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamPaperVo.java

@@ -40,4 +40,7 @@ public class ExamPaperVo {
 	@Excel(name = "编码SJ")
 	@ApiModelProperty("编码SJ")
 	private String encoder;
+
+	@ApiModelProperty("商品ID")
+	private Long goodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -886,7 +886,8 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                         paramMap.put("first","今天每日一练还没有打卡，为了你的学习效果，请尽快去学习吧");
                         paramMap.put("keyword1",goods.getGoodsName());
                         paramMap.put("keyword2","未打卡");
-                        paramMap.put("pagepath","/pages2/dailyPractice/index?goodsId="+subscription.getGoodsId()+"&orderGoodsId="+subscription.getOrderGoodsId());
+//                        paramMap.put("pagepath","/pages2/dailyPractice/index?goodsId="+subscription.getGoodsId()+"&orderGoodsId="+subscription.getOrderGoodsId());
+                        paramMap.put("pagepath","");
                         iWxLoginService.sendSmallTpMsg(userVo.getOpenId(),paramMap);
                     }
                 }

zhongzheng-system/src/main/resources/mapper/modules/exam/ExamPaperMapper.xml

@@ -61,4 +61,135 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND e.exam_paper_id IS NOT NULL AND ep.`status` != -1
     </select>
 
+    <select id="getGoodsExamPaperByGoodsIds" parameterType="java.lang.Long" resultType="com.zhongzheng.modules.exam.vo.ExamPaperVo">
+        SELECT
+        ep.paper_id,
+        ga.goods_id,
+        ep.paper_name
+        FROM goods_attached ga
+        LEFT JOIN question_module_chapter qmc ON ga.major_id = qmc.module_exam_id
+        LEFT JOIN question_chapter_exam qce ON qmc.chapter_exam_id = qce.chapter_exam_id
+        LEFT JOIN exam e ON qce.exam_id = e.exam_id
+        LEFT JOIN exam_paper ep ON e.exam_paper_id = ep.paper_id
+        WHERE ga.type = 1
+        <if test="goodsIds != null and goodsIds.size()!=0 ">
+            AND ga.goods_id in
+            <foreach collection="goodsIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        UNION ALL
+        SELECT
+        ep.paper_id,
+        ga.goods_id,
+        ep.paper_name
+        FROM goods_attached ga
+        LEFT JOIN question_chapter_exam qce ON ga.major_id = qce.chapter_exam_id
+        LEFT JOIN exam e ON qce.exam_id = e.exam_id
+        LEFT JOIN exam_paper ep ON e.exam_paper_id = ep.paper_id
+        WHERE ga.type = 2
+        <if test="goodsIds != null and goodsIds.size()!=0 ">
+            AND ga.goods_id in
+            <foreach collection="goodsIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        UNION ALL
+        SELECT
+        ep.paper_id,
+        ga.goods_id,
+        ep.paper_name
+        FROM goods_attached ga
+        LEFT JOIN exam e ON ga.major_id = e.exam_id
+        LEFT JOIN exam_paper ep ON e.exam_paper_id = ep.paper_id
+        WHERE ga.type = 3
+        <if test="goodsIds != null and goodsIds.size()!=0 ">
+            AND ga.goods_id in
+            <foreach collection="goodsIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
+    <select id="getGoodsExamPaperByGoodsIds" parameterType="java.lang.Long" resultType="com.zhongzheng.modules.exam.vo.ExamPaperVo">
+        SELECT
+            ep.paper_id,
+            ga.goods_id,
+            ep.paper_name
+        FROM goods_attached ga
+                 LEFT JOIN question_module_chapter qmc ON ga.major_id = qmc.module_exam_id
+                 LEFT JOIN question_chapter_exam qce ON qmc.chapter_exam_id = qce.chapter_exam_id
+                 LEFT JOIN exam e ON qce.exam_id = e.exam_id
+                 LEFT JOIN exam_paper ep ON e.exam_paper_id = ep.paper_id
+        WHERE ga.type = 1
+        <if test="goodsIds != null and goodsIds.size()!=0 ">
+            AND ga.goods_id in
+            <foreach collection="goodsIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        UNION ALL
+        SELECT
+            ep.paper_id,
+            ga.goods_id,
+            ep.paper_name
+        FROM goods_attached ga
+                 LEFT JOIN question_chapter_exam qce ON ga.major_id = qce.chapter_exam_id
+                 LEFT JOIN exam e ON qce.exam_id = e.exam_id
+                 LEFT JOIN exam_paper ep ON e.exam_paper_id = ep.paper_id
+        WHERE ga.type = 2
+        <if test="goodsIds != null and goodsIds.size()!=0 ">
+            AND ga.goods_id in
+            <foreach collection="goodsIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        UNION ALL
+        SELECT
+            ep.paper_id,
+            ga.goods_id,
+            ep.paper_name
+        FROM goods_attached ga
+                 LEFT JOIN exam e ON ga.major_id = e.exam_id
+                 LEFT JOIN exam_paper ep ON e.exam_paper_id = ep.paper_id
+        WHERE ga.type = 3
+        <if test="goodsIds != null and goodsIds.size()!=0 ">
+            AND ga.goods_id in
+            <foreach collection="goodsIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
+    <select id="getGoodsExamPaperByGoodsId" parameterType="java.lang.Long" resultType="com.zhongzheng.modules.exam.vo.ExamPaperVo">
+        SELECT
+        ep.paper_id,
+        ga.goods_id,
+        ep.paper_name
+        FROM goods_attached ga
+        LEFT JOIN question_module_chapter qmc ON ga.major_id = qmc.module_exam_id
+        LEFT JOIN question_chapter_exam qce ON qmc.chapter_exam_id = qce.chapter_exam_id
+        LEFT JOIN exam e ON qce.exam_id = e.exam_id
+        LEFT JOIN exam_paper ep ON e.exam_paper_id = ep.paper_id
+        WHERE ga.type = 1 AND ga.goods_id = #{goodsId}
+        UNION ALL
+        SELECT
+        ep.paper_id,
+        ga.goods_id,
+        ep.paper_name
+        FROM goods_attached ga
+        LEFT JOIN question_chapter_exam qce ON ga.major_id = qce.chapter_exam_id
+        LEFT JOIN exam e ON qce.exam_id = e.exam_id
+        LEFT JOIN exam_paper ep ON e.exam_paper_id = ep.paper_id
+        WHERE ga.type = 2  AND ga.goods_id = #{goodsId}
+        UNION ALL
+        SELECT
+        ep.paper_id,
+        ga.goods_id,
+        ep.paper_name
+        FROM goods_attached ga
+        LEFT JOIN exam e ON ga.major_id = e.exam_id
+        LEFT JOIN exam_paper ep ON e.exam_paper_id = ep.paper_id
+        WHERE ga.type = 3  AND ga.goods_id = #{goodsId}
+    </select>
 </mapper>