merge

zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/ActivityRecommendController.java

@@ -1,12 +1,14 @@
 package com.zhongzheng.controller.cmmon;
 
 import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.modules.activity.bo.ActivityRecommendGoodsQueryBo;
 import com.zhongzheng.modules.activity.bo.ActivityRecommendQueryBo;
 import com.zhongzheng.modules.activity.service.IActivityRecommendService;
 import com.zhongzheng.modules.activity.vo.ActivityRecommendGoodsVo;
 import com.zhongzheng.modules.activity.vo.ActivityRecommendVo;
+import com.zhongzheng.modules.course.vo.CourseSubjectVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -51,6 +53,13 @@ public class ActivityRecommendController extends BaseController {
         return iActivityRecommendService.getGoodsList(bo);
     }
 
-
+    /**
+     * 查询推荐商品科目列表
+     */
+    @ApiOperation("查询推荐商品科目列表")
+    @GetMapping("/subjectList")
+    public AjaxResult<List<CourseSubjectVo>> getSubjectList(ActivityRecommendGoodsQueryBo bo) {
+        return AjaxResult.success(iActivityRecommendService.getSubjectList(bo));
+    }
 
 }

zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/CommonCourseController.java

@@ -4,6 +4,9 @@ import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.framework.web.service.WxTokenService;
+import com.zhongzheng.modules.activity.bo.ActivityRecommendGoodsQueryBo;
+import com.zhongzheng.modules.activity.service.IActivityRecommendGoodsService;
+import com.zhongzheng.modules.activity.vo.ActivityRecommendGoodsVo;
 import com.zhongzheng.modules.bank.bo.ExamQuestionQueryBo;
 import com.zhongzheng.modules.bank.bo.QuestionChapterExamQueryBo;
 import com.zhongzheng.modules.bank.bo.QuestionModuleChapterQueryBo;
@@ -14,14 +17,17 @@ import com.zhongzheng.modules.bank.vo.ExamQuestionVo;
 import com.zhongzheng.modules.bank.vo.ExamVo;
 import com.zhongzheng.modules.bank.vo.QuestionChapterVo;
 import com.zhongzheng.modules.course.bo.CourseMenuQueryBo;
+import com.zhongzheng.modules.course.bo.CourseSubjectQueryBo;
 import com.zhongzheng.modules.course.service.ICourseChapterSectionService;
 import com.zhongzheng.modules.course.service.ICourseMenuService;
 import com.zhongzheng.modules.course.service.ICourseModuleChapterService;
+import com.zhongzheng.modules.course.service.ICourseSubjectService;
 import com.zhongzheng.modules.course.vo.*;
 import com.zhongzheng.modules.goods.bo.GoodsAttachedQueryBo;
 import com.zhongzheng.modules.goods.bo.GoodsCourseTeacherQueryBo;
 import com.zhongzheng.modules.goods.service.IGoodsAttachedService;
 import com.zhongzheng.modules.goods.service.IGoodsCourseTeacherService;
+import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsAttachedVo;
 import com.zhongzheng.modules.goods.vo.GoodsCourseTeacherVo;
 import io.swagger.annotations.Api;
