From b8dc4ccc6ee580b084aa860e64af2d90d1cb5979 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期三, 29 十一月 2023 10:11:52 +0800
Subject: [PATCH] feat: 1、首页接口对接 2、部门物品分发
---
consum-base/src/main/java/com/consum/base/service/FinSysTenantServiceImpl.java | 96 ++++++++++++------------------------------------
1 files changed, 24 insertions(+), 72 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/FinSysTenantServiceImpl.java
index 686bd31..60fb4a2 100644
--- a/consum-base/src/main/java/com/consum/base/service/FinSysTenantServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/FinSysTenantServiceImpl.java
@@ -7,27 +7,24 @@
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
+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 {
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_BY_PARENT_ID = "SELECT * FROM FIN_SYS_TENANT WHERE parent_id = ?";
- private static final String QUERY_BY_PARENT_CODE = "SELECT * FROM FIN_SYS_TENANT WHERE CODE = ?";
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_LIST_BY_PARENT_ID = "SELECT * FROM FIN_SYS_TENANT WHERE PARENT_ID = ? ORDER BY LV ASC";
+ private static final String QUERY_LV2_ALL = "SELECT * FROM FIN_SYS_TENANT WHERE LV < 3 ORDER BY CODE ASC";
/**
* @Author 锛歱ower
- * @Date 锛� 2023/7/20 20:41
- * 鑾峰彇鍖哄垝淇℃伅 涓昏鐢ㄤ簬缂撳瓨
+ * @Date 锛� 2023/7/20 20:41 鑾峰彇鍖哄垝淇℃伅 涓昏鐢ㄤ簬缂撳瓨
*/
public FinSysTenant queryOneByCode(String code) {
FinSysTenant tenant = new FinSysTenant();
@@ -40,8 +37,6 @@
}
- private static final String QUERY_LV2_ALL = "SELECT * FROM FIN_SYS_TENANT WHERE LV < 3 ORDER BY CODE ASC";
-
public List<FinSysTenant> queryForTree() {
// 灞曠ず鍏ㄩ儴鑺傜偣
return this.select(QUERY_TREE_ALL, new Object[]{}, new FinSysTenant());
@@ -49,8 +44,7 @@
/**
* @Author 锛歱ower
- * @Date 锛� 2023/7/20 16:34
- * 鏍规嵁id 鏌ヨ涓嬬骇鎵�鏈夎妭鐐� 鍦板競鏌ヨ鑷繁 鐪佹煡璇㈡墍鏈夊湴甯�
+ * @Date 锛� 2023/7/20 16:34 鏍规嵁id 鏌ヨ涓嬬骇鎵�鏈夎妭鐐� 鍦板競鏌ヨ鑷繁 鐪佹煡璇㈡墍鏈夊湴甯�
*/
public List<FinSysTenant> queryTreeById(Long id, Integer lv) {
if (lv == 3) {
@@ -71,8 +65,7 @@
/**
* @Author 锛歱ower
- * @Date 锛� 2023/7/21 14:46
- * 鐗规畩鏁版嵁 绂佹鍏朵粬鎺ュ彛浣跨敤
+ * @Date 锛� 2023/7/21 14:46 鐗规畩鏁版嵁 绂佹鍏朵粬鎺ュ彛浣跨敤
*/
public Map<Long, List<FinSysTenant>> queryCountyByCityCode(Long id, Integer lv) {
Map<String, Object> parameter = new HashMap<>(5);
@@ -101,40 +94,10 @@
return this.select(QUERY_LV2_ALL, new Object[]{}, new FinSysTenant());
}
- /**
- * @Description 鏍规嵁鐖剁骇id鑾峰彇涓嬬骇鍒楄〃
- * @Author wh
- * @Date 2023/7/25 13:53
- */
- public List<FinSysTenant> getByParentId(Long parentId) {
- return this.select(QUERY_LIST_BY_PARENT_ID, new Object[]{parentId}, new FinSysTenant());
- }
-
- /**
- * @Description 鏍规嵁鍖哄垝CODE鏌ヨ鍖哄垝淇℃伅
- * @Author wh
- * @Date 2023/9/11 19:16
- */
- public FinSysTenant selectByParentId(String parentId) {
- List<FinSysTenant> select = this.select(QUERY_BY_PARENT_ID, new Object[]{parentId}, new FinSysTenant());
- if (StringUtils.isEmptyList(select)) {
- return null;
- } else {
- return select.get(0);
- }
- }
-
- public FinSysTenant selectByTenantId(String tenantCode) {
- List<FinSysTenant> select = this.select(QUERY_BY_PARENT_CODE, new Object[]{tenantCode}, new FinSysTenant());
- if (StringUtils.isEmptyList(select)) {
- return null;
- } else {
- return select.get(0);
- }
- }
/**
* 鍒犻櫎
+ *
* @author 鍗㈠簡闃�
* @date 2023/10/4
*/
@@ -143,16 +106,16 @@
finSysTenant.setTempId(param.getId());
finSysTenant.setStatus(0);
finSysTenant.setIsDelete(1);
- finSysTenant.setModified(getCurrentDate());
+ finSysTenant.setModified(DateUtils.getDate("yyyy-MM-dd HH:mm:ss"));
finSysTenant.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
finSysTenant.setUpdateBy(sysInfo.getUserName());
return this.update(finSysTenant);
}
-
/**
* 娣诲姞鏈烘瀯
+ *
* @author 鍗㈠簡闃�
* @date 2023/10/4
*/
@@ -181,7 +144,7 @@
finSysTenant.setCode(param.getCode());
//璁剧疆璇︾粏鍦板潃鍙婄粡绾害
finSysTenant.setName(param.getName());
- finSysTenant.setCreateTime3(getCurrentDate());
+ finSysTenant.setCreateTime3(DateUtils.getDate("yyyy-MM-dd HH:mm:ss"));
finSysTenant.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
finSysTenant.setSummary(param.getSummary());
finSysTenant.setCreateBy(sysInfo.getUserName());
@@ -249,37 +212,20 @@
/**
* 鎵归噺娣诲姞鏈烘瀯
+ *
* @author jlq
* @date 2023/10/9
*/
- public void insertFinSysTenantBatch(List<FinSysTenantParam> params, FinSysTenantUser sysInfo, int lv){
+ public void insertFinSysTenantBatch(List<FinSysTenantParam> params, FinSysTenantUser sysInfo, int lv) {
for (FinSysTenantParam param : params) {
- addFinSysTenant(param,sysInfo,lv);
+ addFinSysTenant(param, sysInfo, lv);
}
}
-
-
- /**
- * 鑾峰彇褰撳墠鏃ユ湡
- *
- * @author 鍗㈠簡闃�
- * @date 2023/10/4
- */
- private Date getCurrentDate() {
- Date currentDate = new Date();
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String formattedDate = dateFormat.format(currentDate);
- try {
- Date convertedDate = dateFormat.parse(formattedDate);
- } catch (ParseException e) {
- e.printStackTrace();
- }
- return currentDate;
- }
/**
* 缂栬緫
+ *
* @author 鍗㈠簡闃�
* @date 2023/10/6
*/
@@ -292,9 +238,15 @@
} else {
finSysTenant.setLv3Name(finSysTenant.getName());
}
- finSysTenant.setModified(getCurrentDate());
+ finSysTenant.setModified(DateUtils.getDate("yyyy-MM-dd HH:mm:ss"));
finSysTenant.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
finSysTenant.setUpdateBy(sysInfo.getUserName());
return this.update(finSysTenant);
}
+
+ public FinSysTenant selectById(Long id) {
+ FinSysTenant tenant = new FinSysTenant();
+ tenant.setTempId(id);
+ return this.get(tenant);
+ }
}
--
Gitblit v1.9.1