From 62b6a7fac3f2acde70b578431147c4a01f19c182 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期一, 15 四月 2024 09:07:05 +0800
Subject: [PATCH] bug修改
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java | 111 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 74 insertions(+), 37 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 e57c589..1984228 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
@@ -1,26 +1,30 @@
package com.consum.base.controller;
+import java.util.List;
+
+import cn.hutool.core.collection.CollectionUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
import com.consum.base.BaseController;
+import com.consum.base.core.type.StatesType;
+import com.consum.base.core.utils.CommonUtil;
import com.consum.base.pojo.FinSysTenantDepartmentParam;
-import com.consum.base.service.FinSysTenantDepartmentServiceImpl;
-import com.consum.base.service.FinSysTenantServiceImpl;
+import com.consum.base.service.FinSysTenantDepartmentService;
import com.consum.model.po.FinSysTenantDepartment;
import com.consum.model.po.FinSysTenantUser;
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.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 閮ㄩ棬绠＄悊
@@ -33,9 +37,7 @@
public class FinSysTenantDepartmentController extends BaseController {
@Autowired
- private FinSysTenantDepartmentServiceImpl departmentService;
- @Autowired
- private FinSysTenantServiceImpl finSysTenantService;
+ private FinSysTenantDepartmentService departmentService;
/**
* @Description 鏂板
@@ -44,26 +46,38 @@
*/
@ApiOperation(value = "鏂板", notes = "鏂板")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "param", value = "閮ㄩ棬淇℃伅", required = true, dataType = "FinSysTenantDepartmentParam")
- })
+ @ApiImplicitParam(name = "param", value = "閮ㄩ棬淇℃伅", required = true, dataType = "FinSysTenantDepartmentParam")})
@PostMapping("/add")
- public ResponseValue add(@RequestBody FinSysTenantDepartmentParam param) {
+ public ResponseValue add() {
+ FinSysTenantDepartmentParam param = CommonUtil.getObjFromReqBody(FinSysTenantDepartmentParam.class);
+ FinSysTenantDepartmentParam finSysTenantDepartmentParam = new FinSysTenantDepartmentParam();
+ CommonUtil.copyProperties(param, finSysTenantDepartmentParam);
+ param = finSysTenantDepartmentParam;
+
if (StringUtils.isEmpty(param.getName())) {
return ResponseValue.error("閮ㄩ棬鍚嶇О涓虹┖");
}
if (StringUtils.isEmpty(param.getCode())) {
return ResponseValue.error("缂栧彿涓虹┖");
}
- FinSysTenantDepartment tenantDepartment = this.departmentService.selectByCode(param.getCode());
+ FinSysTenantDepartment tenantDepartment =
+ departmentService.getTenantDepartment(null, param.getTenantId(), param.getCode());
if (tenantDepartment != null) {
return ResponseValue.error("閮ㄩ棬缂栧彿宸插瓨鍦�");
}
- //鍒ゆ柇鍚屼竴鏈烘瀯id涓� 閮ㄩ棬鍚嶇О 鏄惁閲嶅
- FinSysTenantDepartment department = this.departmentService.getByNameAndTenantId(param.getName(), param.getTenantId());
+ // 鍒ゆ柇鍚屼竴鏈烘瀯id涓� 閮ㄩ棬鍚嶇О 鏄惁閲嶅
+ FinSysTenantDepartment department =
+ departmentService.getTenantDepartment(param.getName(), param.getTenantId(), null);
if (department != null) {
return ResponseValue.error("閮ㄩ棬鍚嶇О宸插瓨鍦�");
}
-
+ // 閮ㄩ棬缂栧彿
+ FinSysTenantDepartmentParam finSysTenantDepartmentParam1 = new FinSysTenantDepartmentParam();
+ finSysTenantDepartmentParam1.setCode(param.getCode());
+ List<FinSysTenantDepartment> datas = departmentService.queryDataList(finSysTenantDepartmentParam1);
+ if(!CollectionUtil.isEmpty(datas)){
+ return ResponseValue.error("姝ょ紪鍙峰凡瀛樺湪");
+ }
int result = this.departmentService.add(param, this.getSysInfo());
if (result > 0) {
return ResponseValue.success();
@@ -76,9 +90,14 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
*/
- //濡傛灉涓嶄紶鏈烘瀯id锛岄粯璁ゆ煡鐪佺骇鏈烘瀯鐨勯儴闂�
+ // 濡傛灉涓嶄紶鏈烘瀯id锛岄粯璁ゆ煡鐪佺骇鏈烘瀯鐨勯儴闂�
@GetMapping("/list")
- public ResponseValue queryList(FinSysTenantDepartmentParam param) {
+ public ResponseValue queryList() {
+ FinSysTenantDepartmentParam param = CommonUtil.getObjFromReq(FinSysTenantDepartmentParam.class);
+ FinSysTenantDepartmentParam param2 = new FinSysTenantDepartmentParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+
FinSysTenantUser sysInfo = this.getSysInfo();
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -87,11 +106,9 @@
return ResponseValue.success(pager);
}
-
@ApiOperation(value = "鏍规嵁鏈烘瀯id鏌ヨ鎵�鏈夐儴闂ㄥ垪琛ㄤ俊鎭�", notes = "鏍规嵁鏈烘瀯id鏌ヨ鎵�鏈夐儴闂ㄥ垪琛ㄤ俊鎭�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "param", value = "閮ㄩ棬淇℃伅", required = true, dataType = "FinSysTenantDepartmentParam")
- })
+ @ApiImplicitParam(name = "param", value = "閮ㄩ棬淇℃伅", required = true, dataType = "FinSysTenantDepartmentParam")})
@GetMapping("/list/all")
public ResponseValue queryAllDepartment(Long tenantId) {
FinSysTenantUser sysInfo = this.getSysInfo();
@@ -100,6 +117,7 @@
}
FinSysTenantDepartment finSysTenantDepartment = new FinSysTenantDepartment();
finSysTenantDepartment.setTenantId(tenantId);
+ finSysTenantDepartment.setStatus(StatesType.NORMAL.getValue());
List<FinSysTenantDepartment> finSysTenantDepartments = this.departmentService.select(finSysTenantDepartment);
return ResponseValue.success(finSysTenantDepartments);
}
@@ -110,26 +128,42 @@
* @Date 2023/10/26
*/
@PostMapping("/edit")
- public ResponseValue edit(@RequestBody FinSysTenantDepartment department) {
- Long id = department.getId();
+ public ResponseValue edit() {
+ FinSysTenantDepartment param = CommonUtil.getObjFromReqBody(FinSysTenantDepartment.class);
+ FinSysTenantDepartment finSysTenantDepartment = new FinSysTenantDepartment();
+ CommonUtil.copyProperties(param, finSysTenantDepartment);
+ param = finSysTenantDepartment;
+
+ Long id = param.getId();
if (id == null || id <= 0) {
return ResponseValue.error("缂栬緫鐨勯儴闂ㄤ笉瀛樺湪");
}
- if (StringUtils.isEmpty(department.getName())) {
+ if (StringUtils.isEmpty(param.getName())) {
return ResponseValue.error("閮ㄩ棬鍚嶇О涓虹┖");
}
- if (StringUtils.isEmpty(department.getCode())) {
+ if (StringUtils.isEmpty(param.getCode())) {
return ResponseValue.error("閮ㄩ棬缂栧彿涓虹┖");
}
FinSysTenantUser sysInfo = this.getSysInfo();
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- FinSysTenantDepartment tenantDepartment = this.departmentService.selectByCode(department.getCode());
+ FinSysTenantDepartment tenantDepartment =
+ this.departmentService.getTenantDepartment(null, param.getTenantId(), param.getCode());
if (tenantDepartment != null) {
- return ResponseValue.error("閮ㄩ棬缂栧彿宸插瓨鍦�");
+ //return ResponseValue.error("閮ㄩ棬缂栧彿宸插瓨鍦�");
}
- int num = this.departmentService.updateFinSysTenantDepartment(department, sysInfo);
+ // 閮ㄩ棬缂栧彿
+ FinSysTenantDepartmentParam finSysTenantDepartmentParam1 = new FinSysTenantDepartmentParam();
+ finSysTenantDepartmentParam1.setCode(param.getCode());
+ List<FinSysTenantDepartment> datas = departmentService.queryDataList(finSysTenantDepartmentParam1);
+ if(!CollectionUtil.isEmpty(datas)){
+ FinSysTenantDepartment finSysTenantDepartment1 = datas.get(0);
+ if(!finSysTenantDepartment1.getId().equals(param.getId())){
+ return ResponseValue.error("姝ょ紪鍙峰凡瀛樺湪");
+ }
+ }
+ int num = this.departmentService.updateFinSysTenantDepartment(param, sysInfo);
return num > 0 ? ResponseValue.success() : ResponseValue.error("缂栬緫澶辫触锛�");
}
@@ -157,19 +191,22 @@
* @Date 2023/10/26
*/
@DeleteMapping("/del")
- public ResponseValue updateById(@RequestBody FinSysTenantDepartment department) {
- if (department.getId() == null) {
+ public ResponseValue updateById() {
+ FinSysTenantDepartment param = CommonUtil.getObjFromReqBody(FinSysTenantDepartment.class);
+ FinSysTenantDepartment finSysTenantDepartment = new FinSysTenantDepartment();
+ CommonUtil.copyProperties(param, finSysTenantDepartment);
+ param = finSysTenantDepartment;
+
+ if (param.getId() == null) {
return ResponseValue.error("閮ㄩ棬id涓虹┖");
}
FinSysTenantUser sysInfo = this.getSysInfo();
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- int num = this.departmentService.updateById(department, sysInfo);
+ int num = this.departmentService.updateById(param, sysInfo);
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鍒犻櫎澶辫触锛�");
}
-
}
-
--
Gitblit v1.9.1