From 2c706a5d58e8315980ea92d6b82e0e4959bad8ca Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 11 十二月 2023 17:44:40 +0800
Subject: [PATCH] 1.修改单据导出 2.修改物品信息导入
---
consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantServiceImpl.java | 91 ++++++++++++++++++++++++---------------------
1 files changed, 49 insertions(+), 42 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/FinSysTenantServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantServiceImpl.java
similarity index 81%
rename from consum-base/src/main/java/com/consum/base/service/FinSysTenantServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantServiceImpl.java
index 60fb4a2..b6e9692 100644
--- a/consum-base/src/main/java/com/consum/base/service/FinSysTenantServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantServiceImpl.java
@@ -1,31 +1,36 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Service;
import com.consum.base.pojo.FinSysTenantParam;
+import com.consum.base.service.FinSysTenantService;
import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantUser;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import org.springframework.stereotype.Service;
@Service
-public class FinSysTenantServiceImpl extends BaseServiceImpl {
+public class FinSysTenantServiceImpl extends BaseServiceImpl implements FinSysTenantService {
- private static final String QUERY_TREE_ALL = "select * from FIN_SYS_TENANT where is_delete = 0 and status = 1 order by parent_id, LV ASC";
+ private static final String QUERY_TREE_ALL =
+ "select * from FIN_SYS_TENANT where is_delete = 0 and status = 1 order by parent_id, LV ASC";
private static final String QUERY_TREE_BY_CODE = "SELECT * FROM FIN_SYS_TENANT ";
- private static final String QUERY_LIST_BY_CITY_CODE = "SELECT ID, NAME, CODE, CASE WHEN LV = 2 THEN ID ELSE PARENT_ID END AS PARENT_ID, LV, TENANT_TYPE, BELONG_PROVINCE FROM FIN_SYS_TENANT ";
- private static final String QUERY_LV2_ALL = "SELECT * FROM FIN_SYS_TENANT WHERE LV < 3 ORDER BY CODE ASC";
+ private static final String QUERY_LIST_BY_CITY_CODE =
+ "SELECT ID, NAME, CODE, CASE WHEN LV = 2 THEN ID ELSE PARENT_ID END AS PARENT_ID, LV, TENANT_TYPE, BELONG_PROVINCE FROM FIN_SYS_TENANT ";
/**
* @Author 锛歱ower
* @Date 锛� 2023/7/20 20:41 鑾峰彇鍖哄垝淇℃伅 涓昏鐢ㄤ簬缂撳瓨
*/
+ @Override
public FinSysTenant queryOneByCode(String code) {
FinSysTenant tenant = new FinSysTenant();
tenant.setCode(code);
@@ -36,16 +41,17 @@
return null;
}
-
+ @Override
public List<FinSysTenant> queryForTree() {
// 灞曠ず鍏ㄩ儴鑺傜偣
- return this.select(QUERY_TREE_ALL, new Object[]{}, new FinSysTenant());
+ return this.select(QUERY_TREE_ALL, new Object[] {}, new FinSysTenant());
}
/**
* @Author 锛歱ower
* @Date 锛� 2023/7/20 16:34 鏍规嵁id 鏌ヨ涓嬬骇鎵�鏈夎妭鐐� 鍦板競鏌ヨ鑷繁 鐪佹煡璇㈡墍鏈夊湴甯�
*/
+ @Override
public List<FinSysTenant> queryTreeById(Long id, Integer lv) {
if (lv == 3) {
return new ArrayList<>();
@@ -67,6 +73,7 @@
* @Author 锛歱ower
* @Date 锛� 2023/7/21 14:46 鐗规畩鏁版嵁 绂佹鍏朵粬鎺ュ彛浣跨敤
*/
+ @Override
public Map<Long, List<FinSysTenant>> queryCountyByCityCode(Long id, Integer lv) {
Map<String, Object> parameter = new HashMap<>(5);
StringBuilder sql = new StringBuilder(QUERY_LIST_BY_CITY_CODE);
@@ -80,20 +87,10 @@
}
sql.append(" ORDER BY PARENT_ID ,ID ");
List<FinSysTenant> list = this.select(sql.toString(), parameter, new FinSysTenant());
- // return list.stream().filter(tenant -> Objects.nonNull(tenant.getParentId())).collect(Collectors.groupingBy(FinSysTenant::getParentId));
+ // return list.stream().filter(tenant ->
+ // Objects.nonNull(tenant.getParentId())).collect(Collectors.groupingBy(FinSysTenant::getParentId));
return list.stream().collect(Collectors.groupingBy(FinSysTenant::getParentId));
}
-
-
- /**
- * @Description 鏌ヨ鎵�鏈夌殑甯傜骇甯︽渤鍗楃渷鐨勫尯鍒�
- * @Author wh
- * @Date 2023/7/20 15:29
- */
- public List<FinSysTenant> selectByLV2() {
- return this.select(QUERY_LV2_ALL, new Object[]{}, new FinSysTenant());
- }
-
/**
* 鍒犻櫎
@@ -101,6 +98,7 @@
* @author 鍗㈠簡闃�
* @date 2023/10/4
*/
+ @Override
public int updateById(FinSysTenantParam param, FinSysTenantUser sysInfo) {
FinSysTenant finSysTenant = new FinSysTenant();
finSysTenant.setTempId(param.getId());
@@ -112,17 +110,17 @@
return this.update(finSysTenant);
}
-
/**
* 娣诲姞鏈烘瀯
*
* @author 鍗㈠簡闃�
* @date 2023/10/4
*/
+ @Override
public int addFinSysTenant(FinSysTenantParam param, FinSysTenantUser sysInfo, int lv) {
FinSysTenant finSysTenant = new FinSysTenant();
- //id鍜宼empId
+ // id鍜宼empId
StringBuilder sql = new StringBuilder("SELECT max(id) FROM fin_sys_tenant WHERE 1=1");
HashMap<String, Object> paramts = new HashMap<>();
@@ -132,7 +130,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) {
- id = (Long) list.get(0).get("max(id)") + 1;
+ id = (Long)list.get(0).get("max(id)") + 1;
} else {
id = param.getParentId() * 1000 + 1;
}
@@ -142,13 +140,13 @@
finSysTenant.setParentId(param.getParentId());
finSysTenant.setCode(param.getCode());
- //璁剧疆璇︾粏鍦板潃鍙婄粡绾害
+ // 璁剧疆璇︾粏鍦板潃鍙婄粡绾害
finSysTenant.setName(param.getName());
finSysTenant.setCreateTime3(DateUtils.getDate("yyyy-MM-dd HH:mm:ss"));
finSysTenant.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
finSysTenant.setSummary(param.getSummary());
finSysTenant.setCreateBy(sysInfo.getUserName());
- //璁剧疆鍚勫眰绾d鍙婂悕绉�
+ // 璁剧疆鍚勫眰绾d鍙婂悕绉�
finSysTenant.setLv(lv);
setLvIdAndName(param, finSysTenant, id, lv);
@@ -161,9 +159,10 @@
* @author 鍗㈠簡闃�
* @date 2023/10/4
*/
- private void setLvIdAndName(FinSysTenantParam param, FinSysTenant finSysTenant, long id, int lv) {
- if (lv == 2) { //鏂板甯傜骇鏈烘瀯
- //鏌ヨ涓婁竴绾� - 鐪佺骇
+ @Override
+ public void setLvIdAndName(FinSysTenantParam param, FinSysTenant finSysTenant, long id, int lv) {
+ if (lv == 2) { // 鏂板甯傜骇鏈烘瀯
+ // 鏌ヨ涓婁竴绾� - 鐪佺骇
FinSysTenant finSysTenant1 = this.get(new FinSysTenant(param.getParentId()));
if (finSysTenant1 != null) {
finSysTenant.setLv1Id(finSysTenant1.getId());
@@ -171,11 +170,11 @@
finSysTenant.setLv2Id(id);
finSysTenant.setLv2Name(param.getName());
}
- } else if (lv == 3) { //鏂板鍘跨骇鏈烘瀯
- //鏌ヨ涓婁竴绾� - 甯傜骇
+ } else if (lv == 3) { // 鏂板鍘跨骇鏈烘瀯
+ // 鏌ヨ涓婁竴绾� - 甯傜骇
FinSysTenant finSysTenant2 = this.get(new FinSysTenant(param.getParentId()));
if (finSysTenant2 != null) {
- //鏌ヨ涓婁竴绾� - 鐪佺骇
+ // 鏌ヨ涓婁竴绾� - 鐪佺骇
FinSysTenant finSysTenant1 = this.get(new FinSysTenant(finSysTenant2.getParentId()));
finSysTenant.setLv1Id(finSysTenant1.getId());
@@ -185,14 +184,14 @@
finSysTenant.setLv3Id(id);
finSysTenant.setLv3Name(param.getName());
}
- } else if (lv == 4) { //鏂板鏀眬鏈烘瀯
- //鏌ヨ涓婁竴绾� - 鍘跨骇
+ } else if (lv == 4) { // 鏂板鏀眬鏈烘瀯
+ // 鏌ヨ涓婁竴绾� - 鍘跨骇
FinSysTenant finSysTenant3 = this.get(new FinSysTenant(param.getParentId()));
if (finSysTenant3 != null) {
- //鏌ヨ涓婁竴绾� - 甯傜骇
+ // 鏌ヨ涓婁竴绾� - 甯傜骇
FinSysTenant finSysTenant2 = this.get(new FinSysTenant(finSysTenant3.getParentId()));
if (finSysTenant2 != null) {
- //鏌ヨ涓婁竴绾� - 鐪佺骇
+ // 鏌ヨ涓婁竴绾� - 鐪佺骇
FinSysTenant sysTenant1 = this.get(new FinSysTenant(finSysTenant2.getParentId()));
if (sysTenant1 != null) {
finSysTenant.setLv1Id(sysTenant1.getId());
@@ -209,19 +208,18 @@
}
}
-
/**
* 鎵归噺娣诲姞鏈烘瀯
*
* @author jlq
* @date 2023/10/9
*/
+ @Override
public void insertFinSysTenantBatch(List<FinSysTenantParam> params, FinSysTenantUser sysInfo, int lv) {
for (FinSysTenantParam param : params) {
addFinSysTenant(param, sysInfo, lv);
}
}
-
/**
* 缂栬緫
@@ -229,6 +227,7 @@
* @author 鍗㈠簡闃�
* @date 2023/10/6
*/
+ @Override
public int updateFinSysTenant(FinSysTenant finSysTenant, FinSysTenantUser sysInfo) {
Integer lv = finSysTenant.getLv();
if (lv == 1) {
@@ -244,9 +243,17 @@
return this.update(finSysTenant);
}
+ @Override
public FinSysTenant selectById(Long id) {
FinSysTenant tenant = new FinSysTenant();
tenant.setTempId(id);
return this.get(tenant);
}
+
+ @Override
+ public FinSysTenant selectByName(String tenantName) {
+ FinSysTenant tenant = new FinSysTenant();
+ tenant.setName(tenantName);
+ return this.select(tenant).stream().findFirst().orElse(null);
+ }
}
--
Gitblit v1.9.1