From 33032d320cb75854def7391026b0401f1bfb8360 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期六, 11 五月 2024 17:26:02 +0800
Subject: [PATCH] 20240511修改: 分发单优化， 分类，物品，分发单明细，采购单明细数据导入
---
consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantDepartmentServiceImpl.java | 123 ++++++++++++++++++++++++++--------------
1 files changed, 80 insertions(+), 43 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantDepartmentServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantDepartmentServiceImpl.java
index c1657c7..f017e97 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantDepartmentServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantDepartmentServiceImpl.java
@@ -1,5 +1,11 @@
package com.consum.base.service.impl;
+import java.util.HashMap;
+import java.util.List;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
import com.consum.base.Constants;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.pojo.FinSysTenantDepartmentParam;
@@ -10,12 +16,6 @@
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
/**
* @Description 閮ㄩ棬绠＄悊
@@ -25,28 +25,32 @@
@Service
public class FinSysTenantDepartmentServiceImpl extends BaseServiceImpl implements FinSysTenantDepartmentService {
- private static final String QUERY_BY_CODE = "SELECT * FROM fin_sys_tenant_department WHERE CODE = ?";
-
/**
* @Description 鏍规嵁 閮ㄩ棬鍚嶇О鍜屾満鏋刬d 鏌ヨ閮ㄩ棬
* @Author 鍗㈠簡闃�
* @Date 2023/10/26
*/
@Override
- public FinSysTenantDepartment getByNameAndTenantId(String name, Long tenantId) {
+ public FinSysTenantDepartment getTenantDepartment(String name, Long tenantId, String code) {
StringBuilder sql = new StringBuilder("SELECT * FROM fin_sys_tenant_department WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
- //閮ㄩ棬鍚嶇О
+ // 閮ㄩ棬鍚嶇О
if (!StringUtils.isEmpty(name)) {
sql.append(" and name =:name ");
paramts.put("name", name);
}
- //鏈烘瀯id
+ // 鏈烘瀯id
if (tenantId != null) {
- sql.append(" and TENANT_ID =:TENANT_ID ");
- paramts.put("TENANT_ID", tenantId);
+ sql.append(" and TENANT_ID =:tenantId ");
+ paramts.put("tenantId", tenantId);
}
+ if (!StringUtils.isEmpty(code)) {
+ sql.append("and CODE = :code ");
+ paramts.put("code", code);
+ }
+
+ sql.append("and status = 1");
return this.get(sql.toString(), paramts, new FinSysTenantDepartment());
}
@@ -61,9 +65,9 @@
BeanUtils.copyProperties(param, department);
department.setId(IdUtil.generateId());
- //鍒涘缓浜哄鍚�
+ // 鍒涘缓浜哄鍚�
department.setCreateBy(sysInfo.getUserName());
- //鍒涘缓鏃堕棿
+ // 鍒涘缓鏃堕棿
department.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
return this.insert(department);
@@ -79,48 +83,31 @@
StringBuilder sql = new StringBuilder("SELECT * FROM fin_sys_tenant_department WHERE 1 = 1 and is_delete = 0 ");
HashMap<String, Object> paramts = new HashMap<>();
- //閮ㄩ棬鍚嶇О
+ // 閮ㄩ棬鍚嶇О
if (!StringUtils.isEmpty(param.getName())) {
sql.append(" and name like:name ");
paramts.put("name", StringUtils.CHAR_PERCENT + param.getName() + StringUtils.CHAR_PERCENT);
}
- //缂栧彿
+ // 缂栧彿
if (!StringUtils.isEmpty(param.getCode())) {
sql.append(" and code like:code ");
paramts.put("code", StringUtils.CHAR_PERCENT + param.getCode() + StringUtils.CHAR_PERCENT);
}
- //鐘舵��
+ // 鐘舵��
if (param.getStatus() != null) {
sql.append(" and status =:status ");
paramts.put("status", param.getStatus());
}
- //鏈烘瀯id
+ // 鏈烘瀯id
if (param.getTenantId() != null) {
- sql.append(" and TENANT_ID =:TENANT_ID ");
- paramts.put("TENANT_ID", param.getTenantId());
+ sql.append(" and TENANT_ID =:tenantId ");
+ paramts.put("tenantId", param.getTenantId());
} else {
sql.append(" and TENANT_ID = 100 ");
}
sql.append(" ORDER BY ORDER_NUM,CREATE_TIME DESC ");
return selectSplit(sql.toString(), paramts, new FinSysTenantDepartment());
- }
-
- @Override
- public FinSysTenantDepartment selectByCode(String code, Long id) {
- StringBuilder sql = new StringBuilder(QUERY_BY_CODE);
- ArrayList<Object> param = new ArrayList<>(2);
- param.add(code);
- if (id != null) {
- sql.append(" and id != ?");
- param.add(id);
- }
- List<FinSysTenantDepartment> select = this.select(sql.toString(), param.toArray(), new FinSysTenantDepartment());
- if (StringUtils.isEmptyList(select)) {
- return null;
- } else {
- return select.get(0);
- }
}
/**
@@ -156,9 +143,9 @@
@Override
public int updateById(FinSysTenantDepartment department, FinSysTenantUser currentUser) {
department.setIsDelete(Constants.IS_DELETE_YES);
- //鍒犻櫎鏃堕棿
+ // 鍒犻櫎鏃堕棿
department.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
- //鍒犻櫎浜哄鍚�
+ // 鍒犻櫎浜哄鍚�
department.setUpdateBy(currentUser.getUserName());
return this.update(department);
}
@@ -174,11 +161,61 @@
StringBuilder sql = new StringBuilder("SELECT * FROM fin_sys_tenant_department WHERE 1 = 1 and is_delete = 0 ");
HashMap<String, Object> paramts = new HashMap<>();
- //鏈烘瀯id
+ // 鏈烘瀯id
if (agencyId != null) {
- sql.append(" and TENANT_ID =:TENANT_ID ");
- paramts.put("TENANT_ID", agencyId);
+ sql.append(" and TENANT_ID =:tenantId ");
+ paramts.put("tenantId", agencyId);
}
return this.select(sql.toString(), paramts, new FinSysTenantDepartment());
}
+
+ @Override
+ public FinSysTenantDepartment getByTenantIdAndName(Long agencyId, String name) {
+ StringBuilder sql = new StringBuilder("SELECT * FROM fin_sys_tenant_department WHERE 1 = 1 and is_delete = 0 ");
+ HashMap<String, Object> paramts = new HashMap<>();
+
+ // 鏈烘瀯id
+ if (agencyId != null) {
+ sql.append(" and TENANT_ID =:tenantId ");
+ paramts.put("tenantId", agencyId);
+ }
+ // name
+ if (name != null) {
+ sql.append(" and name =:name ");
+ paramts.put("name", name);
+ }
+ List<FinSysTenantDepartment> select = this.select(sql.toString(), paramts, new FinSysTenantDepartment());
+ if(select!=null && select.size()>0){
+ return select.get(0);
+ }
+ return null;
+ }
+
+ @Override
+ public List<FinSysTenantDepartment> queryDataList(FinSysTenantDepartmentParam param) {
+ StringBuilder sql = new StringBuilder("SELECT * FROM fin_sys_tenant_department WHERE 1 = 1");
+ HashMap<String, Object> paramts = new HashMap<>();
+ // 缂栧彿
+ if (!StringUtils.isEmpty(param.getCode())) {
+ sql.append(" and code =:code ");
+ paramts.put("code", param.getCode());
+ }
+ List<FinSysTenantDepartment> select = this.select(sql.toString(), paramts, new FinSysTenantDepartment());
+ return select;
+ }
+
+ /**
+ * 鏍规嵁閮ㄩ棬鍜屾満鏋勫悕鏌ユ壘瀵瑰簲鐨勯儴闂ㄤ俊鎭�
+ * @param tenantName
+ * @param departmentName
+ * @return
+ */
+ @Override
+ public FinSysTenantDepartment queryIdByTenDepName(String tenantName, String departmentName ) {
+ StringBuilder sql = new StringBuilder("SELECT * FROM fin_sys_tenant_department \n" +
+ "WHERE TENANT_ID = ( SELECT id FROM fin_sys_tenant WHERE NAME = '"+tenantName+"' LIMIT 1 ) AND NAME = '"+departmentName+"' LIMIT 1 ");
+ HashMap<String, Object> paramts = new HashMap<>();
+ return this.get(sql.toString(), paramts, new FinSysTenantDepartment());
+ }
+
}
--
Gitblit v1.9.1