From 6f5bbc0232582f84f47d0bab0d71e3b177690e40 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期二, 21 二月 2023 10:48:05 +0800
Subject: [PATCH] 手动输入提交
---
src/main/java/com/whyc/service/ECRService.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/service/ECRService.java b/src/main/java/com/whyc/service/ECRService.java
index 8f3ff1b..8635630 100644
--- a/src/main/java/com/whyc/service/ECRService.java
+++ b/src/main/java/com/whyc/service/ECRService.java
@@ -6,6 +6,7 @@
import com.whyc.util.CommonUtil;
import com.whyc.util.DateUtil;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.usermodel.WorkbookFactory;
@@ -57,21 +58,29 @@
String numberCellValue = sheet.getRow(1).getCell(5).getStringCellValue();
String number = numberCellValue.substring(numberCellValue.indexOf("BG"));
- String codeCellValue = sheet.getRow(2).getCell(0).getStringCellValue();
+ Cell codeCell = sheet.getRow(2).getCell(0);
+ if(codeCell == null){
+ return new Response().set(1,false,"鍙樻洿鏂欏彿涓嶈兘涓虹┖!");
+ }
+ String codeCellValue = codeCell.getStringCellValue();
//鍙樻洿鏂欏彿:xxx
String codeStr = codeCellValue.substring(5).trim();
String[] codeSplit;
- if(codeStr == null || codeStr.equals("")){
+ if(codeStr.equals("")){
return new Response().set(1,false,"鍙樻洿鏂欏彿涓嶈兘涓虹┖!");
}else{
codeSplit = codeStr.split("/");
}
- String modelCellValue = sheet.getRow(2).getCell(5).getStringCellValue();
+ Cell modelCell = sheet.getRow(2).getCell(5);
+ if(modelCell == null){
+ return new Response().set(1,false,"鍙樻洿鍨嬪彿涓嶈兘涓虹┖!");
+ }
+ String modelCellValue = modelCell.getStringCellValue();
//鍙樻洿鍚嶇О/鍨嬪彿锛歺xx
String modelStr = modelCellValue.substring(8).trim();
String[] modelSplit;
- if(modelStr == null || modelStr.equals("")){
+ if(modelStr.equals("")){
return new Response().set(1,false,"鍙樻洿鍨嬪彿涓嶈兘涓虹┖!");
}else{
modelSplit = modelStr.split("/");
@@ -171,6 +180,11 @@
ecr.setCreateTime(date);
ecr.setExcelFile(excelHttpUrl);
ecr.setParentModel(parentModel);
+
+ //鏍￠獙鏂欏彿鍜屽瀷鍙峰繀椤绘暟閲忎竴鑷�
+ if(codeSplit.length!=modelSplit.length){
+ return new Response().set(1,false,"鍙樻洿鏂欏彿涓庡瀷鍙峰搴旀暟閲忎笉涓�鑷�!");
+ }
//璧嬪�肩粰鍏蜂綋瀵硅薄
for (int i = 0; i < codeSplit.length; i++) {
ECR ecrTemp = new ECR();
@@ -183,4 +197,34 @@
return new Response().set(1,true,"瀵煎叆瀹屾垚");
}
+
+ public Response ecrImport(ECR ecr) {
+ List<ECR> ecrList = new LinkedList<>();
+ String subCode = ecr.getSubCode();
+ String subModel = ecr.getSubModel();
+
+ //鏍￠獙鏂欏彿鍜屽瀷鍙蜂笉鑳戒负绌�
+ if(subCode == null ||subCode.isEmpty()
+ || subModel == null ||subModel.isEmpty()){
+ return new Response().set(1,false,"鍙樻洿鏂欏彿鍙婂瀷鍙蜂笉鑳戒负绌�!");
+ }
+
+ String[] subCodeSplit = subCode.split("/");
+ String[] subModelSplit = subModel.split("/");
+
+ ecr.setCreateTime(new Date());
+ //鏍￠獙鏂欏彿鍜屽瀷鍙峰繀椤绘暟閲忎竴鑷�
+ if(subCodeSplit.length!=subModelSplit.length){
+ return new Response().set(1,false,"鍙樻洿鏂欏彿涓庡瀷鍙峰搴旀暟閲忎笉涓�鑷�!");
+ }
+ for (int i = 0; i < subCodeSplit.length; i++) {
+ ECR ecrTemp = new ECR();
+ BeanUtils.copyProperties(ecr,ecrTemp);
+ ecrTemp.setSubCode(subCodeSplit[i]);
+ ecrTemp.setSubModel(subModelSplit[i]);
+ ecrList.add(ecrTemp);
+ }
+ mapper.insertBatchSomeColumn(ecrList);
+ return new Response().set(1,true,"瀵煎叆瀹屾垚");
+ }
}
--
Gitblit v1.9.1