模块列表

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

@@ -6,6 +6,7 @@ import java.util.Arrays;
 import com.zhongzheng.modules.goods.bo.GoodsAddBo;
 import com.zhongzheng.modules.goods.bo.GoodsEditBo;
 import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
+import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import lombok.RequiredArgsConstructor;
@@ -48,9 +49,9 @@ public class GoodsController extends BaseController {
     @ApiOperation("查询商品列表")
     @PreAuthorize("@ss.hasPermi('system:goods:list')")
     @GetMapping("/list")
-    public TableDataInfo<GoodsVo> list(GoodsQueryBo bo) {
+    public TableDataInfo<Goods> list(GoodsQueryBo bo) {
         startPage();
-        List<GoodsVo> list = iGoodsService.queryList(bo);
+        List<Goods> list = iGoodsService.selectList(bo);
         return getDataTable(list);
     }
 

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

@@ -22,8 +22,8 @@ public class GoodsAddBo {
     /** 年份 */
     @ApiModelProperty("年份")
     private Long year;
-    /** 供应方（服务）1祥粤自营 2中正合作 */
-    @ApiModelProperty("供应方（服务）1祥粤自营 2中正合作")
+    /** 供应方（服务） */
+    @ApiModelProperty("供应方（服务）")
     private Long supplyId;
     /**商品类型 1视频2题库 3面授 4服务 5组合 */
     @ApiModelProperty("商品类型 1视频2题库 3面授 4服务 5组合")

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

@@ -26,8 +26,8 @@ public class GoodsEditBo {
     @ApiModelProperty("年份")
     private Long year;
 
-    /** 供应方（服务）1祥粤自营 2中正合作 */
-    @ApiModelProperty("供应方（服务）1祥粤自营 2中正合作")
+    /** 供应方（服务） */
+    @ApiModelProperty("供应方（服务）")
     private Long supplyId;
 
     /** 商品类型 1视频2题库 3面授 4服务 5组合 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsQueryBo.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;
 
@@ -40,8 +41,8 @@ public class GoodsQueryBo extends BaseEntity {
 	/** 年份 */
 	@ApiModelProperty("年份")
 	private Long year;
-	/** 供应方（服务）1祥粤自营 2中正合作 */
-	@ApiModelProperty("供应方（服务）1祥粤自营 2中正合作")
+	/** 供应方（服务） */
+	@ApiModelProperty("供应方（服务）")
 	private Long supplyId;
 	/** 商品类型 1视频2题库 3面授 4服务 5组合*/
 	@ApiModelProperty("商品类型 1视频2题库 3面授 4服务 5组合")
@@ -69,7 +70,7 @@ public class GoodsQueryBo extends BaseEntity {
 	private BigDecimal lowestPrice;
 	/** 状态 1有效 0无效 */
 	@ApiModelProperty("状态 1有效 0无效")
-	private Integer status;
+	private List<Integer> status;
 	/** 有效期开始 */
 	@ApiModelProperty("有效期开始")
 	private Long validityStartTime;

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

@@ -84,4 +84,7 @@ private static final long serialVersionUID=1L;
     private String standPriceJson;
     /** 编码 */
     private String code;
+
+    @TableField(exist = false)
+    private String supplyName;
 }

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

@@ -1,8 +1,13 @@
 package com.zhongzheng.modules.goods.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+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 java.util.List;
+
 /**
  * 商品Mapper接口
  *
@@ -10,5 +15,5 @@ import com.zhongzheng.modules.goods.domain.Goods;
  * @date 2021-10-12
  */
 public interface GoodsMapper extends BaseMapper<Goods> {
-
+    List<Goods> selectList(GoodsQueryBo bo);
 }

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

@@ -23,6 +23,9 @@ public interface IGoodsService extends IService<Goods> {
 	 */
 	GoodsVo queryById(Long goodsId);
 
+	List<Goods> selectList(GoodsQueryBo bo);
+
+
 	/**
 	 * 查询列表
 	 */

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.modules.course.mapper.CourseChapterMapper;
 import com.zhongzheng.modules.goods.bo.GoodsAddBo;
 import com.zhongzheng.modules.goods.bo.GoodsEditBo;
 import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
@@ -11,6 +12,7 @@ import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.mapper.GoodsMapper;
 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;
@@ -31,12 +33,20 @@ import java.util.stream.Collectors;
 @Service
 public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements IGoodsService {
 
+    @Autowired
+    private GoodsMapper goodsMapper;
+
     @Override
     public GoodsVo queryById(Long goodsId){
         Goods db = this.baseMapper.selectById(goodsId);
         return BeanUtil.toBean(db, GoodsVo.class);
     }
 
+    @Override
+    public List<Goods> selectList(GoodsQueryBo bo) {
+        return goodsMapper.selectList(bo);
+    }
+
     @Override
     public List<GoodsVo> queryList(GoodsQueryBo bo) {
         LambdaQueryWrapper<Goods> lqw = Wrappers.lambdaQuery();

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

@@ -29,7 +29,7 @@ public class GoodsVo {
 	@Excel(name = "年份")
 	@ApiModelProperty("年份")
 	private Long year;
-	/** 供应方（服务）1祥粤自营 2中正合作 */
+	/** 供应方（服务） */
 	@Excel(name = "供应方" , readConverterExp = "服=务")
 	@ApiModelProperty("供应方（服务）")
 	private Long supplyId;

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

@@ -34,7 +34,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="classHours" column="class_hours"/>
         <result property="standPriceJson" column="stand_price_json"/>
         <result property="code" column="code"/>
+        <result property="supplyName" column="supply_name"/>
     </resultMap>
 
-
+    <select id="selectList" parameterType="com.zhongzheng.modules.goods.bo.GoodsQueryBo" resultMap="GoodsResult">
+        SELECT
+            g.*,
+            ps.supply_name
+        FROM
+            goods g
+                LEFT JOIN pay_supply ps ON g.supply_id = ps.supply_id
+        WHERE
+        1 = 1
+        <if test="status != null and status.size()!=0 ">
+            AND g.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>
 </mapper>