模块列表

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

@@ -49,9 +49,9 @@ public class GoodsController extends BaseController {
     @ApiOperation("查询商品列表")
     @PreAuthorize("@ss.hasPermi('system:goods:list')")
     @GetMapping("/list")
-    public TableDataInfo<Goods> list(GoodsQueryBo bo) {
+    public TableDataInfo<GoodsVo> list(GoodsQueryBo bo) {
         startPage();
-        List<Goods> list = iGoodsService.selectList(bo);
+        List<GoodsVo> list = iGoodsService.selectList(bo);
         return getDataTable(list);
     }
 

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

@@ -103,4 +103,7 @@ public class GoodsAddBo {
     /** 编码 */
     @ApiModelProperty("编码")
     private String code;
+    /** 项目id */
+    @ApiModelProperty("项目id")
+    private Integer projectId;
 }

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

@@ -126,6 +126,9 @@ public class GoodsEditBo {
     @ApiModelProperty("标准价格详情json")
     private String standPriceJson;
 
+    /** 项目id */
+    @ApiModelProperty("项目id")
+    private Integer projectId;
 
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/Goods.java

@@ -87,4 +87,6 @@ private static final long serialVersionUID=1L;
 
     @TableField(exist = false)
     private String supplyName;
+    /** 项目id */
+    private Integer projectId;
 }

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

@@ -5,6 +5,7 @@ import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.course.vo.CourseVo;
 import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
 import com.zhongzheng.modules.goods.domain.Goods;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
 
 import java.util.List;
 
@@ -15,5 +16,5 @@ import java.util.List;
  * @date 2021-10-12
  */
 public interface GoodsMapper extends BaseMapper<Goods> {
-    List<Goods> selectList(GoodsQueryBo bo);
+    List<GoodsVo> selectList(GoodsQueryBo bo);
 }

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

@@ -23,7 +23,7 @@ public interface IGoodsService extends IService<Goods> {
 	 */
 	GoodsVo queryById(Long goodsId);
 
-	List<Goods> selectList(GoodsQueryBo bo);
+	List<GoodsVo> selectList(GoodsQueryBo bo);
 
 
 	/**

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

@@ -43,7 +43,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     }
 
     @Override
-    public List<Goods> selectList(GoodsQueryBo bo) {
+    public List<GoodsVo> selectList(GoodsQueryBo bo) {
         return goodsMapper.selectList(bo);
     }
 

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

@@ -135,4 +135,18 @@ public class GoodsVo {
 	private Long updateTime;
 	@ApiModelProperty("供应方名称")
 	private String supplyName;
+	/** 项目ID */
+	@Excel(name = "项目ID")
+	@ApiModelProperty("项目ID")
+	private Long projectId;
+
+
+	@ApiModelProperty("教育名称")
+	private String educationName;
+	@ApiModelProperty("项目名称")
+	private String projectName;
+	@ApiModelProperty("业务名称")
+	private String businessName;
+	@ApiModelProperty("学校名称")
+	private String schoolName;
 }

zhongzheng-system/src/main/resources/mapper/modules/course/CourseSectionMapper.xml

@@ -86,11 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cb.business_name,
         cs.subject_name,
         ccs.chapter_id,
-        cc.NAME AS chapter_name,
-        cmc.module_id,
-        cm.module_name,
-        m.course_id,
-        co.course_name
+        cc.NAME AS chapter_name
         FROM
         course_section c
         LEFT JOIN course_section_business csb ON c.section_id = csb.section_id
@@ -100,12 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN course_subject cs ON csb.subject_id = cs.id
         LEFT JOIN course_chapter_section ccs ON csb.id = ccs.section_id
         LEFT JOIN course_chapter cc ON ccs.chapter_id = cc.chapter_id
-        LEFT JOIN course_module_chapter cmc ON cc.chapter_id = cmc.chapter_id
-        LEFT JOIN course_module cm ON cmc.module_id = cm.module_id
-        LEFT JOIN ( SELECT course_id, menu_id FROM course_menu WHERE type = 3 AND STATUS = 1 ) m ON csb.section_id = m.menu_id
-        LEFT JOIN course co ON m.course_id = co.course_id
         WHERE
-            1 = 1
+        1 = 1
         <if test="name != null and name != ''">
             AND c.name like concat('%', #{name}, '%')
         </if>

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

@@ -35,15 +35,63 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="standPriceJson" column="stand_price_json"/>
         <result property="code" column="code"/>
         <result property="supplyName" column="supply_name"/>
+        <result property="projectId" column="project_id"/>
     </resultMap>
 
-    <select id="selectList" parameterType="com.zhongzheng.modules.goods.bo.GoodsQueryBo" resultMap="GoodsResult">
+    <resultMap type="com.zhongzheng.modules.goods.vo.GoodsVo" id="GoodsResultVo">
+        <result property="goodsId" column="goods_id"/>
+        <result property="year" column="year"/>
+        <result property="supplyId" column="supply_id"/>
+        <result property="goodsType" column="goods_type"/>
+        <result property="educationTypeId" column="education_type_id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="schoolId" column="school_id"/>
+        <result property="majorId" column="major_id"/>
+        <result property="goodsName" column="goods_name"/>
+        <result property="standPrice" column="stand_price"/>
+        <result property="lowestPrice" column="lowest_price"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="validityStartTime" column="validity_start_time"/>
+        <result property="validityEndTime" column="validity_end_time"/>
+        <result property="studyStartTime" column="study_start_time"/>
+        <result property="studyEndTime" column="study_end_time"/>
+        <result property="certificateIds" column="certificate_ids"/>
+        <result property="introduce" column="introduce"/>
+        <result property="suitableObject" column="suitable_object"/>
+        <result property="buyNote" column="buy_note"/>
+        <result property="pcDetailHtml" column="pc_detail_html"/>
+        <result property="mobileDetailHtml" column="mobile_detail_html"/>
+        <result property="goodsStatus" column="goods_status"/>
+        <result property="coverUrl" column="cover_url"/>
+        <result property="classHours" column="class_hours"/>
+        <result property="standPriceJson" column="stand_price_json"/>
+        <result property="code" column="code"/>
+        <result property="projectId" column="project_id"/>
+
+        <result property="supplyName" column="supply_name"/>
+        <result property="educationName" column="education_name"/>
+        <result property="projectName" column="project_name"/>
+        <result property="businessName" column="business_name"/>
+        <result property="schoolName" column="school_name"/>
+    </resultMap>
+
+    <select id="selectList" parameterType="com.zhongzheng.modules.goods.bo.GoodsQueryBo" resultMap="GoodsResultVo">
         SELECT
-            g.*,
-            ps.supply_name
+        g.*,
+        ps.supply_name,
+        cet.education_name,
+        cpt.project_name,
+        cb.business_name,
+        s.school_name
         FROM
-            goods g
-                LEFT JOIN pay_supply ps ON g.supply_id = ps.supply_id
+        goods g
+        LEFT JOIN pay_supply ps ON g.supply_id = ps.supply_id
+        LEFT JOIN course_education_type cet ON g.education_type_id = cet.id
+        LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
+        LEFT JOIN course_business cb ON g.business_id = cb.id
+        LEFT JOIN school s ON s.id = g.school_id
         WHERE
         1 = 1
         <if test="status != null and status.size()!=0 ">