@@ -34,6 +40,8 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -56,6 +64,8 @@ public class CommonCourseController extends BaseController {
 
     private final IGoodsCourseTeacherService iGoodsCourseTeacherService;
 
+    private final ICourseSubjectService iCourseSubjectService;
+
 
 
     /**
@@ -100,4 +110,14 @@ public class CommonCourseController extends BaseController {
         return AjaxResult.success(list);
     }
 
+    /**
+     * 查询科目列表
+     */
+    @ApiOperation("查询科目列表")
+    @GetMapping("/subjectList")
+    public AjaxResult<List<CourseSubjectVo>> getSubjectList(CourseSubjectQueryBo bo) {
+        bo.setStatus(new ArrayList<Integer>(Arrays.asList(1)));
+        List<CourseSubjectVo> list = iCourseSubjectService.queryList(bo);
+        return AjaxResult.success(list);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityRecommendGoodsQueryBo.java

@@ -42,6 +42,8 @@ public class ActivityRecommendGoodsQueryBo extends BaseEntity {
 	/** 商品id */
 	@ApiModelProperty("商品id")
 	private Long goodsId;
+	@ApiModelProperty("科目ID")
+	private Long subjectId;
 	/** 排序 */
 	@ApiModelProperty("排序")
 	private Integer sort;

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityRecommendGoodsMapper.java

@@ -19,5 +19,5 @@ public interface ActivityRecommendGoodsMapper extends BaseMapper<ActivityRecomme
 
     Page<GoodsVo> getGoodsListByPage(Page<Object> objectPage,@Param("recommendId") Long recommendId);
 
-    Page<ActivityRecommendGoodsVo> getRecommendGoodsListByPage(Page<Object> objectPage,@Param("recommendId") Long recommendId);
+    Page<ActivityRecommendGoodsVo> getRecommendGoodsListByPage(Page<Object> objectPage,@Param("recommendId") Long recommendId,@Param("subjectId") Long subjectId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityRecommendGoodsService.java

@@ -7,6 +7,7 @@ import com.zhongzheng.modules.activity.bo.ActivityRecommendGoodsEditBo;
 import com.zhongzheng.modules.activity.bo.ActivityRecommendGoodsQueryBo;
 import com.zhongzheng.modules.activity.domain.ActivityRecommendGoods;
 import com.zhongzheng.modules.activity.vo.ActivityRecommendGoodsVo;
+import com.zhongzheng.modules.course.vo.CourseSubjectVo;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 
 import java.util.Collection;
@@ -56,5 +57,5 @@ public interface IActivityRecommendGoodsService extends IService<ActivityRecomme
 
     Page<GoodsVo> getGoodsListByPage(Page<Object> objectPage, Long recommendId);
 
-	Page<ActivityRecommendGoodsVo> getRecommendGoodsListByPage(Page<Object> objectPage, Long recommendId);
+	Page<ActivityRecommendGoodsVo> getRecommendGoodsListByPage(Page<Object> objectPage, Long recommendId,Long subjectId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityRecommendService.java

@@ -9,6 +9,7 @@ import com.zhongzheng.modules.activity.domain.ActivityRecommend;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.modules.activity.vo.ActivityRecommendGoodsVo;
 import com.zhongzheng.modules.activity.vo.ActivityRecommendVo;
+import com.zhongzheng.modules.course.vo.CourseSubjectVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -58,4 +59,6 @@ public interface IActivityRecommendService extends IService<ActivityRecommend> {
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
 	TableDataInfo<ActivityRecommendGoodsVo> getGoodsList(ActivityRecommendGoodsQueryBo bo);
+
+	List<CourseSubjectVo> getSubjectList(ActivityRecommendGoodsQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityRecommendGoodsServiceImpl.java

@@ -3,6 +3,9 @@ package com.zhongzheng.modules.activity.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.activity.bo.ActivityRecommendGoodsAddBo;
@@ -13,16 +16,20 @@ import com.zhongzheng.modules.activity.mapper.ActivityRecommendGoodsMapper;
 import com.zhongzheng.modules.activity.service.IActivityRecommendGoodsService;
 import com.zhongzheng.modules.activity.vo.ActivityRecommendGoodsVo;
 import com.zhongzheng.modules.course.domain.CourseChapterSection;
+import com.zhongzheng.modules.course.domain.CourseSubject;
+import com.zhongzheng.modules.course.service.ICourseSubjectService;
+import com.zhongzheng.modules.course.vo.CourseSubjectVo;
+import com.zhongzheng.modules.goods.domain.Goods;
+import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -110,7 +117,7 @@ public class ActivityRecommendGoodsServiceImpl extends ServiceImpl<ActivityRecom
     }
 
     @Override
-    public com.baomidou.mybatisplus.extension.plugins.pagination.Page<ActivityRecommendGoodsVo> getRecommendGoodsListByPage(com.baomidou.mybatisplus.extension.plugins.pagination.Page<Object> objectPage, Long recommendId) {
-        return baseMapper.getRecommendGoodsListByPage(objectPage,recommendId);
+    public com.baomidou.mybatisplus.extension.plugins.pagination.Page<ActivityRecommendGoodsVo> getRecommendGoodsListByPage(com.baomidou.mybatisplus.extension.plugins.pagination.Page<Object> objectPage, Long recommendId,Long subjectId) {
+        return baseMapper.getRecommendGoodsListByPage(objectPage,recommendId,subjectId);
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityRecommendServiceImpl.java

@@ -19,10 +19,15 @@ import com.zhongzheng.modules.activity.service.IActivityRecommendGoodsService;
 import com.zhongzheng.modules.activity.service.IActivityRecommendService;
 import com.zhongzheng.modules.activity.vo.ActivityRecommendGoodsVo;
 import com.zhongzheng.modules.activity.vo.ActivityRecommendVo;
+import com.zhongzheng.modules.course.domain.CourseSubject;
+import com.zhongzheng.modules.course.service.ICourseSubjectService;
+import com.zhongzheng.modules.course.vo.CourseSubjectVo;
 import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.domain.GoodsSpecAttributeRelation;
+import com.zhongzheng.modules.goods.domain.GoodsSpecTemplate;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.service.IGoodsSpecAttributeRelationService;
+import com.zhongzheng.modules.goods.service.IGoodsSpecTemplateService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +52,10 @@ public class ActivityRecommendServiceImpl extends ServiceImpl<ActivityRecommendM
     private IGoodsService iGoodsService;
     @Autowired
     private IGoodsSpecAttributeRelationService goodsSpecAttributeRelationService;
+    @Autowired
+    private ICourseSubjectService iCourseSubjectService;
+    @Autowired
+    private IGoodsSpecTemplateService goodsSpecTemplateService;
 
 
     @Override
@@ -195,13 +204,16 @@ public class ActivityRecommendServiceImpl extends ServiceImpl<ActivityRecommendM
     public TableDataInfo<ActivityRecommendGoodsVo> getGoodsList(ActivityRecommendGoodsQueryBo bo) {
         TableDataInfo<ActivityRecommendGoodsVo> result = new TableDataInfo<>();
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<ActivityRecommendGoodsVo> page =
-                iActivityRecommendGoodsService.getRecommendGoodsListByPage(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(bo.getPageNum(), bo.getPageSize()),bo.getRecommendId());
+                iActivityRecommendGoodsService.getRecommendGoodsListByPage(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(bo.getPageNum(), bo.getPageSize()),bo.getRecommendId(),bo.getSubjectId());
         if (CollectionUtils.isEmpty(page.getRecords())){
             return result;
         }
         page.getRecords().forEach(item -> {
             Goods goods = iGoodsService.getById(item.getGoodsId());
-            if (ObjectUtils.isNotNull(goods.getSpecTemplateId())){
+            if (ObjectUtils.isNotNull(goods.getSpecTemplateId()) &&
+                    goodsSpecTemplateService.count(new LambdaQueryWrapper<GoodsSpecTemplate>()
+                    .eq(GoodsSpecTemplate::getSpecTemplateId,goods.getSpecTemplateId())
+                    .eq(GoodsSpecTemplate::getStatus,1)) > 0){
                 item.setSpecTemplateId(goods.getSpecTemplateId());
             }else {
                 List<GoodsSpecAttributeRelation> list = goodsSpecAttributeRelationService.list(new LambdaQueryWrapper<GoodsSpecAttributeRelation>()
@@ -219,4 +231,24 @@ public class ActivityRecommendServiceImpl extends ServiceImpl<ActivityRecommendM
         result.setCode(200);
         return result;
     }
+
+    @Override
+    public List<CourseSubjectVo> getSubjectList(ActivityRecommendGoodsQueryBo bo) {
+        List<ActivityRecommendGoods> recommendGoods = iActivityRecommendGoodsService.list(new LambdaQueryWrapper<ActivityRecommendGoods>()
+                .eq(ActivityRecommendGoods::getRecommendId, bo.getRecommendId())
+                .orderByAsc(ActivityRecommendGoods::getSort));
+        if (CollectionUtils.isEmpty(recommendGoods)){
+            return new ArrayList<>();
+        }
+        List<Goods> goodsList = iGoodsService.listByIds(recommendGoods.stream().map(ActivityRecommendGoods::getGoodsId).collect(Collectors.toList()));
+        Set<Long> subjectIds = new HashSet<>();
+        goodsList.stream().filter(x -> com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(x.getSubjectIds())).forEach(item -> {
+            Arrays.stream(item.getSubjectIds().split(",")).forEach(id -> {
+                subjectIds.add(Long.valueOf(id));
+            });
+        });
+        //获取科目信息
+        List<CourseSubject> subjects = iCourseSubjectService.listByIds(subjectIds);
+        return subjects.stream().map(item -> BeanUtil.toBean(item,CourseSubjectVo.class)).collect(Collectors.toList());
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionChapterExamQueryBo.java

@@ -55,4 +55,6 @@ public class QuestionChapterExamQueryBo extends BaseEntity {
 	@ApiModelProperty("模块卷ID")
 	private Long moduleExamId;
 	private Long orderGoodsId;
+	@ApiModelProperty("试卷类型ID")
+	private Long paperId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionModuleChapterQueryBo.java

@@ -51,4 +51,7 @@ public class QuestionModuleChapterQueryBo extends BaseEntity {
 
 	@ApiModelProperty("商品ID")
 	private Long goodsId;
+
+	@ApiModelProperty("试卷类型ID")
+	private Long paperId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/vo/QuestionVo.java

@@ -111,4 +111,13 @@ public class QuestionVo {
 	@Excel(name = "导入顺序")
 	@ApiModelProperty("导入顺序")
 	private Integer importSort;
+
+	@ApiModelProperty("试卷ID")
+	private Long examId;
+	@ApiModelProperty("商品ID")
+	private Long goodsId;
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
+	@ApiModelProperty("收藏题目ID")
+	private Long collectQuestionId;
 }

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

@@ -1,8 +1,10 @@
 package com.zhongzheng.modules.goods.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.activity.bo.ActivityRecommendGoodsQueryBo;
 import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.course.vo.CourseModuleFreeExamVo;
+import com.zhongzheng.modules.course.vo.CourseSubjectVo;
 import com.zhongzheng.modules.exam.bo.ExamNumberGoodsQueryBo;
 import com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo;
 import com.zhongzheng.modules.goods.bo.*;
@@ -90,4 +92,5 @@ public interface IGoodsService extends IService<Goods> {
 	boolean updateSpecTemplate(GoodsSpecTempEditBo bo);
 
 	List<SyncGoodsExport> selectRjJzsList(GoodsQueryBo bo);
+
 }

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

@@ -12,6 +12,7 @@ import com.zhongzheng.common.annotation.DataScope;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.modules.activity.bo.ActivityRecommendGoodsQueryBo;
 import com.zhongzheng.modules.course.bo.CourseMenuAddBo;
 import com.zhongzheng.modules.course.bo.CourseMenuListAddBo;
 import com.zhongzheng.modules.course.bo.CourseMenuQueryBo;
@@ -143,6 +144,23 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
                 vo.setTotalExamNum(totalNum);
             }
         }
+        list.forEach(goods -> {
+            if (ObjectUtils.isNotNull(goods.getSpecTemplateId()) &&
+                    goodsSpecTemplateService.count(new LambdaQueryWrapper<GoodsSpecTemplate>()
+                            .eq(GoodsSpecTemplate::getSpecTemplateId,goods.getSpecTemplateId())
+                            .eq(GoodsSpecTemplate::getStatus,1)) > 0){
+                goods.setSpecTemplateId(goods.getSpecTemplateId());
+            }else {
+                List<GoodsSpecAttributeRelation> relationList = goodsSpecAttributeRelationService.list(new LambdaQueryWrapper<GoodsSpecAttributeRelation>()
+                        .eq(GoodsSpecAttributeRelation::getGoodsId, goods.getGoodsId())
+                        .orderByAsc(GoodsSpecAttributeRelation::getCreateTime)
+                        .last("LIMIT 1"));
+                if (CollectionUtils.isNotEmpty(relationList)){
+                    GoodsSpecAttributeRelation relation = relationList.stream().findFirst().get();
+                    goods.setSpecTemplateId(relation.getSpecTemplateId());
+                }
+            }
+        });
         //继教二建统计学时
         if (Validator.isNotEmpty(bo.getChapterNum())) {
             list.forEach(goodsVo -> {
@@ -193,7 +211,10 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     @Override
     public GoodsVo selectDetail(Long goodsId) {
         GoodsVo goodsVo = baseMapper.selectDetail(goodsId);
-        if (ObjectUtils.isNotNull(goodsVo) && ObjectUtils.isNull(goodsVo.getSpecTemplateId())){
+        if (ObjectUtils.isNull(goodsVo.getSpecTemplateId()) ||
+                goodsSpecTemplateService.count(new LambdaQueryWrapper<GoodsSpecTemplate>()
+                        .eq(GoodsSpecTemplate::getSpecTemplateId,goodsVo.getSpecTemplateId())
+                        .eq(GoodsSpecTemplate::getStatus,1)) < 1){
             //没有绑定规格模板
             //查询是否有绑定的模板
             List<GoodsSpecAttributeRelation> list = goodsSpecAttributeRelationService

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/service/impl/MockApplyServiceImpl.java

@@ -629,6 +629,7 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
         mockTimeVo.setEndTime(endTimeStr);
         mockTimeVo.setApplyId(bo.getApplyId());
         mockTimeVo.setExamTime(nowTime);
+        mockTimeVo.setMockActivity(apply.getMockActivity());
         return mockTimeVo;
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/vo/MockTimeVo.java

@@ -26,4 +26,7 @@ public class MockTimeVo {
 
     @ApiModelProperty("结束时间")
     private String endTime;
+
+    @ApiModelProperty("是否活动模考 0否 1是")
+    private Integer mockActivity;
 }

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityRecommendGoodsMapper.xml

@@ -44,6 +44,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             rg.recommend_id = #{recommendId}
           and g.goods_status = 1 and g.`status` = 1
+        <if test="subjectId != null and subjectId != ''">
+            AND g.subject_ids like CONCAT('%',#{subjectId},'%')
+        </if>
         order by rg.sort asc
     </select>
 </mapper>

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

@@ -67,6 +67,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         WHERE
             qce.chapter_exam_id =#{chapterExamId}
+        <if test="paperId != null and paperId != ''">
+            AND e.exam_paper_id = #{paperId}
+        </if>
           AND e.status = 1
 
     </select>

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

@@ -24,18 +24,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="questionNum" column="question_num"/>
     </resultMap>
 
+<!--    <select id="getList" parameterType="com.zhongzheng.modules.bank.bo.QuestionModuleChapterQueryBo" resultMap="QuestionModuleChapterResultVo">-->
+<!--        SELECT-->
+<!--            qc.*,-->
+<!--            mc.sort AS chapter_sort,-->
+<!--            (SELECT COUNT(qce.exam_id) FROM question_chapter_exam qce where qce.chapter_exam_id = qc.chapter_exam_id ) as exam_num,-->
+<!--            (SELECT COUNT(eq.question_id) FROM question_chapter_exam qce LEFT JOIN exam_question eq on qce.exam_id = eq.exam_id where qce.chapter_exam_id = qc.chapter_exam_id) as question_num-->
+<!--        FROM-->
+<!--            question_module_chapter mc-->
+<!--                LEFT JOIN question_chapter qc ON mc.chapter_exam_id = qc.chapter_exam_id-->
+<!--        WHERE-->
+<!--            mc.module_exam_id = #{moduleExamId}-->
+<!--        ORDER BY mc.sort-->
+
+<!--    </select>-->
     <select id="getList" parameterType="com.zhongzheng.modules.bank.bo.QuestionModuleChapterQueryBo" resultMap="QuestionModuleChapterResultVo">
         SELECT
             qc.*,
             mc.sort AS chapter_sort,
-            (SELECT COUNT(qce.exam_id) FROM question_chapter_exam qce where qce.chapter_exam_id = qc.chapter_exam_id ) as exam_num,
-            (SELECT COUNT(eq.question_id) FROM question_chapter_exam qce LEFT JOIN exam_question eq on qce.exam_id = eq.exam_id where qce.chapter_exam_id = qc.chapter_exam_id) as question_num
+            ( SELECT COUNT( qce.exam_id ) FROM question_chapter_exam qce WHERE qce.chapter_exam_id = qc.chapter_exam_id ) AS exam_num,
+            (
+                SELECT
+                    COUNT( eq.question_id )
+                FROM
+                    question_chapter_exam qce
+                        LEFT JOIN exam_question eq ON qce.exam_id = eq.exam_id
+                WHERE
+                    qce.chapter_exam_id = qc.chapter_exam_id
+            ) AS question_num
         FROM
             question_module_chapter mc
                 LEFT JOIN question_chapter qc ON mc.chapter_exam_id = qc.chapter_exam_id
-        WHERE
-            mc.module_exam_id = #{moduleExamId}
-        ORDER BY mc.sort
+        WHERE 1=1
+        <if test="paperId != null and paperId != ''">
+            AND qc.chapter_exam_id IN ( SELECT qce.chapter_exam_id FROM question_chapter_exam qce LEFT JOIN exam e ON qce.exam_id = e.exam_id WHERE e.exam_paper_id = #{paperId} )
+        </if>
+          AND mc.module_exam_id = #{moduleExamId}
+        ORDER BY
+            mc.sort
 
     </select>
 

zhongzheng-system/src/main/resources/mapper/modules/collect/CollectQuestionMapper.xml

@@ -41,11 +41,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="knowledgeIds" column="knowledge_ids"/>
         <result property="publishStatus" column="publish_status"/>
         <result property="code" column="code"/>
+        <result property="examId" column="collect_exam_id"/>
+        <result property="goodsId" column="collect_goods_id"/>
+        <result property="orderGoodsId" column="collect_order_goods_id"/>
+        <result property="collectQuestionId" column="collect_question_id"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.collect.bo.CollectQuestionQueryBo"  resultMap="QuestionResultVo">
         SELECT
-        DISTINCT q.*
+        DISTINCT q.*,
+        cq.question_id as collect_question_id,
+        cq.exam_id as collect_exam_id,
+        cq.goods_id as collect_goods_id,
+        cq.order_goods_id as collect_order_goods_id
         FROM
         collect_question cq
         LEFT JOIN question q ON cq.question_id = q.question_id
@@ -95,7 +103,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectExamQuestionList" parameterType="com.zhongzheng.modules.collect.bo.CollectQuestionQueryBo"  resultMap="QuestionResultVo">
         SELECT
-            DISTINCT q.*
+            DISTINCT q.*,
+            cq.exam_id as collect_exam_id ,
+            cq.goods_id as collect_goods_id,
+            cq.order_goods_id as collect_order_goods_id,
+            cq.collect_question_id as collect_question_id
         FROM
         collect_question cq
         LEFT JOIN question q ON q.question_id = cq.question_id