收购商采购需求管理

sp-service/level-two-server/src/main/java/com/pj/tb_goods_demand/TbGoodsDemand.java

@@ -99,11 +99,24 @@ public class TbGoodsDemand extends Model<TbGoodsDemand> implements Serializable
 	 */
 	private Integer deleteStatus;
 
+	/**
+	 * 互市区ID
+	 */
+	private Long tradeAreaId;
 
+	/**
+	 * 互市区名称
+	 */
+	private String tradeAreaName;
 
+	/**
+	 * 是否发布
+	 */
+	private String isRelease;
 
-
-	
-
+	/**
+	 * 收购商地址
+	 */
+	private Long addressId;
 
 }

sp-service/level-two-server/src/main/java/com/pj/tb_goods_demand/TbGoodsDemandMapper.xml

@@ -29,6 +29,7 @@
 			<if test=' this.has("purchaserId") '> and purchaser_id = #{purchaserId} </if>
 			<if test=' this.has("purchaserName") '> and purchaser_name = #{purchaserName} </if>
 			<if test=' this.has("isOrders") '> and is_orders = #{isOrders} </if>
+			<if test=' this.has("isRelease") '> and is_release = #{isRelease} </if>
 			<if test=' this.has("goodsQuantity") '> and goods_quantity = #{goodsQuantity} </if>
 			<if test=' this.has("remark") '> and remark = #{remark} </if>
 			<if test=' this.has("createTime") '> and create_time = #{createTime} </if>
@@ -38,15 +39,19 @@
 		<choose>
 			<when test='sortType == 1'> id desc </when>
 			<when test='sortType == 2'> level_one_goods_id desc </when>
-			<when test='sortType == 3'> goods_name desc </when>
-			<when test='sortType == 4'> goods_img desc </when>
-			<when test='sortType == 5'> purchaser_id desc </when>
-			<when test='sortType == 6'> purchaser_name desc </when>
-			<when test='sortType == 7'> is_orders desc </when>
-			<when test='sortType == 8'> goods_quantity desc </when>
-			<when test='sortType == 9'> remark desc </when>
-			<when test='sortType == 10'> create_time desc </when>
-			<when test='sortType == 11'> delete_status desc </when>
+			<when test='sortType == 3'> address_id desc </when>
+			<when test='sortType == 4'> goods_name desc </when>
+			<when test='sortType == 5'> goods_img desc </when>
+			<when test='sortType == 6'> purchaser_id desc </when>
+			<when test='sortType == 7'> purchaser_name desc </when>
+			<when test='sortType == 8'> is_orders desc </when>
+			<when test='sortType == 9'> is_release desc </when>
+			<when test='sortType == 10'> goods_quantity desc </when>
+			<when test='sortType == 11'> remark desc </when>
+			<when test='sortType == 12'> create_time desc </when>
+			<when test='sortType == 13'> delete_status desc </when>
+			<when test='sortType == 14'> trade_area_id desc </when>
+			<when test='sortType == 15'> trade_area_name desc </when>
 			<otherwise> id desc </otherwise>
 		</choose>
 	</select>