Browse Source

商品关联分部

zouxuan 4 years ago
parent
commit
a0ec85c63d

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Goods.java

@@ -153,6 +153,16 @@ public class Goods {
 	@ApiModelProperty(value = "商品所属分部")
 	@ApiModelProperty(value = "商品所属分部")
 	private String organIdList;
 	private String organIdList;
 
 
+	private String organName;
+
+	public String getOrganName() {
+		return organName;
+	}
+
+	public void setOrganName(String organName) {
+		this.organName = organName;
+	}
+
 	public String getOrganIdList() {
 	public String getOrganIdList() {
 		return organIdList;
 		return organIdList;
 	}
 	}

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

@@ -42,6 +42,7 @@
         <result column="stock_warning_" property="stockWarning" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="stock_warning_" property="stockWarning" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="course_view_type_" property="courseViewType"/>
         <result column="course_view_type_" property="courseViewType"/>
         <result column="organ_id_list_" property="organIdList"/>
         <result column="organ_id_list_" property="organIdList"/>
+        <result column="organ_name_" property="organName"/>
     </resultMap>
     </resultMap>
 
 
     <!-- 根据主键查询一条记录 -->
     <!-- 根据主键查询一条记录 -->
@@ -298,9 +299,11 @@
 
 
     <!-- 分页查询 -->
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="Goods" parameterType="map">
     <select id="queryPage" resultMap="Goods" parameterType="map">
-        SELECT g.*,gc.name_ goods_category_name_ FROM goods g
+        SELECT g.*,gc.name_ goods_category_name_,GROUP_CONCAT(o.name_) organ_name_ FROM goods g
         LEFT JOIN goods_category gc ON g.goods_category_id_ = gc.id_
         LEFT JOIN goods_category gc ON g.goods_category_id_ = gc.id_
+        LEFT JOIN organization o ON FIND_IN_SET(o.id_,g.organ_id_list_)
         <include refid="queryGoodsPageSql"/>
         <include refid="queryGoodsPageSql"/>
+        GROUP BY g.id_
         ORDER BY g.id_ DESC
         ORDER BY g.id_ DESC
         <include refid="global.limit"/>
         <include refid="global.limit"/>
     </select>
     </select>