修改区域价格

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

@@ -82,6 +82,11 @@ public class BasicdataHistoricalContractEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "合同附件")
 	private String leaseAccessories;
+	/**
+	 * 合同名称
+	 */
+	@ApiModelProperty(value = "合同名称")
+	private String fileName;
 	/**
 	 * 合同开始时间
 	 */

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

@@ -71,7 +71,7 @@ public class BasicdataStorageServicesEntity extends TenantEntity {
 	 * 区分类型
 	 */
 	@ApiModelProperty(value = "区分类型")
-	private Long distinguish;
+	private Integer distinguish;
 	/**
 	 * 发货单位
 	 */

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

@@ -78,6 +78,21 @@ public class BasicdataZonePriceEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "区/县")
 	private String district;
+	/**
+	 * 省份
+	 */
+	@ApiModelProperty(value = "省份")
+	private String provinceEnd;
+	/**
+	 * 市
+	 */
+	@ApiModelProperty(value = "市")
+	private String cityEnd;
+	/**
+	 * 区/县
+	 */
+	@ApiModelProperty(value = "区/县")
+	private String districtEnd;
 	/**
 	 * 品牌
 	 */
@@ -108,6 +123,11 @@ public class BasicdataZonePriceEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "末端仓")
 	private String goalGranary;
+	/**
+	 * 始发仓
+	 */
+	@ApiModelProperty(value = "始发仓")
+	private String beginGranary;
 	/**
 	 * 标识
 	 */

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

@@ -8,7 +8,7 @@
     <select id="pageList" resultType="com.logpm.basicdata.vo.BasicdataHistoricalContractVO">
         select lbhc.tenant_id, lbhc.create_user, lbhc.create_time, lbhc.update_user, lbhc.update_time, lbhc.status, lbhc.is_deleted, lbhc.create_dept, lbhc.id,
                lbhc.reserve1, lbhc.reserve2, lbhc.reserve3, lbhc.reserve4, lbhc.reserve5, lbhc.client_id, lbhc.contract_start_time, lbhc.contract_ent_time,
-               lbhc.lease_accessories,lbc.client_name clientName
+               lbhc.lease_accessories,lbc.client_name clientName,lbhc.file_name fileName
         from logpm_basicdata_historical_contract lbhc
                  left join logpm_basicdata_client lbc on  lbc.id  = lbhc.client_id
         <where>

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

@@ -11,7 +11,7 @@
     <select id="selectBasicdataStorageServicesPage" resultType="com.logpm.basicdata.vo.BasicdataStorageServicesVO">
 
         select lbss.tenant_id, lbss.create_user, lbss.create_time, lbss.update_user, lbss.update_time, lbss.status, lbss.is_deleted, lbss.create_dept, lbss.id, lbss.reserve1, lbss.reserve2,
-               lbss.reserve3, lbss.reserve4, lbss.reserve5, lbss.shop_id, lbss.forwarding_unit, lbss.warehouse_service,lbs.store_name storeName,lbsc.linkman
+               lbss.reserve3, lbss.reserve4, lbss.reserve5, lbss.shop_id, lbss.forwarding_unit, lbss.warehouse_service,lbs.store_name storeName,lbsc.linkman,lbss.distinguish
         from logpm_basicdata_storage_services lbss
                  LEFT JOIN logpm_basicdata_shop lbs on lbs.id = lbss.shop_id
                  LEFT JOIN logpm_basicdata_store_contact lbsc on lbsc.id = lbss.forwarding_unit
@@ -19,6 +19,7 @@
             lbss.is_deleted = 0
             <if test="param.shopId != null and param.shopId != null"> and lbs.store_name like concat('%',#{param.shopId},'%')  </if>
             <if test="param.shopIds != null and param.shopIds != null"> and lbss.shop_id = #{param.shopIds}  </if>
+            <if test="param.distinguish != null and param.distinguish != null"> and lbss.distinguish = #{param.distinguish}  </if>
             <if test="param.forwardingUnit != null and param.forwardingUnit != null"> and lbsc.linkman like concat('%',#{param.forwardingUnit} ,'%') </if>
             <if test="param.warehouseService != null and param.warehouseService != null"> and lbss.warehouse_service like concat('%',#{param.warehouseService},'%')  </if>
         </where>

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

@@ -84,6 +84,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 		basicdataHistoricalContract.setContractEntTime(basicdataClient.getContractEntTime());
 		basicdataHistoricalContract.setContractStartTime(basicdataClient.getContractStartTime());
 		basicdataHistoricalContract.setLeaseAccessories(basicdataClient.getLeaseAccessories());
+		basicdataHistoricalContract.setFileName(basicdataClient.getFileName());
 		basicdataHistoricalContractService.save(basicdataHistoricalContract);
 		return true;
 	}