Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang into...

xuhy

2025-04-10 e93003745a6cb35cf97f7fd88f86a8e07367e2d2

Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang into dev

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java

@@ -287,8 +287,9 @@
    @ApiOperation(value = "管理员-房屋验收单列表")
    @PostMapping(value = "/admin/houseCheck")
    public R<PageInfo<TCheckAcceptRecordVO>> houseCheck(@RequestBody TCheckAcceptRecordAppletQuery query) {
        LoginUserApplet loginUserApplet = tokenService.getLoginUserApplet();
        query.setSysUserId(loginUserApplet.getUserId());
        LoginUser loginUser = tokenService.getLoginUser();
        SysUser sysUser = sysUserService.selectUserById(loginUser.getUserId());
        query.setBusinessDeptId(sysUser.getBusinessDeptId());
        return R.ok(checkAcceptRecordService.pageListApplet(query));
    }


 ruoyi-system/src/main/java/com/ruoyi/system/query/TCheckAcceptRecordAppletQuery.java

@@ -15,8 +15,6 @@
    @ApiModelProperty(value = "状态 不传为全部 1待验收 2已验收")
    private Integer status;

    private String sysUserId;

    private String businessDeptId;

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCheckAcceptRecordServiceImpl.java

@@ -4,7 +4,6 @@
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;
@@ -15,7 +14,6 @@
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;
@@ -23,7 +21,6 @@
import org.springframework.util.StringUtils;

import java.util.List;
import java.util.Objects;

/**
 * <p>
@@ -40,8 +37,6 @@
    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());
@@ -61,14 +56,9 @@

    @Override
    public PageInfo<TCheckAcceptRecordVO> pageListApplet(TCheckAcceptRecordAppletQuery query) {
        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));
        String businessDeptId = query.getBusinessDeptId();
        List<TContract> tContracts = contractMapper.selectList(new LambdaQueryWrapper<TContract>().eq(StringUtils.hasLength(businessDeptId) && !"0".equals(businessDeptId),TContract::getBusinessDeptId,businessDeptId));
        List<THouse> tHouses = houseMapper.selectList(new LambdaQueryWrapper<THouse>().eq(StringUtils.hasLength(businessDeptId) && !"0".equals(businessDeptId),THouse::getBusinessDeptId,businessDeptId));
        PageInfo<TCheckAcceptRecordVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TCheckAcceptRecordVO> list = this.baseMapper.pageListApplet(query,pageInfo);
        list.forEach(item -> {

 ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml

@@ -102,7 +102,7 @@
            <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 != ''">
            <if test="query.businessDeptId != null and query.businessDeptId != '' and query.businessDeptId!=0">
                AND h.business_dept_id =#{query.businessDeptId}
            </if>
            AND t.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}