From a780f6a807fd1a56f5f1ed8045407bf7e39cda2a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 22 Dec 2023 15:59:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/checkInRecords/vo/CheckInRecordsVO.java | 10 ++++++++++
src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.xml | 6 ++++++
src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java | 24 ++++++++++++------------
3 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.xml b/src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.xml
index 2bf9754..b2ac464 100644
--- a/src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.xml
+++ b/src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.xml
@@ -35,6 +35,12 @@
<if test="checkInRecords.address != null and checkInRecords.address != ''"> and jcir.address = #{checkInRecords.address}</if>
<if test="checkInRecords.deletedFlag != null "> and jcir.deleted_flag = #{checkInRecords.deletedFlag}</if>
<if test="checkInRecords.name != null and checkInRecords.name !='' "> and bu.name like concat('%',#{checkInRecords.name},'%') </if>
+ <if test="checkInRecords.startTime!=null and checkInRecords.startTime!=''">
+ AND date_format(jcir.create_time,'%Y-%m-%d')>= #{checkInRecords.startTime}
+ </if>
+ <if test="checkInRecords.endTime!=null and checkInRecords.endTime!=''">
+ AND date_format(jcir.create_time,'%Y-%m-%d')<= #{checkInRecords.endTime}
+ </if>
</where>
</select>
diff --git a/src/main/java/org/springblade/modules/checkInRecords/vo/CheckInRecordsVO.java b/src/main/java/org/springblade/modules/checkInRecords/vo/CheckInRecordsVO.java
index 1c6ba69..1eeb1a7 100644
--- a/src/main/java/org/springblade/modules/checkInRecords/vo/CheckInRecordsVO.java
+++ b/src/main/java/org/springblade/modules/checkInRecords/vo/CheckInRecordsVO.java
@@ -33,4 +33,14 @@
private String name;
+ /**
+ * 开始时间
+ */
+ private String startTime;
+
+ /**
+ * 结束时间
+ */
+ private String endTime;
+
}
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
index 8be71b1..d9552a8 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
@@ -121,18 +121,20 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean add(HouseRentalVO houseRentalVO) {
- // 判断添加人是否房屋业主
- Long count = iHouseholdService.count(Wrappers.<HouseholdEntity>lambdaQuery()
- .eq(HouseholdEntity::getHouseCode, houseRentalVO.getHouseCode())
- .eq(HouseholdEntity::getAssociatedUserId, AuthUtil.getUserId())
- .eq(HouseholdEntity::getRelationship, 1));
- if (count == 0) {
- return false;
- }
+// // 判断添加人是否房屋业主
+// Long count = iHouseholdService.count(Wrappers.<HouseholdEntity>lambdaQuery()
+// .eq(HouseholdEntity::getHouseCode, houseRentalVO.getHouseCode())
+// .eq(HouseholdEntity::getAssociatedUserId, AuthUtil.getUserId())
+// .eq(HouseholdEntity::getRelationship, 1));
+// if (count == 0) {
+// return false;
+// }
houseRentalVO.setCreateUser(AuthUtil.getUserId());
houseRentalVO.setCreateTime(new Date());
houseRentalVO.setUpdateUser(AuthUtil.getUserId());
houseRentalVO.setUpdateTime(new Date());
+ // 网格员新增默认是审核通过
+ houseRentalVO.setAuditStatus(1);
//保存自身
boolean save = save(houseRentalVO);
List<String> phoneList = new ArrayList<>();
@@ -182,10 +184,8 @@
boolean update = iHouseholdService.update(Wrappers.<HouseholdEntity>lambdaUpdate()
.set(HouseholdEntity::getIsDeleted, 1)
.eq(HouseholdEntity::getHousingRentalId, id));
- if (update) {
- return true && b;
- }
- return false;
+ // 返回
+ return b;
}
/**
--
Gitblit v1.9.3