From 3362777c96b63b38125cabe7ffcf93f125f6de94 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 18 二月 2025 11:26:09 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java | 6 ++++++
ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THouseServiceImpl.java | 3 ++-
ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java | 2 +-
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java | 3 +--
ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java | 2 +-
6 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
index e2da95d..9f3d4e5 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
@@ -26,6 +26,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -78,6 +79,11 @@
myToDoVO.setContractCount((int) contractCount);
List<String> contractIds = contractService.lambdaQuery().eq(TContract::getTenantId, loginUserApplet.getUserId()).list()
.stream().map(TContract::getId).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(contractIds)){
+ myToDoVO.setBillCount(0);
+ myToDoVO.setContractCount(0);
+ return R.ok(myToDoVO);
+ }
int billCount = billService.lambdaQuery().in(TBill::getContractId, contractIds).eq(TBill::getPayFeesStatus, 1).list().size();
myToDoVO.setBillCount(billCount);
}else {
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java
index 9ea04c2..3936e87 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java
@@ -91,8 +91,7 @@
@PostMapping(value = "/getConcatByTenantId")
public R<List<TContract>> getConcatByTenantId() {
-// Long userId = tokenService.getLoginUser().getUserId();
- String tenantId = "1881967035070177281";
+ String tenantId = tokenService.getLoginUserApplet().getUserId();
// 查询合同信息
List<TContract> list = contractService.list(Wrappers.lambdaQuery(TContract.class)
.eq(TContract::getTenantId, tenantId)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
index 800f497..396fe85 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
@@ -143,7 +143,7 @@
* 7 待结算
* 8 已结算
*/
- @ApiModelProperty(value = "状态 待提交 待审批 未签订 已签订....")
+ @ApiModelProperty(value = "合同状态 1=待提交 2=待审批 3=未签订 4=已签订 5=已驳回 6=已终止 7=待结算 8=已结算")
@TableField("status")
private String status;
@ApiModelProperty(value = "内存大小多个文件逗号拼接")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java
index b12fbca..3b0238e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java
@@ -17,7 +17,7 @@
private String contractNumber;
@ApiModelProperty(value = "合同名称")
private Integer contractName;
- @ApiModelProperty(value = "合同状态 1=待提交 2=待审批 3=未签订 4=已签订")
+ @ApiModelProperty(value = "合同状态 1=待提交 2=待审批 3=未签订 4=已签订 5=已驳回 6=已终止 7=待结算 8=已结算")
private Integer status;
@ApiModelProperty(value = "选中的行")
private List<String> ids;
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 27c399d..9aa06f9 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
@@ -4,6 +4,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.constant.DictConstants;
import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.TContractMapper;
import com.ruoyi.system.mapper.THouseMapper;
import com.ruoyi.system.model.TContract;
@@ -56,7 +57,7 @@
PageInfo<HouseVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<HouseVO> list = this.baseMapper.userHistoryList(query,pageInfo);
for (HouseVO houseVO : list) {
- houseVO.setTenantAttributes(DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_ATTRIBUTE,houseVO.getTenantAttributes()));
+ houseVO.setTenantAttributes(StringUtils.isNotEmpty(houseVO.getTenantAttributes())?DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_ATTRIBUTE,houseVO.getTenantAttributes()):"");
}
pageInfo.setRecords(list);
return pageInfo;
diff --git a/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml b/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml
index 2ca167a..a4bb3e9 100644
--- a/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml
@@ -59,7 +59,7 @@
t2.id_card as idCard,
t2.bank_number as bankNumber,
t2.mail_address as mailAddress,
- t2.tenant_attributes as tenantAttributes,
+ t2.tenant_attributes as tenantAttributes
from t_contract t1
left join t_tenant t2 on t1.tenant_id = t2.id
LEFT JOIN t_house t3 on t3.id = t1.house_id
--
Gitblit v1.7.1