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) { 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"); 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) { 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) { 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) { 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) { 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() 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(); 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())); } } pageInfo.setRecords(list);
