fix 导入

zhongzheng-admin/src/main/java/com/zhongzheng/controller/goods/GoodsCourseController.java

@@ -8,6 +8,7 @@ import com.zhongzheng.modules.goods.bo.GoodsCourseAddBo;
 import com.zhongzheng.modules.goods.bo.GoodsCourseEditBo;
 import com.zhongzheng.modules.goods.bo.GoodsCourseQueryBo;
 import com.zhongzheng.modules.goods.service.IGoodsCourseService;
+import com.zhongzheng.modules.goods.vo.GoodsCourseMoreVo;
 import com.zhongzheng.modules.goods.vo.GoodsCourseVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -55,6 +56,18 @@ public class GoodsCourseController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询商品课程关系列表
+     */
+    @ApiOperation("批量查询商品课程关系列表")
+    @PreAuthorize("@ss.hasPermi('system:course:list')")
+    @GetMapping("/listMore/{ids}")
+    public TableDataInfo<GoodsCourseMoreVo> listMore(@PathVariable Long[] ids) {
+        startPage();
+        List<GoodsCourseMoreVo> list = iGoodsCourseService.selectListMore(Arrays.asList(ids));
+        return getDataTable(list);
+    }
+
     /**
      * 导出商品课程关系列表
      */

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -1195,7 +1195,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                             } else {
                                 answerQuestion = null;
                                 type = 5; //简答题
-                                strContent = strContent +  "<br />" + content; //答案文本
+                                analysisContent = analysisContent +  "<br />" + content; //答案文本
                             }
                         }
 
@@ -1556,7 +1556,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                             } else {
                                 answerQuestion = null;
                                 type = 5; //简答题
-                                strContent = strContent +  "<br />" + content; //答案文本
+                                analysisContent = analysisContent +  "<br />" + content; //答案文本
                             }
                         }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsCourseQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -42,4 +43,7 @@ public class GoodsCourseQueryBo extends BaseEntity {
 	/** 课程ID */
 	@ApiModelProperty("课程ID")
 	private Long courseId;
+
+	@ApiModelProperty("商品id数组")
+	private List<Long> goodsIds;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/mapper/GoodsCourseMapper.java

@@ -2,8 +2,10 @@ package com.zhongzheng.modules.goods.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.course.vo.CourseVo;
+import com.zhongzheng.modules.goods.bo.GoodsCourseQueryBo;
 import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
 import com.zhongzheng.modules.goods.domain.GoodsCourse;
+import com.zhongzheng.modules.goods.vo.GoodsCourseMoreVo;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 
 import java.util.List;
@@ -16,4 +18,5 @@ import java.util.List;
  */
 public interface GoodsCourseMapper extends BaseMapper<GoodsCourse> {
     List<CourseVo> getList(Long goodsId);
+    List<GoodsCourseMoreVo> selectListMore(GoodsCourseQueryBo bo);
 }

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

@@ -6,6 +6,7 @@ import com.zhongzheng.modules.goods.bo.GoodsCourseAddBo;
 import com.zhongzheng.modules.goods.bo.GoodsCourseEditBo;
 import com.zhongzheng.modules.goods.bo.GoodsCourseQueryBo;
 import com.zhongzheng.modules.goods.domain.GoodsCourse;
+import com.zhongzheng.modules.goods.vo.GoodsCourseMoreVo;
 import com.zhongzheng.modules.goods.vo.GoodsCourseVo;
 
 import java.util.Collection;
@@ -31,6 +32,8 @@ public interface IGoodsCourseService extends IService<GoodsCourse> {
 
 	List<CourseVo> selectList(Long goodsId);
 
+	List<GoodsCourseMoreVo> selectListMore(List<Long> goodsIds);
+
 	/**
 	 * 根据新增业务对象插入商品课程关系
 	 * @param bo 商品课程关系新增业务对象

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

@@ -11,6 +11,7 @@ import com.zhongzheng.modules.goods.domain.GoodsCourse;
 import com.zhongzheng.modules.goods.mapper.GoodsCourseMapper;
 import com.zhongzheng.modules.goods.mapper.GoodsMapper;
 import com.zhongzheng.modules.goods.service.IGoodsCourseService;
+import com.zhongzheng.modules.goods.vo.GoodsCourseMoreVo;
 import com.zhongzheng.modules.goods.vo.GoodsCourseVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -54,6 +55,13 @@ public class GoodsCourseServiceImpl extends ServiceImpl<GoodsCourseMapper, Goods
         return this.baseMapper.getList(goodsId);
     }
 
+    @Override
+    public List<GoodsCourseMoreVo> selectListMore(List<Long> goodsIds) {
+        GoodsCourseQueryBo bo = new GoodsCourseQueryBo();
+        bo.setGoodsIds(goodsIds);
+        return this.baseMapper.selectListMore(bo);
+    }
+
     /**
     * 实体类转化成视图对象
     *

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

@@ -0,0 +1,31 @@
+package com.zhongzheng.modules.goods.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 商品课程关系视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2021-10-12
+ */
+@Data
+@ApiModel("商品课程关系视图对象")
+public class GoodsCourseMoreVo {
+	private static final long serialVersionUID = 1L;
+
+
+	/** 商品id */
+	@Excel(name = "商品id")
+	@ApiModelProperty("商品id")
+	private Long goodsId;
+
+	@ApiModelProperty("课程列表")
+	private List<GoodsCourseVo> courseList;
+
+}

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

@@ -42,6 +42,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 
+    <resultMap type="com.zhongzheng.modules.goods.vo.GoodsCourseMoreVo" id="CourseMoreResultVo">
+        <result property="goodsId" column="goods_id"/>
+        <collection property="courseList" column="goods_id" select="findCourseList"/>
+    </resultMap>
 
 
     <select id="getList" parameterType="Long" resultMap="CourseResultVo">
@@ -66,4 +70,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
         gc.goods_id = #{goodsId} AND c.`status` = 1
     </select>
+
+    <select id="selectListMore" parameterType="com.zhongzheng.modules.goods.bo.GoodsCourseQueryBo" resultMap="CourseMoreResultVo">
+        SELECT
+            g.goods_id
+        FROM
+            goods g
+        WHERE
+            1=1
+        <if test="goodsIds != null and goodsIds.size()!=0 ">
+            AND g.goods_id in
+            <foreach collection="goodsIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
+    <select id="findCourseList" resultMap="CourseResultVo">
+        SELECT
+            c.*,
+            cet.education_name,
+            cpt.project_name,
+            cb.business_name,
+            s.school_name,
+            m.category_name,
+            cs.subject_name,
+            gc.sort as g_sort
+        FROM
+            goods_course gc
+                LEFT JOIN course c ON gc.course_id = c.course_id
+                LEFT JOIN course_education_type cet ON c.education_type_id = cet.id
+                LEFT JOIN course_project_type cpt ON c.project_id = cpt.id
+                LEFT JOIN course_business cb ON c.business_id = cb.id
+                LEFT JOIN school s ON s.id = c.school_id
+                LEFT JOIN major m ON c.major_id = m.id
+                LEFT JOIN course_subject cs ON cs.id = c.subject_id
+        WHERE
+            gc.goods_id = #{goods_id} AND c.`status` = 1
+    </select>
 </mapper>