Merge branch 'master' of http://111.30.93.211:10101/r/supipe

叶松

2023-10-10 da8dcef599d67dcc66742e53a872b45ead53b1ea

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TSteelNeedYearServiceImpl.java

@@ -192,4 +192,30 @@
        return BasicResult.success("修改成功");
    }

    @Override
    public BasicResult selectSteelInfo(Map<String, Object> values) {
        SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
        String companyId = sysUserInfo.getCompanyId();
        values.put("companyId",companyId);
        Integer pageSize = Integer.valueOf(values.get("pageSize").toString());
        Integer pageNum = Integer.valueOf(values.get("pageNum").toString());
        PageHelper.startPage(pageNum,pageSize);
        List<Map<String, Object>> list = this.yearMapper.selectSteelInfo(values);
        PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(list);
        return BasicResult.success(pageInfo);
    }

    @Override
    public BasicResult selectPipeInfo(Map<String, Object> values) {
        SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
        String companyId = sysUserInfo.getCompanyId();
        values.put("companyId",companyId);
        Integer pageSize = Integer.valueOf(values.get("pageSize").toString());
        Integer pageNum = Integer.valueOf(values.get("pageNum").toString());
        PageHelper.startPage(pageNum,pageSize);
        List<Map<String, Object>> list = this.yearMapper.selectPipeInfo(values);
        PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(list);
        return BasicResult.success(pageInfo);
    }

}