wangxiaoxian
/
rentease-backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

租房

This commit is contained in:
wangxiaoxian 2026-03-06 00:05:51 +08:00
parent 2950f34959
commit 2e8bddab4e
2 changed files with 88 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
controllers/rentalController.js
View File

@ -80,7 +80,18 @@ const getAllRentals = async (req, res) => {
// 先检查并更新租房状态 // 先检查并更新租房状态
await checkAndUpdateRentalStatus(); await checkAndUpdateRentalStatus();
const { roomId, tenantName, status, page = 1, pageSize = 10 } = req.query; const {
apartmentId,
roomId,
tenantName,
status,
startDateFrom,
startDateTo,
endDateFrom,
endDateTo,
page = 1,
pageSize = 10
} = req.query;
// 构建查询条件 // 构建查询条件
const where = { isDeleted: 0 }; const where = { isDeleted: 0 };
@ -93,12 +104,21 @@ const getAllRentals = async (req, res) => {
if (tenantName) { if (tenantName) {
where.tenantName = { [Op.like]: `%${tenantName}%` }; where.tenantName = { [Op.like]: `%${tenantName}%` };
} }
if (startDateFrom && startDateTo) {
where.startDate = { [Op.between]: [new Date(startDateFrom), new Date(startDateTo)] };
}
if (endDateFrom && endDateTo) {
where.endDate = { [Op.between]: [new Date(endDateFrom), new Date(endDateTo)] };
}
// 构建包含关系 // 构建包含关系
const include = [ const include = [
{ {
model: Room, model: Room,
where: { isDeleted: 0 }, where: {
isDeleted: 0,
...(apartmentId ? { apartmentId } : {})
},
include: [ include: [
{ {
model: Apartment, model: Apartment,
@ -291,7 +311,16 @@ const listRentals = async (req, res) => {
// 先检查并更新租房状态 // 先检查并更新租房状态
await checkAndUpdateRentalStatus(); await checkAndUpdateRentalStatus();
const { roomId, tenantName, status } = req.query; const {
apartmentId,
roomId,
tenantName,
status,
startDateFrom,
startDateTo,
endDateFrom,
endDateTo
} = req.query;
// 构建查询条件 // 构建查询条件
const where = { isDeleted: 0 }; const where = { isDeleted: 0 };
@ -304,12 +333,21 @@ const listRentals = async (req, res) => {
if (tenantName) { if (tenantName) {
where.tenantName = { [Op.like]: `%${tenantName}%` }; where.tenantName = { [Op.like]: `%${tenantName}%` };
} }
if (startDateFrom && startDateTo) {
where.startDate = { [Op.between]: [new Date(startDateFrom), new Date(startDateTo)] };
}
if (endDateFrom && endDateTo) {
where.endDate = { [Op.between]: [new Date(endDateFrom), new Date(endDateTo)] };
}
// 构建包含关系 // 构建包含关系
const include = [ const include = [
{ {
model: Room, model: Room,
where: { isDeleted: 0 }, where: {
isDeleted: 0,
...(apartmentId ? { apartmentId } : {})
},
include: [ include: [
{ {
model: Apartment, model: Apartment,

66
controllers/waterBillController.js
View File

@ -34,7 +34,15 @@ const formatWaterBillData = (bill) => {
// 获取所有水费记录（支持搜索和分页） // 获取所有水费记录（支持搜索和分页）
const getAllWaterBills = async (req, res) => { const getAllWaterBills = async (req, res) => {
try { try {
const { roomId, status, startDate, endDate, page = 1, pageSize = 10 } = req.query; const {
apartmentId,
roomId,
status,
startDateFrom,
endDateTo,
page = 1,
pageSize = 10
} = req.query;
// 构建查询条件 // 构建查询条件
const where = { isDeleted: 0 }; const where = { isDeleted: 0 };
@ -44,12 +52,21 @@ const getAllWaterBills = async (req, res) => {
if (status) { if (status) {
where.status = status; where.status = status;
} }
if (startDate) { if (startDateFrom && endDateTo) {
where.startDate = { [Op.gte]: new Date(startDate) }; where.startDate = { [Op.gte]: new Date(startDateFrom) };
where.endDate = { [Op.lte]: new Date(endDateTo) };
} }
if (endDate) {
where.endDate = { [Op.lte]: new Date(endDate) }; // 构建包含关系
const include = [
{
model: Room,
where: {
isDeleted: 0,
...(apartmentId ? { apartmentId } : {})
} }
}
];
// 计算偏移量 // 计算偏移量
const offset = (page - 1) * pageSize; const offset = (page - 1) * pageSize;
@ -57,12 +74,7 @@ const getAllWaterBills = async (req, res) => {
// 查询水费数据 // 查询水费数据
const { count, rows } = await WaterBill.findAndCountAll({ const { count, rows } = await WaterBill.findAndCountAll({
where, where,
include: [ include,
{
model: Room,
where: { isDeleted: 0 }
}
],
limit: parseInt(pageSize), limit: parseInt(pageSize),
offset: parseInt(offset), offset: parseInt(offset),
order: [['createTime', 'DESC']] // 按创建时间倒序排序 order: [['createTime', 'DESC']] // 按创建时间倒序排序
@ -192,7 +204,13 @@ const deleteWaterBill = async (req, res) => {
// 获取所有水费记录（不分页） // 获取所有水费记录（不分页）
const listWaterBills = async (req, res) => { const listWaterBills = async (req, res) => {
try { try {
const { roomId, status, startDate, endDate } = req.query; const {
apartmentId,
roomId,
status,
startDateFrom,
endDateTo
} = req.query;
// 构建查询条件 // 构建查询条件
const where = { isDeleted: 0 }; const where = { isDeleted: 0 };
@ -202,22 +220,26 @@ const listWaterBills = async (req, res) => {
if (status) { if (status) {
where.status = status; where.status = status;
} }
if (startDate) { if (startDateFrom && endDateTo) {
where.startDate = { [Op.gte]: new Date(startDate) }; where.startDate = { [Op.gte]: new Date(startDateFrom) };
where.endDate = { [Op.lte]: new Date(endDateTo) };
} }
if (endDate) {
where.endDate = { [Op.lte]: new Date(endDate) }; // 构建包含关系
const include = [
{
model: Room,
where: {
isDeleted: 0,
...(apartmentId ? { apartmentId } : {})
} }
}
];
// 查询水费数据 // 查询水费数据
const bills = await WaterBill.findAll({ const bills = await WaterBill.findAll({
where, where,
include: [ include,
{
model: Room,
where: { isDeleted: 0 }
}
],
order: [['createTime', 'DESC']] // 按创建时间倒序排序 order: [['createTime', 'DESC']] // 按创建时间倒序排序
}); });