系统收费商品分部

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/GoodsDao.java

@@ -15,6 +15,8 @@ public interface GoodsDao extends BaseDAO<Integer, Goods> {
 
     Goods lock(@Param("goodsId") Integer goodsId);
 
+    Goods getDetail(@Param("goodsId") Integer goodsId);
+
     /**
      * 通过科目编号查询商品(教材、辅件)列表
      *

mec-biz/src/main/java/com/ym/mec/biz/service/GoodsService.java

@@ -118,4 +118,11 @@ public interface GoodsService extends BaseService<Integer, Goods> {
     List<GoodsSellDto> queryGoodsSellDtos(String goodsId);
 
     PageInfo<Goods> queryGoodsPage(GoodsQueryInfo queryInfo);
+
+    /**
+     * 获取商品包含分部名称
+     * @param goodsId
+     * @return
+     */
+    Goods getDetail(Integer goodsId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/GoodsServiceImpl.java

@@ -687,4 +687,9 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 //		}
 		return goodsPageInfo;
     }
+
+	@Override
+	public Goods getDetail(Integer goodsId) {
+		return goodsDao.getDetail(goodsId);
+	}
 }

mec-biz/src/main/resources/config/mybatis/GoodsMapper.xml

@@ -50,7 +50,25 @@
 
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="Goods" useCache="false" flushCache="true">
-		SELECT * FROM goods WHERE id_ = #{id}
+		SELECT * FROM goods g
+		WHERE g.id_ = #{id}
+	</select>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="getDetail" resultMap="Goods" useCache="false" flushCache="true">
+        SELECT g.*,GROUP_CONCAT(o.name_) student_show_organ_name_,
+               GROUP_CONCAT(o1.name_) education_show_organ_name_,
+               GROUP_CONCAT(o2.name_) replacement_show_organ_name_,
+               GROUP_CONCAT(o3.name_) course_fee_show_organ_name_,
+               GROUP_CONCAT(o4.name_) member_fee_show_organ_name_
+        FROM goods g
+                 LEFT JOIN organization o ON FIND_IN_SET(o.id_,g.student_show_organ_id_)
+                 LEFT JOIN organization o1 ON FIND_IN_SET(o1.id_,g.education_show_organ_id_)
+                 LEFT JOIN organization o2 ON FIND_IN_SET(o2.id_,g.replacement_show_organ_id_)
+                 LEFT JOIN organization o3 ON FIND_IN_SET(o3.id_,g.course_fee_show_organ_id_)
+                 LEFT JOIN organization o4 ON FIND_IN_SET(o4.id_,g.member_fee_show_organ_id_)
+		WHERE g.id_ = #{id}
+        GROUP BY g.id_
 	</select>
 
     <select id="lock" resultMap="Goods" useCache="false" flushCache="true">

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -1,5 +1,7 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
@@ -7,24 +9,16 @@ import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.constant.CommonConstants;
+import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.IdGeneratorService;
+import com.ym.mec.util.collection.MapUtil;
+import com.ym.mec.util.date.DateUtil;
+import com.ym.mec.util.excel.POIUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,14 +28,13 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.exception.BizException;
-import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.util.collection.MapUtil;
-import com.ym.mec.util.date.DateUtil;
-import com.ym.mec.util.excel.POIUtil;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @RequestMapping
 @Api(tags = "数据导出服务")
@@ -474,12 +467,10 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"商品编号", "货号", "品牌", "商品名称",
-                    "是否组合商品", "学员展示分部", "教务展示分部", "课程收费团展示分部", "系统收费团展示分部","乐器置换展示分部", "是否库存预警",
-                    "商品类型", "商品分类", "具体型号", "内部库存", "税务库存", "库存类型", "市场价(元)",
+                    "是否组合商品", "是否库存预警","商品类型", "商品分类", "具体型号", "内部库存", "税务库存", "库存类型", "市场价(元)",
                     "零售价(元)", "商品团购价(元)", "商品描述", "商品详情", "是否上下架"}, new String[]{
                     "id", "sn", "brand", "name",
-                    "complementGoodsIdList == null || complementGoodsIdList == '' ? '否':'是'", "studentShowOrganName", "educationShowOrganName", "courseFeeShowOrganName",
-                    "memberFeeShowOrganName","replacementShowOrganName", "stockWarning.msg",
+                    "complementGoodsIdList == null || complementGoodsIdList == '' ? '否':'是'", "stockWarning.msg",
                     "type.desc", "goodsCategoryName", "specification", "stockCount", "taxStockCount", "stockType.msg", "marketPrice",
                     "discountPrice", "groupPurchasePrice", "brief", "desc", "status.msg"}, rows);
             response.setContentType("application/octet-stream");

mec-web/src/main/java/com/ym/mec/web/controller/GoodsController.java

@@ -104,7 +104,7 @@ public class GoodsController extends BaseController {
     @ApiOperation(value = "根据商品(教材、辅件)编号查询商品(教材、辅件)")
     @GetMapping("/get/{id}")
     public Object get(@ApiParam(value = "商品(教材、辅件)编号", required = true) @PathVariable("id") Integer id){
-        Goods goods = goodsService.get(id);
+        Goods goods = goodsService.getDetail(id);
         GoodsCategory goodsCategory = goodsCategoryService.get(goods.getGoodsCategoryId());
         if(Objects.nonNull(goodsCategory)){
             goods.setGoodsCategoryName(goodsCategory.getName());