| | |
|---|
| | | if (includeZero != 0){ |
|---|
| | | wrapper.ne("val",0.0); |
|---|
| | | } |
|---|
| | | List<DiffValDto> dvd = new ArrayList<>(); |
|---|
| | | Page<DiffVal> diffValPage = diffValService.selectPage(new Page<>(curr, limit), wrapper); |
|---|
| | | for (DiffVal record : diffValPage.getRecords()) { |
|---|
| | | |
|---|
| | | Mat mat = matMapper.selectByMatnr(record.getMatnr()); |
|---|
| | | DiffValDto diffValDto = new DiffValDto(); |
|---|
| | | BeanUtils.copyProperties(record,diffValDto,DiffValDto.class); |
|---|
| | | diffValDto.setMaktx(mat.getMaktx()); |
|---|
| | | log.info("集合中的每条数据"+diffValDto); |
|---|
| | | dvd.add(diffValDto); |
|---|
| | | record.setMaktx(mat==null?record.getMatnr():mat.getMaktx()); |
|---|
| | | } |
|---|
| | | Page<DiffValDto> diffValDtoPage = new Page<>(); |
|---|
| | | diffValDtoPage.setRecords(dvd); |
|---|
| | | |
|---|
| | | return R.ok(diffValDtoPage); |
|---|
| | | return R.ok(diffValPage); |
|---|
| | | } |
|---|
| | | |
|---|
| | | private void convert(Map<String, Object> map, EntityWrapper wrapper){ |
|---|
