From 8053bbe2796ca90b142a3030d921a8b74727a0dd Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 02 十二月 2023 11:24:38 +0800
Subject: [PATCH] feat: 台账按规格型号查询
---
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
index b1dcd6a..54fca16 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
@@ -1,6 +1,7 @@
package com.consum.base.controller;
import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
import com.consum.base.pojo.BaseWarehouseParam;
import com.consum.base.pojo.query.WarehouseQry;
import com.consum.base.service.BaseWarehouseServiceImpl;
@@ -13,13 +14,12 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import java.util.ArrayList;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -44,7 +44,12 @@
* @Date 2023/10/26
*/
@PostMapping("/add")
- public ResponseValue add(@RequestBody BaseWarehouseParam param) {
+ public ResponseValue add() {
+ BaseWarehouseParam param = CommonUtil.getObjFromReqBody(BaseWarehouseParam.class);
+ BaseWarehouseParam param2 = new BaseWarehouseParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+
if (StringUtils.isEmpty(param.getWarehouseName())) {
return ResponseValue.error("浠撳簱鍚嶇О涓虹┖");
}
@@ -63,7 +68,12 @@
* @Date 2023/10/26
*/
@GetMapping("/list")
- public ResponseValue queryList(BaseWarehouseParam param) {
+ public ResponseValue queryList() {
+ BaseWarehouseParam param = CommonUtil.getObjFromReq(BaseWarehouseParam.class);
+ BaseWarehouseParam param2 = new BaseWarehouseParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+
FinSysTenantUser sysInfo = this.getSysInfo();
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -79,7 +89,12 @@
* @Date 2023/10/26
*/
@PostMapping("/edit")
- public ResponseValue edit(@RequestBody BaseWarehouse baseWarehouse) {
+ public ResponseValue edit() {
+ BaseWarehouse baseWarehouse = CommonUtil.getObjFromReqBody(BaseWarehouse.class);
+ BaseWarehouse param2 = new BaseWarehouse();
+ CommonUtil.copyProperties(baseWarehouse, param2);
+ baseWarehouse = param2;
+
Long id = baseWarehouse.getId();
if (id == null || id <= 0) {
return ResponseValue.error("缂栬緫鐨勪粨搴撲笉瀛樺湪");
@@ -116,7 +131,12 @@
* @Date 2023/10/26
*/
@DeleteMapping("/del")
- public ResponseValue updateById(@RequestBody BaseWarehouse baseWarehouse) {
+ public ResponseValue updateById() {
+ BaseWarehouse baseWarehouse = CommonUtil.getObjFromReqBody(BaseWarehouse.class);
+ BaseWarehouse param2 = new BaseWarehouse();
+ CommonUtil.copyProperties(baseWarehouse, param2);
+ baseWarehouse = param2;
+
if (baseWarehouse.getId() == null) {
return ResponseValue.error("浠撳簱id涓虹┖");
}
@@ -146,10 +166,9 @@
*/
@GetMapping("/select/tenant_warehouse")
public ResponseValue getByAgencyId(Long agencyId) {
- // TODO 鏆傛棤鏈烘瀯
-// if (agencyId == null) {
-// return ResponseValue.error("鏈烘瀯id涓虹┖");
-// }
+ if (agencyId == null) {
+ return ResponseValue.success(new ArrayList<>());
+ }
List<BaseWarehouse> list = this.baseWarehouseService.getByAgencyId(agencyId, null, null);
if (list == null) {
return ResponseValue.error("鏌ヨ澶辫触锛�");
@@ -162,7 +181,12 @@
@ApiImplicitParam(name = "warehouseQry", value = "浠撳簱id鍜屽瀷鍙穒d", required = true, dataType = "WarehouseQry", paramType = "query")
})
@GetMapping("/select/number")
- public ResponseValue selectNumber(@Validated WarehouseQry warehouseQry) {
+ public ResponseValue selectNumber() {
+ WarehouseQry warehouseQry = CommonUtil.getObjFromReq(WarehouseQry.class);
+ WarehouseQry param2 = new WarehouseQry();
+ CommonUtil.copyProperties(warehouseQry, param2);
+ warehouseQry = param2;
+
Long warehouseId = warehouseQry.getWarehouseId();
if (warehouseId == null) {
Long agencyId = warehouseQry.getAgencyId();
--
Gitblit v1.9.1