修改基本价格

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightEntity.java

@@ -67,7 +67,7 @@ public class BasicdataFreightEntity extends TenantEntity {
 	 * 计算方式;1件  2方  3公斤
 	 */
 	@ApiModelProperty(value = "计算方式;1件  2方  3公斤")
-	private Integer formulaMode;
+	private String formulaMode;
 	/**
 	 * 物品名称
 	 */
@@ -137,12 +137,12 @@ public class BasicdataFreightEntity extends TenantEntity {
 	 * 服务类型;1 干  2干仓  3干仓配 4干配
 	 */
 	@ApiModelProperty(value = "服务类型;1 干  2干仓  3干仓配 4干配")
-	private Integer typeService;
+	private String typeService;
 	/**
 	 * 结算方;1 商场  2工厂
 	 */
 	@ApiModelProperty(value = "结算方;1 商场  2工厂")
-	private Integer clearingForm;
+	private String clearingForm;
 	/**
 	 * 一级品类
 	 */
@@ -184,7 +184,7 @@ public class BasicdataFreightEntity extends TenantEntity {
 	 * 仓储时间端状态;1 0-30天  2 0-60天 3 60天以上
 	 */
 	@ApiModelProperty(value = "仓储时间端状态;1 0-30天  2 0-60天 3 60天以上")
-	private Integer warehousingTimeCharge;
+	private String warehousingTimeCharge;
 	/**
 	 * 仓储时间端费用
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java

@@ -90,6 +90,17 @@ public class BasicdataZonePriceController extends BladeController {
 		return R.data(pages);
 	}
 
+	/**
+	 * 区域品牌价格表 分页 自定义
+	 */
+	@GetMapping("/listName")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicdataZonePrice")
+	public R<List<BasicdataZonePriceEntity>> pageListName(String name) {
+		List<BasicdataZonePriceEntity> pages = basicdataZonePriceService.pageListName(name);
+		return R.data(pages);
+	}
+
 	/**
 	 * 区域品牌价格表 自定义分页
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataZonePriceMapper.java

@@ -54,4 +54,6 @@ public interface BasicdataZonePriceMapper extends BaseMapper<BasicdataZonePriceE
     IPage<BasicdataZonePriceEntity> pageList(IPage<Object> page, @Param("param") BasicdataZonePriceEntity basicdataZonePriceEntity);
 
 	BasicdataZonePriceVO getOneDetail(BasicdataZonePriceEntity basicdataZonePrice);
+
+	List<BasicdataZonePriceEntity> pageListName(String name);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataZonePriceMapper.xml

@@ -33,6 +33,15 @@
         </where>
     </select>
 
+    <select id="pageListName" resultType="com.logpm.basicdata.vo.BasicdataZonePriceVO">
+        select lbzp.id,lbzp.province,lbzp.city , lbzp.district , lbzp.brand , lbzp.freight_mark , lbzp.cost , lbzp.warehousing_time_status , lbzp.warehousing_time_charge , lbzp.goal_granary ,
+               lbzp.identification , lbzp.conditioner , lww.name , lbb.brand_name ,lbzp.create_time,lbzp.tenant_id
+        from logpm_basicdata_zone_price lbzp
+                 LEFT JOIN logpm_basicdata_brand lbb on lbzp.brand = lbb.id
+                 LEFT JOIN logpm_warehouse_warehouse lww on  lbzp.goal_granary = lww.id
+        WHERE  concat(lww.name,lbb.brand_name) like concat('%',#{name},'%')
+    </select>
+
 
     <select id="selectBasicdataZonePricePage" resultMap="basicdataZonePriceResultMap">
         select * from logpm_basicdata_zone_price where is_deleted = 0

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataZonePriceService.java

@@ -53,4 +53,6 @@ public interface IBasicdataZonePriceService extends BaseService<BasicdataZonePri
     IPage<BasicdataZonePriceEntity> pageList(IPage<Object> page, Map<String, Object> basicdataZonePrice);
 
 	BasicdataZonePriceVO getOneDetail(BasicdataZonePriceEntity basicdataZonePrice);
+
+    List<BasicdataZonePriceEntity> pageListName(String name);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataZonePriceServiceImpl.java

@@ -17,6 +17,8 @@
 package com.logpm.basicdata.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basicdata.entity.BasicdataZonePriceEntity;
 import com.logpm.basicdata.vo.BasicdataZonePriceVO;
 import com.logpm.basicdata.excel.BasicdataZonePriceExcel;
@@ -64,4 +66,9 @@ public class BasicdataZonePriceServiceImpl extends BaseServiceImpl<BasicdataZone
 		return baseMapper.getOneDetail(basicdataZonePrice);
 	}
 
+	@Override
+	public List<BasicdataZonePriceEntity> pageListName(String name) {
+		return baseMapper.pageListName(name);
+	}
+
 }