From dc81ce9d6ff037376dde7851b57df235249e1466 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 02 Nov 2023 11:31:09 +0800
Subject: [PATCH] 房屋出租情况查询修改
---
src/main/java/org/springblade/modules/house/entity/HouseRentalEntity.java | 27 ++++++++++++++++-----------
src/main/java/org/springblade/modules/house/vo/HouseRentalVO.java | 2 +-
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml | 7 ++++---
src/main/java/org/springblade/modules/house/controller/HouseRentalController.java | 7 ++++++-
4 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java b/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
index 8c20769..ac3b169 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
@@ -26,6 +26,7 @@
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
@@ -35,6 +36,8 @@
import org.springblade.modules.house.wrapper.HouseRentalWrapper;
import org.springblade.modules.house.service.IHouseRentalService;
import org.springblade.core.boot.ctrl.BladeController;
+
+import java.util.Date;
/**
* 出租屋 控制器
@@ -108,7 +111,9 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入houseRental")
- public R update(@Valid @RequestBody HouseRentalEntity houseRental) {
+ public R update(@RequestBody HouseRentalEntity houseRental) {
+ houseRental.setUpdateTime(new Date());
+ houseRental.setUpdateUser(AuthUtil.getUserId());
return R.status(houseRentalService.updateById(houseRental));
}
diff --git a/src/main/java/org/springblade/modules/house/entity/HouseRentalEntity.java b/src/main/java/org/springblade/modules/house/entity/HouseRentalEntity.java
index 96bedc1..078fa15 100644
--- a/src/main/java/org/springblade/modules/house/entity/HouseRentalEntity.java
+++ b/src/main/java/org/springblade/modules/house/entity/HouseRentalEntity.java
@@ -59,9 +59,9 @@
@ApiModelProperty(value = "门牌地址编码")
private String houseCode;
/**
- * 租客关系(WGCCP_TENANT_RELATIONSHIP)
+ * 租客关系 1: 同一户 2：不同一户
*/
- @ApiModelProperty(value = "租客关系(WGCCP_TENANT_RELATIONSHIP)")
+ @ApiModelProperty(value = "租客关系 1: 同一户 2：不同一户")
private Integer tenantRelationship;
/**
* 租房时间
@@ -77,26 +77,31 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date dueTime;
+
/**
- * 房屋状态(WGCCP_HOUSE_STATUS)
+ * 终止时间
*/
- @ApiModelProperty(value = "房屋状态(WGCCP_HOUSE_STATUS)")
+ @ApiModelProperty(value = "终止时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date terminationTime;
+
+ /**
+ * 房屋状态 1：部分出租 2：全部出租
+ */
+ @ApiModelProperty(value = "房屋状态 1：部分出租 2：全部出租")
private Integer houseStatus;
/**
- * 租房用途
+ * 租房用途 1：仓库 2：办公 3：商用 4：居住
*/
- @ApiModelProperty(value = "租房用途")
+ @ApiModelProperty(value = "租房用途 1：仓库 2：办公 3：商用 4：居住")
private Integer rentalUse;
/**
* 合同附件URL
*/
@ApiModelProperty(value = "合同附件URL")
private String fileUrls;
- /**
- * 审核状态
- */
- @ApiModelProperty(value = "审核状态")
- private Integer auditStatus;
+
/**
* 创建人
*/
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
index 807cb03..55acd6b 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -39,12 +39,13 @@
<!--查询房屋出租情况-->
<select id="getHouseRentalListByCode" resultMap="houseRentalTenant">
select
- jhr.*,if(date_format(jhr.due_time,'%Y-%m-%d') >= date_format(now(),'%Y-%m-%d'),0,1) as status,
+ jhr.*,
+ if(termination_time is null,if(date_format(jhr.due_time,'%Y-%m-%d') >= date_format(now(),'%Y-%m-%d'),0,1),2) as status,
jht.id as tenantId,jht.*
from jczz_house_rental jhr
- left join jczz_house_tenant jht on jhr.id = jht.housing_rental_id
+ left join jczz_house_tenant jht on jhr.id = jht.housing_rental_id and jht.is_deleted = 0
where 1 = 1
- and jhr.is_deleted = 0 and jht.is_deleted = 0
+ and jhr.is_deleted = 0
and house_code = #{code}
</select>
diff --git a/src/main/java/org/springblade/modules/house/vo/HouseRentalVO.java b/src/main/java/org/springblade/modules/house/vo/HouseRentalVO.java
index 526686b..7806645 100644
--- a/src/main/java/org/springblade/modules/house/vo/HouseRentalVO.java
+++ b/src/main/java/org/springblade/modules/house/vo/HouseRentalVO.java
@@ -41,7 +41,7 @@
private Integer number;
/**
- * 是否到期 0：未到期 1：已到期
+ * 是否到期 0：未到期 1：已到期 2：已终止
*/
private Integer status;
--
Gitblit v1.9.3