From 85cd2c1d75f6c9c2c7f3d28a80ba3bbf11a38f52 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期四, 10 四月 2025 11:03:25 +0800
Subject: [PATCH] feat: 1.修改支付回调返回营运部门ID
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THouseServiceImpl.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THouseServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THouseServiceImpl.java
index d6f8b6d..768b25a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THouseServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THouseServiceImpl.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.constant.DictConstants;
import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.TContractMapper;
import com.ruoyi.system.mapper.THouseMapper;
@@ -35,6 +36,9 @@
private TContractMapper contractMapper;
@Override
public PageInfo<THouse> houseList(THouseQuery query) {
+ //查询当前登录用户所属部门
+ String businessDeptId = SecurityUtils.getBusinessDeptId();
+ query.setBusinessDeptId(businessDeptId);
PageInfo<THouse> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<THouse> list = this.baseMapper.houseList(query,pageInfo);
List<TContract> tContracts = contractMapper.selectList(new LambdaQueryWrapper<TContract>()
@@ -50,7 +54,12 @@
tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,"2"));
}else{
- tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,tHouse.getLeaseStatus()));
+ if (tHouse.getLeaseStatus().equals("3")){
+ tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,tHouse.getLeaseStatus()));
+ }else{
+ tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,"1"));
+
+ }
}
}
@@ -69,4 +78,14 @@
pageInfo.setRecords(list);
return pageInfo;
}
+ /**
+ * 获取本季度已出租面积
+ *
+ * @param businessDeptId
+ * @return
+ */
+ @Override
+ public Double getRentedArea(String businessDeptId) {
+ return baseMapper.getRentedArea(businessDeptId);
+ }
}
--
Gitblit v1.7.1