From fda942a13398486e58f60b8897dd168e771ac8dc Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 21 十二月 2023 13:23:14 +0800
Subject: [PATCH] 机构新增和编辑
---
admin-web/src/api/baseSetting/finsystenant.js | 18 ++++++++++++++++++
consum-base/src/main/java/com/consum/base/service/FinSysTenantService.java | 2 --
admin-web/src/views/systemManger/org/edit.vue | 8 +++++---
consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantServiceImpl.java | 9 +++++----
4 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/admin-web/src/api/baseSetting/finsystenant.js b/admin-web/src/api/baseSetting/finsystenant.js
index d6fff5e..d6bdea5 100644
--- a/admin-web/src/api/baseSetting/finsystenant.js
+++ b/admin-web/src/api/baseSetting/finsystenant.js
@@ -163,3 +163,21 @@
params,
});
}
+
+// 鏈烘瀯鏂板
+export function addTenant(data) {
+ return request({
+ url: '/pc/fin/sys/tenant/add',
+ method: 'post',
+ data: data
+ });
+}
+// 鏈烘瀯缂栬緫
+export function editTenant(data) {
+ return request({
+ url: '/pc/fin/sys/tenant/edit',
+ method: 'post',
+ data: data
+ });
+}
+
diff --git a/admin-web/src/views/systemManger/org/edit.vue b/admin-web/src/views/systemManger/org/edit.vue
index 2ceda56..d7cce1d 100644
--- a/admin-web/src/views/systemManger/org/edit.vue
+++ b/admin-web/src/views/systemManger/org/edit.vue
@@ -34,6 +34,7 @@
import winSm from '@/components/win/win-sm'
import myButton from '@/components/myButton/myButton'
import * as finsystenant from '@/api/baseSetting/finsystenant'
+import {addTenant, editTenant} from "@/api/baseSetting/finsystenant";
export default {
components: {winSm, myButton},
@@ -53,6 +54,7 @@
name: '',
status: 1,
summary: '',
+ parentId: '',
},
rules: {
code: [
@@ -82,7 +84,7 @@
const params = Object.assign({}, this.formData)
if(this.setting.id){
// 缂栬緫鎺ュ彛
- finsystenant.edit(params).then(res => {
+ finsystenant.editTenant(params).then(res => {
if (res) {
this.$message.success('淇濆瓨鎴愬姛锛�')
this.close()
@@ -92,8 +94,8 @@
}
})
}else{
- params.orgId = this.setting.orgId
- finsystenant.add(params).then(res => {
+ params.parentId = this.setting.orgId
+ finsystenant.addTenant(params).then(res => {
if (res) {
this.$message.success('淇濆瓨鎴愬姛锛�')
this.close()
diff --git a/consum-base/src/main/java/com/consum/base/service/FinSysTenantService.java b/consum-base/src/main/java/com/consum/base/service/FinSysTenantService.java
index 3eccac0..2d8139c 100644
--- a/consum-base/src/main/java/com/consum/base/service/FinSysTenantService.java
+++ b/consum-base/src/main/java/com/consum/base/service/FinSysTenantService.java
@@ -27,8 +27,6 @@
int addFinSysTenant(FinSysTenantParam param, FinSysTenantUser sysInfo, int lv);
- void setLvIdAndName(FinSysTenantParam param, FinSysTenant finSysTenant, long id, int lv);
-
void insertFinSysTenantBatch(List<FinSysTenantParam> params, FinSysTenantUser sysInfo, int lv);
int updateFinSysTenant(FinSysTenant finSysTenant, FinSysTenantUser sysInfo);
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantServiceImpl.java
index b6e9692..9a89bdd 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantServiceImpl.java
@@ -17,6 +17,8 @@
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
+import cn.hutool.core.date.DateUtil;
+
@Service
public class FinSysTenantServiceImpl extends BaseServiceImpl implements FinSysTenantService {
@@ -129,7 +131,7 @@
List<Map<String, Object>> list = this.select(sql.toString(), paramts);
long id = 0L;
- if (!CollectionUtils.isEmpty(list) && list.get(0).get("max(id)") != null) {
+ if (!CollectionUtils.isEmpty(list)) {
id = (Long)list.get(0).get("max(id)") + 1;
} else {
id = param.getParentId() * 1000 + 1;
@@ -142,7 +144,7 @@
finSysTenant.setCode(param.getCode());
// 璁剧疆璇︾粏鍦板潃鍙婄粡绾害
finSysTenant.setName(param.getName());
- finSysTenant.setCreateTime3(DateUtils.getDate("yyyy-MM-dd HH:mm:ss"));
+ finSysTenant.setCreateTime3(DateUtil.date());
finSysTenant.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
finSysTenant.setSummary(param.getSummary());
finSysTenant.setCreateBy(sysInfo.getUserName());
@@ -159,7 +161,6 @@
* @author 鍗㈠簡闃�
* @date 2023/10/4
*/
- @Override
public void setLvIdAndName(FinSysTenantParam param, FinSysTenant finSysTenant, long id, int lv) {
if (lv == 2) { // 鏂板甯傜骇鏈烘瀯
// 鏌ヨ涓婁竴绾� - 鐪佺骇
@@ -237,7 +238,7 @@
} else {
finSysTenant.setLv3Name(finSysTenant.getName());
}
- finSysTenant.setModified(DateUtils.getDate("yyyy-MM-dd HH:mm:ss"));
+ finSysTenant.setModified(DateUtil.date());
finSysTenant.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
finSysTenant.setUpdateBy(sysInfo.getUserName());
return this.update(finSysTenant);
--
Gitblit v1.9.1