|
@@ -435,9 +435,9 @@ public class SupplierService {
|
|
|
s.setAddress(ExcelUtils.getContent(src, i, 10));
|
|
|
s.setSupplierLevel(ExcelUtils.getContent(src, i, 11));
|
|
|
s.setSettlementMethod(ExcelUtils.getContent(src, i, 12));
|
|
|
- s.setBillingCycleDays(Integer.valueOf(ExcelUtils.getContent(src, i, 13)));
|
|
|
+ s.setBillingCycleDays(parseIntegerFromExcel(ExcelUtils.getContent(src, i, 13)));
|
|
|
s.setProcurementContact(ExcelUtils.getContent(src, i, 14));
|
|
|
- s.setDeliverydays(Integer.valueOf(ExcelUtils.getContent(src, i, 15)));
|
|
|
+ s.setDeliverydays(parseIntegerFromExcel(ExcelUtils.getContent(src, i, 15)));
|
|
|
s.setDescription(ExcelUtils.getContent(src, i, 16));
|
|
|
s.setSort(ExcelUtils.getContent(src, i, 17));
|
|
|
s.setCreator(userInfo==null?null:userInfo.getId());
|
|
@@ -448,6 +448,18 @@ public class SupplierService {
|
|
|
importExcel(sList, type, request);
|
|
|
}
|
|
|
|
|
|
+ private Integer parseIntegerFromExcel(String content) {
|
|
|
+ if (content != null && !content.isEmpty()) {
|
|
|
+ try {
|
|
|
+ return Integer.valueOf(content);
|
|
|
+ } catch (NumberFormatException e) {
|
|
|
+ logger.error("无法解析整数值: {}", content, e);
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
|
|
|
public void importCustomer(MultipartFile file, HttpServletRequest request) throws Exception{
|
|
|
String type = "客户";
|