#

luxiaotao1123

2021-12-07 fcd8089a36829c200face755080be10ee66a1969

 src/main/java/zy/cloud/wms/manager/controller/DiffValController.java

@@ -45,7 +45,7 @@
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param,
                  @RequestParam(defaultValue = "0")Integer includeZero){
                  @RequestParam(defaultValue = "0", required = false)Integer includeZero){
        EntityWrapper<DiffVal> wrapper = new EntityWrapper<>();
        param.remove("includeZero");
        excludeTrash(param);
@@ -59,18 +59,17 @@
        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);
            
        }
        Page<DiffValDto> diffValDtoPage = new Page<>();
        Page<DiffValDto> diffValDtoPage = new Page<>(curr, limit);
        diffValDtoPage.setRecords(dvd);
        

        return R.ok(diffValDtoPage);
    }