fix 资料商品

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/ProfileTpAddBo.java

@@ -45,4 +45,7 @@ public class ProfileTpAddBo {
     /** 第二个页面key值 */
     @ApiModelProperty("第二个页面key值")
     private String keyValue2;
+    /** 商品id拼接，多个,拼接 */
+    @ApiModelProperty("商品id拼接，多个,拼接")
+    private String goodsIds;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/ProfileTpEditBo.java

@@ -51,5 +51,8 @@ public class ProfileTpEditBo {
     /** 第二个页面key值 */
     @ApiModelProperty("第二个页面key值")
     private String keyValue2;
+    /** 商品id拼接，多个,拼接 */
+    @ApiModelProperty("商品id拼接，多个,拼接")
+    private String goodsIds;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/ProfileTp.java

@@ -44,4 +44,6 @@ private static final long serialVersionUID=1L;
     private String userIds;
     /** 第二个页面key值 */
     private String keyValue2;
+    /** 商品id拼接，多个,拼接 */
+    private String goodsIds;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/vo/ProfileTpVo.java

@@ -54,4 +54,8 @@ public class ProfileTpVo {
 	private List<ProfileTpBusinessVo> businessList;
 	@ApiModelProperty("用户列表")
 	private List<SysUser> userList;
+	/** 商品id拼接，多个,拼接 */
+	@Excel(name = "商品id拼接，多个,拼接")
+	@ApiModelProperty("商品id拼接，多个,拼接")
+	private String goodsIds;
 }

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

@@ -53,6 +53,8 @@ public class GoodsQueryBo extends BaseEntity {
 	/** 业务层次id */
 	@ApiModelProperty("业务层次id")
 	private Long businessId;
+	@ApiModelProperty("业务层次id")
+	private List<Long> businessIds;
 	/** 所属院校 */
 	@ApiModelProperty("所属院校")
 	private Long schoolId;

zhongzheng-system/src/main/resources/mapper/modules/base/ProfileTpMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="keyValue" column="key_value"/>
         <result property="userIds" column="user_ids"/>
         <result property="keyValue2" column="key_value2"/>
+        <result property="goodsIds" column="goods_ids"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.base.vo.ProfileTpVo" id="ProfileTpVoResult">
@@ -24,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="keyValue" column="key_value"/>
         <result property="userIds" column="user_ids"/>
         <result property="keyValue2" column="key_value2"/>
+        <result property="goodsIds" column="goods_ids"/>
         <collection property="businessList" column="profile_tp_id" select="findBusinessList"/>
         <collection property="userList" column="user_ids" select="findUserList"/>
     </resultMap>

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

@@ -125,6 +125,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="educationTypeId != null and educationTypeId != ''">
             AND g.education_type_id = #{educationTypeId}
         </if>
+        <if test="businessIds != null and businessIds.size()!=0 ">
+            AND g.business_id in
+            <foreach collection="businessIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="businessId != null and businessId != ''">
             AND g.business_id = #{businessId}
         </if>