From 0b742c243e0ff37dcb6cf1dd36763ee2fbd10a6d Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期四, 10 四月 2025 14:47:18 +0800 Subject: [PATCH] bug修改 --- ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java | 54 +++++++++++++++++++++----- ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml | 3 + ruoyi-system/src/main/java/com/ruoyi/system/query/TCheckAcceptRecordAppletQuery.java | 4 ++ ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCheckAcceptRecordServiceImpl.java | 16 +++++++- 4 files changed, 64 insertions(+), 13 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 a8bcb1d..6e8189f 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 @@ -2,7 +2,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.constant.DictConstants; @@ -15,23 +14,53 @@ import com.ruoyi.common.utils.DictUtils; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.bo.ProcessTaskListBO; -import com.ruoyi.system.dto.TBillDto; -import com.ruoyi.system.dto.TInvoiceDTO; -import com.ruoyi.system.model.*; -import com.ruoyi.system.query.*; -import com.ruoyi.system.service.*; -import com.ruoyi.system.vo.*; +import com.ruoyi.system.model.TBanner; +import com.ruoyi.system.model.TBill; +import com.ruoyi.system.model.TCheckAcceptRecord; +import com.ruoyi.system.model.TContract; +import com.ruoyi.system.model.TContractRentType; +import com.ruoyi.system.model.TFaultRepairMessage; +import com.ruoyi.system.model.THouse; +import com.ruoyi.system.model.TTenant; +import com.ruoyi.system.query.TBannerQuery; +import com.ruoyi.system.query.TBillAppletQuery; +import com.ruoyi.system.query.TCheckAcceptRecordAppletQuery; +import com.ruoyi.system.query.TExamineAppletQuery; +import com.ruoyi.system.query.TFaultRepairMessageAppletQuery; +import com.ruoyi.system.query.TTenantAppletQuery; +import com.ruoyi.system.service.ISysUserService; +import com.ruoyi.system.service.StateProcessTemplateService; +import com.ruoyi.system.service.TBannerService; +import com.ruoyi.system.service.TBillService; +import com.ruoyi.system.service.TCheckAcceptRecordService; +import com.ruoyi.system.service.TContractRentTypeService; +import com.ruoyi.system.service.TContractService; +import com.ruoyi.system.service.TFaultRepairMessageService; +import com.ruoyi.system.service.THouseService; +import com.ruoyi.system.service.TTenantService; +import com.ruoyi.system.vo.ExamineVO; +import com.ruoyi.system.vo.MyHouseVO; +import com.ruoyi.system.vo.MyToDoVO; +import com.ruoyi.system.vo.PayListVO; +import com.ruoyi.system.vo.ProcessTaskListVO; +import com.ruoyi.system.vo.TBillVO; +import com.ruoyi.system.vo.TCheckAcceptRecordVO; +import com.ruoyi.system.vo.TContractVO; +import com.ruoyi.system.vo.TFaultRepairMessageVO; +import com.ruoyi.system.vo.TenantVO; import com.ruoyi.web.controller.tool.MyFileUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import jdk.nashorn.internal.parser.Token; 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.util.StringUtils; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import java.io.File; @@ -258,6 +287,8 @@ @ApiOperation(value = "管理员-房屋验收单列表") @PostMapping(value = "/admin/houseCheck") public R<PageInfo<TCheckAcceptRecordVO>> houseCheck(@RequestBody TCheckAcceptRecordAppletQuery query) { + LoginUserApplet loginUserApplet = tokenService.getLoginUserApplet(); + query.setSysUserId(loginUserApplet.getUserId()); return R.ok(checkAcceptRecordService.pageListApplet(query)); } @@ -307,6 +338,7 @@ tBill.setPayFeesStatus("1"); tBill.setBillType("4"); tBill.setOverDays(0); + tBill.setBusinessDeptId(contract.getBusinessDeptId()); tBill.setOutstandingMoney(dto.getCheckMoney()); billService.save(tBill); return R.ok(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TCheckAcceptRecordAppletQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TCheckAcceptRecordAppletQuery.java index 9c6ff23..c7b3b45 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TCheckAcceptRecordAppletQuery.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TCheckAcceptRecordAppletQuery.java @@ -15,4 +15,8 @@ @ApiModelProperty(value = "状态 不传为全部 1待验收 2已验收") private Integer status; + private String sysUserId; + + private String businessDeptId; + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCheckAcceptRecordServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCheckAcceptRecordServiceImpl.java index 3251b76..d4670a0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCheckAcceptRecordServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCheckAcceptRecordServiceImpl.java @@ -1,8 +1,10 @@ package com.ruoyi.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.constant.DictConstants; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.DictUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.system.mapper.TCheckAcceptRecordMapper; @@ -13,6 +15,7 @@ import com.ruoyi.system.model.THouse; import com.ruoyi.system.query.TCheckAcceptRecordAppletQuery; import com.ruoyi.system.query.TCheckAcceptRecordQuery; +import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.TCheckAcceptRecordService; import com.ruoyi.system.vo.TCheckAcceptRecordVO; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +23,7 @@ import org.springframework.util.StringUtils; import java.util.List; +import java.util.Objects; /** * <p> @@ -36,6 +40,8 @@ private TContractMapper contractMapper; @Autowired private THouseMapper houseMapper; + @Autowired + private ISysUserService sysUserService; @Override public PageInfo<TCheckAcceptRecordVO> pageList(TCheckAcceptRecordQuery query) { PageInfo<TCheckAcceptRecordVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); @@ -55,8 +61,14 @@ @Override public PageInfo<TCheckAcceptRecordVO> pageListApplet(TCheckAcceptRecordAppletQuery query) { - List<TContract> tContracts = contractMapper.selectList(null); - List<THouse> tHouses = houseMapper.selectList(null); + SysUser sysUser = sysUserService.selectUserById(Long.valueOf(query.getSysUserId())); + String businessDeptId = ""; + if (Objects.nonNull(sysUser) && !sysUser.getBusinessDeptId().equals("0")){ + businessDeptId = sysUser.getBusinessDeptId(); + query.setBusinessDeptId(businessDeptId); + } + List<TContract> tContracts = contractMapper.selectList(new LambdaQueryWrapper<TContract>().eq(StringUtils.hasLength(businessDeptId),TContract::getBusinessDeptId,businessDeptId)); + List<THouse> tHouses = houseMapper.selectList(new LambdaQueryWrapper<THouse>().eq(StringUtils.hasLength(businessDeptId),THouse::getBusinessDeptId,businessDeptId)); PageInfo<TCheckAcceptRecordVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<TCheckAcceptRecordVO> list = this.baseMapper.pageListApplet(query,pageInfo); list.forEach(item -> { diff --git a/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml index aa98a8f..1b95b44 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml @@ -102,6 +102,9 @@ <if test="query.houseNameOrAddress != null and query.houseNameOrAddress != ''"> AND (h.house_name LIKE concat('%', #{query.houseNameOrAddress}, '%') or h.house_address LIKE concat('%', #{query.houseNameOrAddress}, '%')) </if> + <if test="query.businessDeptId != null and query.businessDeptId != ''"> + AND h.business_dept_id =#{query.businessDeptId} + </if> AND t.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} </where> ORDER BY t.create_time DESC -- Gitblit v1.7.1