From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/service/SysSupplierServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysSupplierServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysSupplierServiceImpl.java
index 195e741..01a3dd0 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysSupplierServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysSupplierServiceImpl.java
@@ -6,6 +6,7 @@
import com.nanometer.smartlab.exception.AlarmException;
import com.nanometer.smartlab.exception.BusinessException;
import com.nanometer.smartlab.exception.ExceptionEnumCode;
+import com.nanometer.smartlab.util.ExcelUtils;
import com.nanometer.smartlab.util.IDUtils;
import com.nanometer.smartlab.util.MessageUtil;
import org.apache.commons.lang.StringUtils;
@@ -73,7 +74,7 @@
}
@Transactional(propagation = Propagation.REQUIRED)
- public SysSupplier getSysSupplier(String id) {
+ public SysSupplier getSysSupplier(Long id) {
try {
return this.sysSupplierDao.getSysSupplier(id);
} catch (DataAccessException e) {
@@ -83,7 +84,7 @@
}
@Override
- public String getSysSupplierId(String name, String groupId) {
+ public Long getSysSupplierId(String name, Long groupId) {
try {
return this.sysSupplierDao.getSysSupplierId(name, groupId);
} catch (DataAccessException e) {
@@ -93,7 +94,7 @@
}
@Override
- public String getSysSupplierIdByname(String name) {
+ public Long getSysSupplierIdByname(String name) {
try {
return this.sysSupplierDao.getSysSupplierIdByname(name);
} catch (DataAccessException e) {
@@ -105,9 +106,9 @@
@Transactional(propagation = Propagation.REQUIRED)
public SysSupplier insertSysSupplier(SysSupplier sysSupplier) {
try {
- if (sysSupplier.getId() == null) {
- sysSupplier.setId(IDUtils.uuid());
- }
+// if (sysSupplier.getId() == null) {
+// sysSupplier.setId(IDUtils.uuid());
+// }
this.sysSupplierDao.insertSysSupplier(sysSupplier);
return sysSupplier;
} catch (DuplicateKeyException ex) {
@@ -150,7 +151,7 @@
return false;
}
- List<String> ids = new ArrayList<String>();
+ List<Long> ids = new ArrayList<Long>();
for (SysSupplier sysSupplier : sysSupplierList) {
ids.add(sysSupplier.getId());
}
@@ -175,7 +176,7 @@
public void importSupplier(FileUploadEvent event) throws Exception {
List<SysSupplier> list = sysSupplierDao.getSysSupplierList(new HashMap());
- Map<String, String> supplierMap = new HashMap();
+ Map<String, Long> supplierMap = new HashMap();
list.forEach(supplier -> {
supplierMap.put(supplier.getName(), supplier.getId());
});
@@ -217,6 +218,9 @@
}
valuesList.add(cellInfo);
}
+ if (valuesList.size() != 4){
+ break;
+ }
SysSupplier sysSupplier = new SysSupplier();
//这一行有供应商是数据库里的就跳过
@@ -224,7 +228,7 @@
continue;
}
- sysSupplier.setId(IDUtils.uuid());
+ // sysSupplier.setId(IDUtils.uuid());
sysSupplier.setName(valuesList.get(0));
sysSupplier.setPersonName(valuesList.get(1));
sysSupplier.setPhone(valuesList.get(2));
@@ -239,4 +243,26 @@
}
+ @Override
+ public List<Map> exportExcelList(String name) {
+ Map<String, String> params = new HashMap<>();
+ params.put("name", name);
+ return sysSupplierDao.exportExcelList(params);
+ }
+
+ @Override
+ public void export2Excel(List<Map> list) throws Exception {
+ Map<String,String> map = new LinkedHashMap<>();
+ map.put("name", "供应商名");
+ map.put("personName", "联系人");
+ map.put("phone", "电话");
+ map.put("memo", "备注");
+ ExcelUtils.export2Excel(list,"供应商信息",map);
+ }
+
+ @Override
+ public SysSupplier getSysSupplierByName(String name) {
+ return sysSupplierDao.getSysSupplierByName(name);
+ }
+
}
--
Gitblit v1.9.2