From 0fdac321828bffa833f7d0155a5c147d23bd78d8 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 15 十二月 2023 12:26:25 +0800
Subject: [PATCH] 1.修改调拨查询物品分类接口 2.解决超级管理员无法登录 3.修改手机号
---
consum-base/src/main/java/com/consum/base/controller/LWhProcureModelController.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhProcureModelController.java b/consum-base/src/main/java/com/consum/base/controller/LWhProcureModelController.java
index d15bf4c..2fc80d8 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhProcureModelController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhProcureModelController.java
@@ -1,5 +1,14 @@
package com.consum.base.controller;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
@@ -7,15 +16,10 @@
import com.consum.base.service.LWhProcureModelService;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.web.ResponseValue;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+import io.swagger.annotations.Api;
+@Api(value = "鐗╁搧鍨嬪彿", tags = "鐗╁搧鍨嬪彿")
@RestController
@RequestMapping("/pc/warehouse/procureModel")
public class LWhProcureModelController extends BaseController {
@@ -31,7 +35,8 @@
LWhProcureModelQry param2 = new LWhProcureModelQry();
CommonUtil.copyProperties(param, param2);
param = param2;
- List<Map<String, Object>> ffOrderByGoodsIdAndDept = lWhProcureModelService.getFfOrderByGoodsIdAndDept(param.getBaseGoodsTemplateId(), param.getDepartmentId());
+ List<Map<String, Object>> ffOrderByGoodsIdAndDept =
+ lWhProcureModelService.getFfOrderByGoodsIdAndDept(param.getBaseGoodsTemplateId(), param.getDepartmentId());
if (CollectionUtils.isEmpty(ffOrderByGoodsIdAndDept)) {
return ResponseValue.success();
}
@@ -47,14 +52,14 @@
LWhProcureModelQry param2 = new LWhProcureModelQry();
CommonUtil.copyProperties(param, param2);
param = param2;
- List<Map<String, Object>> ffOrderByGoodsIdAndDept = lWhProcureModelService.getGoodsUseInfoByFfOrderAndGoodId(param.getBaseGoodsTemplateId(), param.getTransBusinessId());
+ List<Map<String, Object>> ffOrderByGoodsIdAndDept = lWhProcureModelService
+ .getGoodsUseInfoByFfOrderAndGoodId(param.getBaseGoodsTemplateId(), param.getTransBusinessId());
if (CollectionUtils.isEmpty(ffOrderByGoodsIdAndDept)) {
return ResponseValue.success();
}
// 鎸夊瀷鍙峰垎缁勮繑鍥�
- return ResponseValue.success(ffOrderByGoodsIdAndDept.stream()
- .collect(Collectors.groupingBy(map -> map.get("baseGoodsModelsId"))));
+ return ResponseValue.success(
+ ffOrderByGoodsIdAndDept.stream().collect(Collectors.groupingBy(map -> map.get("baseGoodsModelsId"))));
}
-
}
--
Gitblit v1.9.1