From 360427be92209485d972a8a68dd289666e608e40 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 16 五月 2022 15:05:12 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/DiffValController.java | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/DiffValController.java b/src/main/java/zy/cloud/wms/manager/controller/DiffValController.java
index 7069686..b4bcb7d 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/DiffValController.java
+++ b/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){
--
Gitblit v1.9.1