#

luxiaotao1123

2021-12-07 a955772ea0908d6747035661e9bcffb7fb4ba961

 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);
@@ -56,22 +56,13 @@
        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){