From 209d9c6f60d96fc29fad0bd2f9dad8fe8424f91f Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 17 十一月 2023 18:10:47 +0800
Subject: [PATCH] 调拨管理
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 11 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java
index 76d3c26..e57c589 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java
@@ -4,22 +4,30 @@
import com.consum.base.pojo.FinSysTenantDepartmentParam;
import com.consum.base.service.FinSysTenantDepartmentServiceImpl;
import com.consum.base.service.FinSysTenantServiceImpl;
-import com.consum.model.po.BaseCategory;
-import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantDepartment;
import com.consum.model.po.FinSysTenantUser;
-import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
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.*;
+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;
/**
* @Description 閮ㄩ棬绠＄悊
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
*/
+@Api(value = "閮ㄩ棬绠＄悊", tags = "閮ㄩ棬绠＄悊")
@RestController
@RequestMapping("/pc/fin/sys/tenant/department")
public class FinSysTenantDepartmentController extends BaseController {
@@ -34,6 +42,10 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
*/
+ @ApiOperation(value = "鏂板", notes = "鏂板")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "param", value = "閮ㄩ棬淇℃伅", required = true, dataType = "FinSysTenantDepartmentParam")
+ })
@PostMapping("/add")
public ResponseValue add(@RequestBody FinSysTenantDepartmentParam param) {
if (StringUtils.isEmpty(param.getName())) {
@@ -47,13 +59,15 @@
return ResponseValue.error("閮ㄩ棬缂栧彿宸插瓨鍦�");
}
//鍒ゆ柇鍚屼竴鏈烘瀯id涓� 閮ㄩ棬鍚嶇О 鏄惁閲嶅
- FinSysTenantDepartment department = this.departmentService.getByNameAndTenantId(param.getName(),param.getTenantId());
+ FinSysTenantDepartment department = this.departmentService.getByNameAndTenantId(param.getName(), param.getTenantId());
if (department != null) {
return ResponseValue.error("閮ㄩ棬鍚嶇О宸插瓨鍦�");
}
int result = this.departmentService.add(param, this.getSysInfo());
- if (result > 0) return ResponseValue.success(1);
+ if (result > 0) {
+ return ResponseValue.success();
+ }
return ResponseValue.error("鏂板澶辫触锛�");
}
@@ -71,6 +85,23 @@
}
GenericPager<FinSysTenantDepartment> pager = this.departmentService.queryList(param);
return ResponseValue.success(pager);
+ }
+
+
+ @ApiOperation(value = "鏍规嵁鏈烘瀯id鏌ヨ鎵�鏈夐儴闂ㄥ垪琛ㄤ俊鎭�", notes = "鏍规嵁鏈烘瀯id鏌ヨ鎵�鏈夐儴闂ㄥ垪琛ㄤ俊鎭�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "param", value = "閮ㄩ棬淇℃伅", required = true, dataType = "FinSysTenantDepartmentParam")
+ })
+ @GetMapping("/list/all")
+ public ResponseValue queryAllDepartment(Long tenantId) {
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ if (sysInfo == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ FinSysTenantDepartment finSysTenantDepartment = new FinSysTenantDepartment();
+ finSysTenantDepartment.setTenantId(tenantId);
+ List<FinSysTenantDepartment> finSysTenantDepartments = this.departmentService.select(finSysTenantDepartment);
+ return ResponseValue.success(finSysTenantDepartments);
}
/**
@@ -94,13 +125,17 @@
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
-
- int num = this.departmentService.updateFinSysTenantDepartment(department,sysInfo);
- return num > 0 ? ResponseValue.success(1) : ResponseValue.error("缂栬緫澶辫触锛�");
+ FinSysTenantDepartment tenantDepartment = this.departmentService.selectByCode(department.getCode());
+ if (tenantDepartment != null) {
+ return ResponseValue.error("閮ㄩ棬缂栧彿宸插瓨鍦�");
+ }
+ int num = this.departmentService.updateFinSysTenantDepartment(department, sysInfo);
+ return num > 0 ? ResponseValue.success() : ResponseValue.error("缂栬緫澶辫触锛�");
}
/**
* 鏍规嵁閮ㄩ棬id鏌ヨ閮ㄩ棬璇︽儏
+ *
* @author 鍗㈠簡闃�
* @Date 2023/10/26
*/
@@ -110,7 +145,9 @@
return ResponseValue.error("閮ㄩ棬id涓虹┖");
}
FinSysTenantDepartment department = this.departmentService.getById(id);
- if (department == null) return ResponseValue.error("鏌ヨ澶辫触锛�");
+ if (department == null) {
+ return ResponseValue.error("鏌ヨ澶辫触锛�");
+ }
return ResponseValue.success("鏌ヨ鎴愬姛!", department);
}
@@ -128,7 +165,7 @@
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- int num = this.departmentService.updateById(department,sysInfo);
+ int num = this.departmentService.updateById(department, sysInfo);
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鍒犻櫎澶辫触锛�");
}
--
Gitblit v1.9.1