仓库增加租赁类型

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

@@ -17,6 +17,7 @@
 package com.logpm.basicdata.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -92,11 +93,11 @@ public class BasicdataWarehouseEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "管理区域")
 	private String administrativeAreas;
-	/**
-	 * 配送商场
-	 */
-	@ApiModelProperty(value = "配送商场")
-	private String distributionMall;
+//	/**
+//	 * 配送商场
+//	 */
+//	@ApiModelProperty(value = "配送商场")
+//	private String distributionMall;
 	/**
 	 * 事业线
 	 */
@@ -158,11 +159,11 @@ public class BasicdataWarehouseEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "是否有消防等级")
 	private String fireRatingNot;
-	/**
-	 * 商家仓
-	 */
-	@ApiModelProperty(value = "商家仓")
-	private String merchantFactory;
+//	/**
+//	 * 商家仓
+//	 */
+//	@ApiModelProperty(value = "商家仓")
+//	private String merchantFactory;
 	/**
 	 * 仓库结构;1钢混，2钢架，3混凝土
 	 */
@@ -186,7 +187,7 @@ public class BasicdataWarehouseEntity extends TenantEntity {
 	/**
 	 * 单价
 	 */
-	@ApiModelProperty(value = "单价")
+	@ApiModelProperty(value = "租金单价")
 	private BigDecimal unitPrice;
 	/**
 	 * 管理费
@@ -203,5 +204,29 @@ public class BasicdataWarehouseEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "仓库等级;甲 乙 丙等")
 	private String grade;
+	/**
+	 * 仓库等级;甲 乙 丙等
+	 */
+	@ApiModelProperty(value = "租金结算方式；1-月付、2-季付、3-半年付、4-一口价")
+	private String rentType;
+
+	/**
+	 * 租赁开始时间
+	 */
+	@JsonFormat(
+		pattern = "yyyy-MM-dd"
+	)
+	@ApiModelProperty(value = "租赁开始时间")
+	private Date startDate;
+
+	/**
+	 * 租赁结束时间
+	 */
+	@JsonFormat(
+		pattern = "yyyy-MM-dd"
+	)
+	@ApiModelProperty(value = "租赁结束时间")
+	private Date endDate;
+
 
 }

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

@@ -42,6 +42,8 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.tool.constant.BladeConstant;
 import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.Date;
 import java.util.Map;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -77,8 +79,17 @@ public class BasicdataWarehouseController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入warehouseWarehouse")
 	public R<IPage<BasicdataWarehouseEntity>> list(@ApiIgnore @RequestParam Map<String, Object> warehouseWarehouse, Query query) {
-		IPage<BasicdataWarehouseEntity> pages = warehouseService.page(Condition.getPage(query), Condition.getQueryWrapper(warehouseWarehouse, BasicdataWarehouseEntity.class));
-		return R.data(pages);
+		Object startDate =  warehouseWarehouse.get("startDate");
+		Object endDate =  warehouseWarehouse.get("endDate");
+		warehouseWarehouse.put("startDate",null);
+		warehouseWarehouse.put("endDate",null);
+		QueryWrapper<BasicdataWarehouseEntity> qw = Condition.getQueryWrapper(warehouseWarehouse, BasicdataWarehouseEntity.class);
+		qw
+			.apply(startDate != null,"date_format (start_date,'%Y-%m-%d') >= date_format ({0},'%Y-%m-%d')",startDate)
+			.apply(endDate != null,"date_format (end_date,'%Y-%m-%d') <= date_format ({0},'%Y-%m-%d')",endDate);
+		IPage<BasicdataWarehouseEntity> page = warehouseService.page(Condition.getPage(query), qw);
+//		IPage<BasicdataWarehouseEntity> pages = warehouseService.page(Condition.getPage(query), Condition.getQueryWrapper(warehouseWarehouse, BasicdataWarehouseEntity.class));
+		return R.data(page);
 	}
 
 	/**
@@ -122,6 +133,7 @@ public class BasicdataWarehouseController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入warehouseWarehouse")
 	public R save(@Valid @RequestBody BasicdataWarehouseEntity warehouseWarehouse) {
+
 		return R.status(warehouseService.save(warehouseWarehouse));
 	}
 

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

@@ -24,7 +24,6 @@
         <result column="linkman" property="linkman"/>
         <result column="contact_number" property="contactNumber"/>
         <result column="administrative_areas" property="administrativeAreas"/>
-        <result column="distribution_mall" property="distributionMall"/>
         <result column="business_line" property="businessLine"/>
         <result column="depot_base" property="depotBase"/>
         <result column="money_receiving_code" property="moneyReceivingCode"/>
@@ -36,7 +35,6 @@
         <result column="warehouse_type" property="warehouseType"/>
         <result column="fire_grade" property="fireGrade"/>
         <result column="fire_rating_not" property="fireRatingNot"/>
-        <result column="merchant_factory" property="merchantFactory"/>
         <result column="warehouse_structure" property="warehouseStructure"/>
         <result column="elevated_not" property="elevatedNot"/>
         <result column="storey_height" property="storeyHeight"/>
@@ -46,6 +44,8 @@
         <result column="administrative_fee" property="administrativeFee"/>
         <result column="seating" property="seating"/>
         <result column="grade" property="grade"/>
+        <result column="start_date" property="startDate"/>
+        <result column="end_date" property="endDate"/>
     </resultMap>
     <update id="removeWarehouse">
         UPDATE logpm_warehouse_warehouse
@@ -92,7 +92,6 @@
             linkman,
             contact_number,
             administrative_areas,
-            distribution_mall,
             business_line,
             depot_base,
             money_receiving_code,
@@ -104,7 +103,6 @@
             warehouse_type,
             fire_grade,
             fire_rating_not,
-            merchant_factory,
             warehouse_structure,
             elevated_not,
             storey_height,