From 18bb27374d39d6ebb9f3ec881b6cd915bd9f6c93 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 20 三月 2025 20:00:13 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultDescribeDicController.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBannerController.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 4 ++--
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THouseServiceImpl.java | 8 +++++---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCheckAcceptRecordController.java | 3 ++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 4 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultAreaDicController.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDeptController.java | 2 +-
9 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBannerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBannerController.java
index 634f1ce..cbca2b9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBannerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBannerController.java
@@ -39,7 +39,7 @@
/**
* 获取轮播图管理列表
*/
- @PreAuthorize("@ss.hasPermi('system:banner:list')")
+ @PreAuthorize("@ss.hasPermi('system:banner')")
@ApiOperation(value = "获取轮播图分页列表")
@PostMapping(value = "/pageList")
public R<PageInfo<TBanner>> pageList(@RequestBody TBannerQuery query) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCheckAcceptRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCheckAcceptRecordController.java
index ab20a9b..5b51c0a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCheckAcceptRecordController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCheckAcceptRecordController.java
@@ -58,7 +58,7 @@
/**
* 获取验收记录管理列表
*/
- @PreAuthorize("@ss.hasPermi('houseManage:check:list')")
+ @PreAuthorize("@ss.hasPermi('houseManage:check')")
@ApiOperation(value = "获取验收记录分页列表")
@PostMapping(value = "/pageList")
public R<PageInfo<TCheckAcceptRecordVO>> pageList(@RequestBody TCheckAcceptRecordQuery query) {
@@ -113,6 +113,7 @@
tBill.setContractId(dto.getContractId());
tBill.setContractNumber(contract.getContractNumber());
tBill.setPayableFeesMoney(dto.getCheckMoney());
+ tBill.setOutstandingMoney(dto.getCheckMoney());
tBill.setPayableFeesTime(LocalDate.now());
tBill.setPayFeesStatus("1");
tBill.setBillType("4");
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDeptController.java
index 772f34c..c09648f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDeptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDeptController.java
@@ -51,7 +51,7 @@
/**
* 获取部门管理管理列表
*/
- @PreAuthorize("@ss.hasPermi('system:department:list')")
+ @PreAuthorize("@ss.hasPermi('system:department')")
@ApiOperation(value = "获取部门管理分页列表")
@PostMapping(value = "/pageList")
public R<PageInfo<DeptVO>> pageList(@RequestBody TDeptQuery query) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultAreaDicController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultAreaDicController.java
index 5225de3..061ca8e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultAreaDicController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultAreaDicController.java
@@ -46,7 +46,7 @@
/**
* 获取故障区域管理列表
*/
- @PreAuthorize("@ss.hasPermi('system:faultArea:list')")
+ @PreAuthorize("@ss.hasPermi('system:faultArea')")
@ApiOperation(value = "获取故障区域分页列表")
@PostMapping(value = "/pageList")
public R<PageInfo<TFaultAreaDic>> pageList(@RequestBody TFaultAreaDicQuery query) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultDescribeDicController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultDescribeDicController.java
index d3530a7..9e1b211 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultDescribeDicController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultDescribeDicController.java
@@ -42,7 +42,7 @@
/**
* 获取故障描述管理列表
*/
- @PreAuthorize("@ss.hasPermi('system:tag:list')")
+ @PreAuthorize("@ss.hasPermi('system:tag')")
@ApiOperation(value = "获取故障描述分页列表")
@PostMapping(value = "/pageList")
public R<PageInfo<TFaultDescribeDicVO>> pageList(@RequestBody TFaultDescribeDicQuery query) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java
index 6365ad9..35a751a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java
@@ -41,7 +41,7 @@
/**
* 获取报修管理列表
*/
- @PreAuthorize("@ss.hasPermi('houseManage:acceptance:list')")
+ @PreAuthorize("@ss.hasPermi('houseManage:acceptance')")
@ApiOperation(value = "获取报修分页列表")
@PostMapping(value = "/pageList")
public R<PageInfo<TFaultRepairMessageVO>> pageList(@RequestBody TFaultRepairMessageQuery query) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
index 494ff97..5c53a61 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -62,7 +62,7 @@
@Autowired
private ISysMenuService menuService;
- @PreAuthorize("@ss.hasPermi('system:role:list')")
+ @PreAuthorize("@ss.hasPermi('system:role')")
@ApiOperation(value = "角色列表")
@PostMapping("/list")
public AjaxResult list(@RequestBody SysRoleQuery query)
@@ -71,7 +71,7 @@
return AjaxResult.success(list);
}
- @PreAuthorize("@ss.hasPermi('system:role:list')")
+ @PreAuthorize("@ss.hasPermi('system:role')")
@ApiOperation(value = "角色列表不分页")
@PostMapping("/listNotPage")
public AjaxResult list()
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index b44867f..53ed772 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -22,6 +22,7 @@
import io.swagger.annotations.ApiOperation;
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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -56,6 +57,7 @@
*/
@ApiOperation(value = "获取用户列表")
@PostMapping("/list")
+ @PreAuthorize("@ss.hasPermi('system:user')")
public AjaxResult list(@RequestBody SysUserQuery query)
{
PageInfo<SysUserVO> list = userService.pageList(query);
@@ -64,6 +66,8 @@
@ApiOperation(value = "获取用户列表-不分页")
@PostMapping("/listNotPage")
+ @PreAuthorize("@ss.hasPermi('system:user')")
+
public AjaxResult listNotPage()
{
List<SysUser> list = userService.selectList();
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 259962e..8d14440 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
@@ -18,6 +18,7 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
+import java.util.Arrays;
import java.util.List;
/**
@@ -37,7 +38,7 @@
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>()
- .eq(TContract::getStatus, 4)
+ .in(TContract::getStatus, Arrays.asList(4,6,7))
.le(TContract::getStartTime, LocalDateTime.now())
.ge(TContract::getEndTime, LocalDateTime.now()));
for (THouse tHouse : list) {
@@ -46,10 +47,11 @@
if (tContract!=null){
tHouse.setTenantType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE,tContract.getPayType()));
// tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,"2"));
+ tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,"2"));
+
}else{
-// tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,tHouse.getLeaseStatus()));
+ tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,tHouse.getLeaseStatus()));
}
- tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,tHouse.getLeaseStatus()));
}
pageInfo.setRecords(list);
--
Gitblit v1.7.1