系统收费商品关联分部

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

@@ -129,20 +129,41 @@ public class Goods {
 	@ApiModelProperty(value = "备查货号，进货渠道")
 	private String supplyChannel;
 
-	@ApiModelProperty(value = "客户端是否展示")
-	private YesOrNoEnum clientShow;
-	
-	@ApiModelProperty(value = "教务端是否展示")
-	private YesOrNoEnum educationalShow;
-	
-	@ApiModelProperty(value = "乐团是否展示")
-	private YesOrNoEnum musicGroupShow;
+	@ApiModelProperty(value = "客户端展示分部")
+	private String studentShowOrganId;
 
-	@ApiModelProperty(value = "乐团收费模式")
-	private String courseViewType;
+	@ApiModelProperty(value = "教务端展示分部")
+	private String educationShowOrganId;
 
-	@ApiModelProperty(value = "乐器置换是否展示")
-	private YesOrNoEnum replacementShow;
+	@ApiModelProperty(value = "乐团展示分部")
+	private String musicShowOrganId;
+
+	@ApiModelProperty(value = "课程收费团展示分部")
+	private String courseFeeShowOrganId;
+
+	@ApiModelProperty(value = "会员收费团展示分部")
+	private String memberFeeShowOrganId;
+
+	@ApiModelProperty(value = "乐器置换展示分部")
+	private String replacementShowOrganId;
+
+	@ApiModelProperty(value = "客户端展示分部")
+	private String studentShowOrganName;
+
+	@ApiModelProperty(value = "教务端展示分部")
+	private String educationShowOrganName;
+
+	@ApiModelProperty(value = "乐团展示分部")
+	private String musicShowOrganName;
+
+	@ApiModelProperty(value = "课程收费团展示分部")
+	private String courseFeeShowOrganName;
+
+	@ApiModelProperty(value = "会员收费团展示分部")
+	private String memberFeeShowOrganName;
+
+	@ApiModelProperty(value = "乐器置换展示分部")
+	private String replacementShowOrganName;
 
 	@ApiModelProperty(value = "库存类型")
 	private StockType stockType;
@@ -150,65 +171,108 @@ public class Goods {
 	@ApiModelProperty(value = "库存预警")
 	private YesOrNoEnum stockWarning;
 
-	@ApiModelProperty(value = "商品所属分部")
-	private String organIdList;
+	public String getStudentShowOrganId() {
+		return studentShowOrganId;
+	}
+
+	public void setStudentShowOrganId(String studentShowOrganId) {
+		this.studentShowOrganId = studentShowOrganId;
+	}
 
-	private String organName;
+	public String getEducationShowOrganId() {
+		return educationShowOrganId;
+	}
 
-	public String getOrganName() {
-		return organName;
+	public void setEducationShowOrganId(String educationShowOrganId) {
+		this.educationShowOrganId = educationShowOrganId;
 	}
 
-	public void setOrganName(String organName) {
-		this.organName = organName;
+	public String getMusicShowOrganId() {
+		return musicShowOrganId;
 	}
 
-	public String getOrganIdList() {
-		return organIdList;
+	public void setMusicShowOrganId(String musicShowOrganId) {
+		this.musicShowOrganId = musicShowOrganId;
 	}
 
-	public void setOrganIdList(String organIdList) {
-		this.organIdList = organIdList;
+	public String getCourseFeeShowOrganId() {
+		return courseFeeShowOrganId;
 	}
 
-	public String getCourseViewType() {
-		return courseViewType;
+	public void setCourseFeeShowOrganId(String courseFeeShowOrganId) {
+		this.courseFeeShowOrganId = courseFeeShowOrganId;
 	}
 
-	public void setCourseViewType(String courseViewType) {
-		this.courseViewType = courseViewType;
+	public String getMemberFeeShowOrganId() {
+		return memberFeeShowOrganId;
 	}
 
-	public YesOrNoEnum getStockWarning() {
-		return stockWarning;
+	public void setMemberFeeShowOrganId(String memberFeeShowOrganId) {
+		this.memberFeeShowOrganId = memberFeeShowOrganId;
 	}
 
-	public void setStockWarning(YesOrNoEnum stockWarning) {
-		this.stockWarning = stockWarning;
+	public String getReplacementShowOrganId() {
+		return replacementShowOrganId;
 	}
 
-	public YesOrNoEnum getClientShow() {
-		return clientShow;
+	public void setReplacementShowOrganId(String replacementShowOrganId) {
+		this.replacementShowOrganId = replacementShowOrganId;
 	}
 
-	public void setClientShow(YesOrNoEnum clientShow) {
-		this.clientShow = clientShow;
+	public String getStudentShowOrganName() {
+		return studentShowOrganName;
 	}
 
-	public YesOrNoEnum getEducationalShow() {
-		return educationalShow;
+	public void setStudentShowOrganName(String studentShowOrganName) {
+		this.studentShowOrganName = studentShowOrganName;
 	}
 
-	public void setEducationalShow(YesOrNoEnum educationalShow) {
-		this.educationalShow = educationalShow;
+	public String getEducationShowOrganName() {
+		return educationShowOrganName;
 	}
 
-	public YesOrNoEnum getMusicGroupShow() {
-		return musicGroupShow;
+	public void setEducationShowOrganName(String educationShowOrganName) {
+		this.educationShowOrganName = educationShowOrganName;
 	}
 
-	public void setMusicGroupShow(YesOrNoEnum musicGroupShow) {
-		this.musicGroupShow = musicGroupShow;
+	public String getMusicShowOrganName() {
+		return musicShowOrganName;
+	}
+
+	public void setMusicShowOrganName(String musicShowOrganName) {
+		this.musicShowOrganName = musicShowOrganName;
+	}
+
+	public String getCourseFeeShowOrganName() {
+		return courseFeeShowOrganName;
+	}
+
+	public void setCourseFeeShowOrganName(String courseFeeShowOrganName) {
+		this.courseFeeShowOrganName = courseFeeShowOrganName;
+	}
+
+	public String getMemberFeeShowOrganName() {
+		return memberFeeShowOrganName;
+	}
+
+	public void setMemberFeeShowOrganName(String memberFeeShowOrganName) {
+		this.memberFeeShowOrganName = memberFeeShowOrganName;
+	}
+
+	public String getReplacementShowOrganName() {
+		return replacementShowOrganName;
+	}
+
+	public void setReplacementShowOrganName(String replacementShowOrganName) {
+		this.replacementShowOrganName = replacementShowOrganName;
+	}
+
+	public YesOrNoEnum getStockWarning() {
+		return stockWarning;
+	}
+
+	public void setStockWarning(YesOrNoEnum stockWarning) {
+		this.stockWarning = stockWarning;
 	}
 
 	public StockType getStockType() {
@@ -463,12 +527,4 @@ public class Goods {
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);
 	}
-
-	public YesOrNoEnum getReplacementShow() {
-		return replacementShow;
-	}
-
-	public void setReplacementShow(YesOrNoEnum replacementShow) {
-		this.replacementShow = replacementShow;
-	}
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/GoodsQueryInfo.java

@@ -28,20 +28,25 @@ public class GoodsQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "是否组合商品：0/1")
     private Integer groupGoods;
 
-    @ApiModelProperty(value = "客户端是否展示：0否，1是")
-    private Integer clientShow;
+    @ApiModelProperty(value = "客户端展示分部")
+    private String studentShowOrganId;
 
-    @ApiModelProperty(value = "教务端是否展示：0否，1是")
-    private Integer educationalShow;
+    @ApiModelProperty(value = "教务端展示分部")
+    private String educationShowOrganId;
 
-    @ApiModelProperty(value = "乐团端是否展示：0否，1是")
-    private Integer musicGroupShow;
+    @ApiModelProperty(value = "乐团展示分部")
+    private String musicShowOrganId;
 
-    @ApiModelProperty(value = "乐器置换是否展示：0否，1是")
-    private Integer replacementShow;
+    @ApiModelProperty(value = "课程收费团展示分部")
+    private String courseFeeShowOrganId;
 
-    private String courseViewType;
+    @ApiModelProperty(value = "会员收费团展示分部")
+    private String memberFeeShowOrganId;
 
+    @ApiModelProperty(value = "乐器置换展示分部")
+    private String replacementShowOrganId;
+
+    @ApiModelProperty(value = "分部")
     private String organId;
 
     public String getOrganId() {
@@ -52,12 +57,52 @@ public class GoodsQueryInfo extends QueryInfo {
         this.organId = organId;
     }
 
-    public String getCourseViewType() {
-        return courseViewType;
+    public String getStudentShowOrganId() {
+        return studentShowOrganId;
+    }
+
+    public void setStudentShowOrganId(String studentShowOrganId) {
+        this.studentShowOrganId = studentShowOrganId;
+    }
+
+    public String getEducationShowOrganId() {
+        return educationShowOrganId;
+    }
+
+    public void setEducationShowOrganId(String educationShowOrganId) {
+        this.educationShowOrganId = educationShowOrganId;
+    }
+
+    public String getMusicShowOrganId() {
+        return musicShowOrganId;
+    }
+
+    public void setMusicShowOrganId(String musicShowOrganId) {
+        this.musicShowOrganId = musicShowOrganId;
+    }
+
+    public String getCourseFeeShowOrganId() {
+        return courseFeeShowOrganId;
+    }
+
+    public void setCourseFeeShowOrganId(String courseFeeShowOrganId) {
+        this.courseFeeShowOrganId = courseFeeShowOrganId;
+    }
+
+    public String getMemberFeeShowOrganId() {
+        return memberFeeShowOrganId;
     }
 
-    public void setCourseViewType(String courseViewType) {
-        this.courseViewType = courseViewType;
+    public void setMemberFeeShowOrganId(String memberFeeShowOrganId) {
+        this.memberFeeShowOrganId = memberFeeShowOrganId;
+    }
+
+    public String getReplacementShowOrganId() {
+        return replacementShowOrganId;
+    }
+
+    public void setReplacementShowOrganId(String replacementShowOrganId) {
+        this.replacementShowOrganId = replacementShowOrganId;
     }
 
     public Integer getGroupGoods() {
@@ -107,36 +152,4 @@ public class GoodsQueryInfo extends QueryInfo {
     public void setStatus(YesOrNoEnum status) {
         this.status = status;
     }
-
-    public Integer getClientShow() {
-        return clientShow;
-    }
-
-    public void setClientShow(Integer clientShow) {
-        this.clientShow = clientShow;
-    }
-
-	public Integer getEducationalShow() {
-		return educationalShow;
-	}
-
-	public void setEducationalShow(Integer educationalShow) {
-		this.educationalShow = educationalShow;
-	}
-
-	public Integer getMusicGroupShow() {
-		return musicGroupShow;
-	}
-
-	public void setMusicGroupShow(Integer musicGroupShow) {
-		this.musicGroupShow = musicGroupShow;
-	}
-
-    public Integer getReplacementShow() {
-        return replacementShow;
-    }
-
-    public void setReplacementShow(Integer replacementShow) {
-        this.replacementShow = replacementShow;
-    }
 }

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

@@ -227,17 +227,17 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 						LOGGER.error("商品导入异常：参数{}不可为空 param:{}",columnValue,objectMap);
 						continue valueIsNull;
 					}
-					if (columnValue.equals("courseViewType")) {
-						if(row.get(s) != null){
-							for (String courseViewType : courseViewTypeMap.keySet()) {
-								if (courseViewType.equals(row.get(s).toString())) {
-									objectMap.put(columnValue, courseViewTypeMap.get(courseViewType));
-									break;
-								}
-							}
-						}
-						continue;
-					}
+//					if (columnValue.equals("courseViewType")) {
+//						if(row.get(s) != null){
+//							for (String courseViewType : courseViewTypeMap.keySet()) {
+//								if (courseViewType.equals(row.get(s).toString())) {
+//									objectMap.put(columnValue, courseViewTypeMap.get(courseViewType));
+//									break;
+//								}
+//							}
+//						}
+//						continue;
+//					}
 					if (columnValue.equals("type")) {
 						for (GoodsType goodsType : GoodsType.values()) {
 							if (goodsType.getDesc().equals(row.get(s).toString())) {
@@ -256,7 +256,7 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 						}
 						continue;
 					}
-					if (columnValue.equals("educationalShow")) {
+					/*if (columnValue.equals("educationalShow")) {
 						for (YesOrNoEnum yesOrNoEnum : YesOrNoEnum.values()) {
 							if (yesOrNoEnum.getMsg().equals(row.get(s).toString())) {
 								objectMap.put(columnValue, yesOrNoEnum);
@@ -291,7 +291,7 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 							}
 						}
 						continue;
-					}
+					}*/
 					if (columnValue.equals("stockWarning")) {
 						for (YesOrNoEnum yesOrNoEnum : YesOrNoEnum.values()) {
 							if (yesOrNoEnum.getMsg().equals(row.get(s).toString())) {
@@ -392,9 +392,9 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 			if(Objects.nonNull(newGoods.getDesc())&&!newGoods.getDesc().equals(existsGood.getDesc())){
 				existsGood.setDesc(newGoods.getDesc());
 			}
-			if(Objects.nonNull(newGoods.getClientShow())&&!newGoods.getClientShow().equals(existsGood.getClientShow())){
-				existsGood.setClientShow(newGoods.getClientShow());
-			}
+//			if(Objects.nonNull(newGoods.getClientShow())&&!newGoods.getClientShow().equals(existsGood.getClientShow())){
+//				existsGood.setClientShow(newGoods.getClientShow());
+//			}
 			if(Objects.nonNull(newGoods.getStockWarning())&&!newGoods.getStockWarning().equals(existsGood.getStockWarning())){
 				existsGood.setStockWarning(newGoods.getStockWarning());
 			}
@@ -677,14 +677,14 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
     @Override
     public PageInfo<Goods> queryGoodsPage(GoodsQueryInfo queryInfo) {
 		PageInfo<Goods> goodsPageInfo = this.queryPage(queryInfo);
-		List<Goods> rows = goodsPageInfo.getRows();
-		if(rows != null && rows.size() > 0){
-			List<Integer> goodsIds = rows.stream().map(e -> e.getId()).collect(Collectors.toList());
-			Map<Integer,String> goodsNameMap = MapUtil.convertMybatisMap(goodsDao.findGoodsOrganNames(goodsIds));
-			for (Goods row : rows) {
-				row.setOrganName(goodsNameMap.get(row.getId()));
-			}
-		}
+//		List<Goods> rows = goodsPageInfo.getRows();
+//		if(rows != null && rows.size() > 0){
+//			List<Integer> goodsIds = rows.stream().map(e -> e.getId()).collect(Collectors.toList());
+//			Map<Integer,String> goodsNameMap = MapUtil.convertMybatisMap(goodsDao.findGoodsOrganNames(goodsIds));
+//			for (Goods row : rows) {
+//				row.setOrganName(goodsNameMap.get(row.getId()));
+//			}
+//		}
 		return goodsPageInfo;
     }
 }

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

@@ -35,14 +35,19 @@
         <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="supply_channel_" property="supplyChannel" />
         <result column="stock_type_" property="stockType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="client_show_" property="clientShow" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="educational_show_" property="educationalShow" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="music_group_show_" property="musicGroupShow" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="replacement_show_" property="replacementShow" 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="organ_id_list_" property="organIdList"/>
-        <result column="organ_name_" property="organName"/>
+        <result column="student_show_organ_id_" property="studentShowOrganId"/>
+        <result column="student_show_organ_name_" property="studentShowOrganName"/>
+        <result column="education_show_organ_id_" property="educationShowOrganId"/>
+        <result column="education_show_organ_name_" property="educationShowOrganName"/>
+        <result column="music_show_organ_id_" property="musicShowOrganId"/>
+        <result column="music_show_organ_name_" property="musicShowOrganName"/>
+        <result column="replacement_show_organ_id_" property="replacementShowOrganId"/>
+        <result column="replacement_show_organ_name_" property="replacementShowOrganName"/>
+        <result column="course_fee_show_organ_id_" property="courseFeeShowOrganId"/>
+        <result column="course_fee_show_organ_name_" property="courseFeeShowOrganName"/>
+        <result column="member_fee_show_organ_id_" property="memberFeeShowOrganId"/>
+        <result column="member_fee_show_organ_name_" property="memberFeeShowOrganName"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -65,40 +70,54 @@
         INSERT INTO goods
         (goods_category_id_,sn_,name_,brand_,specification_,image_,stock_count_,tax_stock_count_,sell_count_,market_price_,
         discount_price_,group_purchase_price_,brief_,desc_,is_new_,is_top_,status_,memo_,publish_time_,
-        complement_goods_id_list_,update_time_,create_time_,type_,agree_cost_price_,client_show_,educational_show_,
-         music_group_show_,replacement_show_,stock_warning_,stock_type_,course_view_type_,organ_id_list_)
+        complement_goods_id_list_,update_time_,create_time_,type_,agree_cost_price_,stock_warning_,stock_type_
+            ,student_show_organ_id_,education_show_organ_id_,music_show_organ_id_,replacement_show_organ_id_,course_fee_show_organ_id_,member_fee_show_organ_id_)
         VALUES(#{goodsCategoryId},#{sn},#{name},#{brand},#{specification},#{image},#{stockCount},#{taxStockCount},#{sellCount},#{marketPrice},
         #{discountPrice},#{groupPurchasePrice},#{brief},#{desc},
         #{isNew,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isTop,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{memo},#{publishTime},#{complementGoodsIdList},now(),now(),#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{agreeCostPrice},
-        #{clientShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationalShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{musicGroupShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{replacementShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{stockWarning,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{stockType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{courseViewType},#{organIdList})
+        #{stockWarning,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{stockType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+        #{studentShowOrganId},#{educationShowOrganId},#{musicShowOrganId},#{replacementShowOrganId},#{courseFeeShowOrganId},#{memberFeeShowOrganId})
     </insert>
     <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO goods
         (goods_category_id_,name_,brand_,specification_,image_,market_price_,
         discount_price_,group_purchase_price_,brief_,desc_,update_time_,create_time_,type_,agree_cost_price_,sn_,
-        stock_count_,tax_stock_count_,client_show_,educational_show_,music_group_show_,replacement_show_,stock_warning_,stock_type_,course_view_type_,organ_id_list_)
+        stock_count_,tax_stock_count_,stock_warning_,stock_type_
+        ,student_show_organ_id_,education_show_organ_id_,music_show_organ_id_,replacement_show_organ_id_,course_fee_show_organ_id_,member_fee_show_organ_id_)
         VALUES
         <foreach collection="list" separator="," item="goods">
             (#{goods.goodsCategoryId},#{goods.name},#{goods.brand},#{goods.specification},#{goods.image},#{goods.marketPrice},
             #{goods.discountPrice},#{goods.groupPurchasePrice},#{goods.brief},#{goods.desc},now(),now(),
             #{goods.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{goods.agreeCostPrice},#{goods.sn},
-            #{goods.stockCount},#{goods.taxStockCount},#{goods.clientShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            #{goods.educationalShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        	#{goods.musicGroupShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        	#{goods.replacementShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            #{goods.stockCount},#{goods.taxStockCount},
             #{goods.stockWarning,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            #{goods.stockType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{goods.courseViewType},#{goods.organIdList})
+            #{goods.stockType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            #{goods.studentShowOrganId},#{goods.educationShowOrganId},#{goods.musicShowOrganId},#{goods.replacementShowOrganId},#{goods.courseFeeShowOrganId},#{goods.memberFeeShowOrganId}
+            )
         </foreach>
     </insert>
     <!-- 根据主键查询一条记录 -->
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.Goods">
         UPDATE goods
         <set>
-            <if test="courseViewType != null">
-                course_view_type_ = #{courseViewType},
+            <if test="studentShowOrganId != null">
+                student_show_organ_id_ = #{studentShowOrganId},
+            </if>
+            <if test="educationShowOrganId != null">
+                education_show_organ_id_ = #{educationShowOrganId},
+            </if>
+            <if test="musicShowOrganId != null">
+                music_show_organ_id_ = #{musicShowOrganId},
+            </if>
+            <if test="replacementShowOrganId != null">
+                replacement_show_organ_id_ = #{replacementShowOrganId},
+            </if>
+            <if test="courseFeeShowOrganId != null">
+                course_fee_show_organ_id_ = #{courseFeeShowOrganId},
+            </if>
+            <if test="memberFeeShowOrganId != null">
+                member_fee_show_organ_id_ = #{memberFeeShowOrganId},
             </if>
             <if test="agreeCostPrice != null">
                 agree_cost_price_ = #{agreeCostPrice},
@@ -166,18 +185,6 @@
             <if test="taxStockCount != null">
                 tax_stock_count_ = #{taxStockCount},
             </if>
-            <if test="clientShow != null">
-                client_show_ = #{clientShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="educationalShow != null">
-                educational_show_ = #{educationalShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="musicGroupShow != null">
-                music_group_show_ = #{musicGroupShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="replacementShow != null">
-                replacement_show_ = #{replacementShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
             <if test="stockWarning != null">
                 stock_warning_ = #{stockWarning,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
@@ -193,8 +200,23 @@
         <foreach collection="goodsList" item="goods" separator=";">
             UPDATE goods
             <set>
-                <if test="goods.courseViewType != null">
-                    course_view_type_ = #{goods.courseViewType},
+                <if test="goods.studentShowOrganId != null">
+                    student_show_organ_id_ = #{goods.studentShowOrganId},
+                </if>
+                <if test="goods.educationShowOrganId != null">
+                    education_show_organ_id_ = #{goods.educationShowOrganId},
+                </if>
+                <if test="goods.musicShowOrganId != null">
+                    music_show_organ_id_ = #{goods.musicShowOrganId},
+                </if>
+                <if test="goods.replacementShowOrganId != null">
+                    replacement_show_organ_id_ = #{goods.replacementShowOrganId},
+                </if>
+                <if test="goods.courseFeeShowOrganId != null">
+                    course_fee_show_organ_id_ = #{goods.courseFeeShowOrganId},
+                </if>
+                <if test="goods.memberFeeShowOrganId != null">
+                    member_fee_show_organ_id_ = #{goods.memberFeeShowOrganId},
                 </if>
                 <if test="goods.agreeCostPrice != null">
                     agree_cost_price_ = #{goods.agreeCostPrice},
@@ -262,18 +284,6 @@
                 <if test="goods.taxStockCount != null">
                     tax_stock_count_ = #{goods.taxStockCount},
                 </if>
-                <if test="goods.clientShow != null">
-                    client_show_ = #{goods.clientShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-                </if>
-	            <if test="goods.educationalShow != null">
-	                educational_show_ = #{goods.educationalShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-	            </if>
-	            <if test="goods.musicGroupShow != null">
-	                music_group_show_ = #{goods.musicGroupShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-	            </if>
-                <if test="goods.replacementShow != null">
-                    music_group_show_ = #{goods.replacementShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-                </if>
                 <if test="goods.stockWarning != null">
                     stock_warning_ = #{goods.stockWarning,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
                 </if>
@@ -308,9 +318,6 @@
 
     <sql id="queryGoodsPageSql">
         <where>
-            <if test="organId != null and organId != ''">
-                AND INTE_ARRAY(#{organId},g.organ_id_list_)
-            </if>
             <if test="goodsCategoryId != null">
                 AND g.goods_category_id_ = #{goodsCategoryId}
             </if>
@@ -332,20 +339,26 @@
             <if test="groupGoods!=null and groupGoods==1">
                 AND g.complement_goods_id_list_ IS NOT NULL
             </if>
-            <if test="clientShow!=null">
-                AND g.client_show_=#{clientShow}
+            <if test="studentShowOrganId != null and studentShowOrganId != ''">
+                AND FIND_IN_SET(g.student_show_organ_id_,#{studentShowOrganId})
+            </if>
+            <if test="educationShowOrganId != null and educationShowOrganId != ''">
+                AND FIND_IN_SET(g.education_show_organ_id_,#{educationShowOrganId})
             </if>
-            <if test="educationalShow!=null">
-                AND g.educational_show_=#{educationalShow}
+            <if test="musicShowOrganId != null and musicShowOrganId != ''">
+                AND FIND_IN_SET(g.music_show_organ_id_,#{musicShowOrganId})
             </if>
-            <if test="musicGroupShow!=null">
-                AND g.music_group_show_=#{musicGroupShow}
+            <if test="courseFeeShowOrganId != null and courseFeeShowOrganId != ''">
+                AND FIND_IN_SET(g.course_fee_show_organ_id_,#{courseFeeShowOrganId})
             </if>
-            <if test="courseViewType != null">
-                AND FIND_IN_SET(#{courseViewType},g.course_view_type_)
+            <if test="memberFeeShowOrganId!=null and memberFeeShowOrganId != ''">
+                AND FIND_IN_SET(g.member_fee_show_organ_id_,#{memberFeeShowOrganId})
             </if>
-            <if test="replacementShow!=null">
-                AND g.replacement_show_=#{replacementShow}
+            <if test="replacementShowOrganId!=null and replacementShowOrganId != ''">
+                AND FIND_IN_SET(g.replacement_show_organ_id_,#{replacementShowOrganId})
+            </if>
+            <if test="organId != null and organId != ''">
+--                 AND FIND_IN_SET(g.replacement_show_organ_id_,#{replacementShowOrganId})
             </if>
             <if test="search!=null and search!=''">
                 AND (g.sn_=#{search} OR g.id_=#{search} OR g.name_ LIKE CONCAT('%', #{search}, '%'))

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

@@ -123,7 +123,12 @@ public class GoodsController extends BaseController {
             return failed("用户信息获取失败");
         }
         Employee employee = employeeDao.get(sysUser.getId());
-        if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+        if (StringUtils.isEmpty(queryInfo.getStudentShowOrganId()) &&
+                StringUtils.isEmpty(queryInfo.getEducationShowOrganId()) &&
+                StringUtils.isEmpty(queryInfo.getMusicShowOrganId()) &&
+                StringUtils.isEmpty(queryInfo.getCourseFeeShowOrganId()) &&
+                StringUtils.isEmpty(queryInfo.getMemberFeeShowOrganId()) &&
+                StringUtils.isEmpty(queryInfo.getReplacementShowOrganId())) {
             queryInfo.setOrganId(employee.getOrganIdList());
         }else if(StringUtils.isEmpty(employee.getOrganIdList())){
             return failed("用户所在分部异常");

mec-web/src/main/resources/columnMapper.ini

@@ -15,11 +15,6 @@
 内部库存 = stockCount
 税务库存 = taxStockCount
 备查货号 = supplyChannel
-是否App展示 = clientShow
-是否在教务端展示 = educationalShow
-是否在乐团展示 = musicGroupShow
-乐团收费类型 = courseViewType
-是否乐器置换 = replacementShow
 库存类型 = stockType
 商品详情 = desc
 库存预警 = stockWarning