From b5b6d18e2c3e2bfe62161323ff9bdd2f0ed7b541 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期五, 08 十二月 2023 11:47:35 +0800
Subject: [PATCH] feat: 数据字典左侧的机构数 bug12544
---
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseManagerController.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseManagerController.java b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseManagerController.java
index 22728e6..2d72106 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseManagerController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseManagerController.java
@@ -1,19 +1,20 @@
package com.consum.base.controller;
import com.consum.base.BaseController;
-import com.consum.base.pojo.WarehouseManagerParam;
-import com.consum.base.service.BaseWarehouseManagerServiceImpl;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.pojo.request.WarehouseManagerParam;
+import com.consum.base.service.BaseWarehouseManagerService;
import com.consum.model.po.BaseWarehouseManager;
import com.consum.model.po.FinSysTenantUser;
import com.walker.web.ResponseValue;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
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;
@@ -29,7 +30,7 @@
public class BaseWarehouseManagerController extends BaseController {
@Autowired
- private BaseWarehouseManagerServiceImpl baseWarehouseManagerService;
+ private BaseWarehouseManagerService baseWarehouseManagerService;
/**
* @Description 鏂板
@@ -39,25 +40,38 @@
@ApiOperation(value = "鏂板", notes = "鏂板")
@ApiImplicitParam(name = "warehouseManagerParam", value = "搴撶鍛樹俊鎭�", required = true, dataType = "WarehouseManagerParam", paramType = "body")
@PostMapping("/save")
- public ResponseValue add(@RequestBody WarehouseManagerParam warehouseManagerParam) throws Exception {
+ public ResponseValue add() throws Exception {
+ WarehouseManagerParam param = CommonUtil.getObjFromReqBody(WarehouseManagerParam.class);
+ WarehouseManagerParam baseWarehouseParam = new WarehouseManagerParam();
+ CommonUtil.copyProperties(param, baseWarehouseParam);
+ param = baseWarehouseParam;
+
FinSysTenantUser sysInfo = this.getSysInfo();
if (sysInfo == null) {
return ResponseValue.error("璇峰厛鐧诲綍");
}
- this.baseWarehouseManagerService.add(warehouseManagerParam);
+ baseWarehouseManagerService.add(param);
return ResponseValue.success();
}
- @ApiOperation(value = "鏌ヨ", notes = "鏌ヨ")
+ @ApiOperation(value = "鏍规嵁浠撳簱id鏌ヨ搴撶鍛�", notes = "鏍规嵁浠撳簱id鏌ヨ搴撶鍛�")
@ApiImplicitParam(name = "warehouseId", value = "浠撳簱id", required = true, dataType = "Long")
@GetMapping("/list")
public ResponseValue select(Long warehouseId) {
- BaseWarehouseManager baseWarehouseManager = new BaseWarehouseManager();
- baseWarehouseManager.setBaseWarehouseId(warehouseId);
- List<BaseWarehouseManager> select = this.baseWarehouseManagerService.select(baseWarehouseManager);
- return ResponseValue.success(select);
+ List<BaseWarehouseManager> baseWarehouseManagerList = baseWarehouseManagerService.selectWarehouseManager(warehouseId);
+ return ResponseValue.success(baseWarehouseManagerList);
}
+ @ApiOperation(value = "鏍规嵁浠撳簱,鏈烘瀯id鏌ヨ搴撶鍛�", notes = "鏍规嵁浠撳簱,鏈烘瀯id鏌ヨ搴撶鍛�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "warehouseId", value = "浠撳簱id", required = true, dataType = "Long"),
+ @ApiImplicitParam(name = "agencyId", value = "鏈烘瀯id", required = true, dataType = "Long")
+ })
+ @GetMapping("/query")
+ public ResponseValue selectManagerList(Long warehouseId, Long agencyId) {
+ List<BaseWarehouseManager> baseWarehouseManagerList = baseWarehouseManagerService.selectManagerList(warehouseId, agencyId);
+ return ResponseValue.success(baseWarehouseManagerList);
+ }
}
--
Gitblit v1.9.1