From 7df6ab7f0cede6c1a9aa51e496f910026a4bfce6 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 07 十二月 2021 09:43:09 +0800
Subject: [PATCH] 2021.12.7
---
src/main/java/zy/cloud/wms/manager/controller/DiffValController.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 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 f2b6e68..7069686 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/DiffValController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/DiffValController.java
@@ -6,7 +6,12 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import zy.cloud.wms.manager.dto.DiffValDto;
import zy.cloud.wms.manager.entity.DiffVal;
+import zy.cloud.wms.manager.entity.Mat;
+import zy.cloud.wms.manager.mapper.MatMapper;
import zy.cloud.wms.manager.service.DiffValService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -18,11 +23,14 @@
import java.util.*;
+@Slf4j
@RestController
public class DiffValController extends BaseController {
@Autowired
private DiffValService diffValService;
+ @Autowired
+ private MatMapper matMapper;
@RequestMapping(value = "/diffVal/{id}/auth")
@ManagerAuth
@@ -36,12 +44,34 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ @RequestParam Map<String, Object> param,
+ @RequestParam(defaultValue = "0")Integer includeZero){
EntityWrapper<DiffVal> wrapper = new EntityWrapper<>();
+ param.remove("includeZero");
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(diffValService.selectPage(new Page<>(curr, limit), wrapper));
+ //鏈辫埅甯�
+ log.info("includeZero鐨勫�兼槸"+includeZero);
+ 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);
+
+ }
+ Page<DiffValDto> diffValDtoPage = new Page<>();
+ diffValDtoPage.setRecords(dvd);
+
+ return R.ok(diffValDtoPage);
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
@@ -120,4 +150,17 @@
return R.ok();
}
+ @RequestMapping("/diffVal/getList")
+ @ManagerAuth
+ public R getList(@RequestParam(required = false) String condition,
+ @RequestParam Integer type) {
+ List<Map<String, Object>> result = new ArrayList<>();
+ HashMap<String, Object> trueResult = new HashMap<>();
+ trueResult.put("val","0");
+ HashMap<String, Object> falseResult = new HashMap<>();
+ falseResult.put("val","1");
+ result.add(trueResult);
+ result.add(falseResult);
+ return R.ok().add(result);
+ }
}
--
Gitblit v1.9.1