From ba8ef8a3d6d32b3637db60857a683137e27072ad Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期四, 23 二月 2023 11:58:21 +0800
Subject: [PATCH] ECR excel导入字段校验

---
 src/main/java/com/whyc/service/ECRService.java |   54 ++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/whyc/service/ECRService.java b/src/main/java/com/whyc/service/ECRService.java
index 7e94c72..1bd8ab3 100644
--- a/src/main/java/com/whyc/service/ECRService.java
+++ b/src/main/java/com/whyc/service/ECRService.java
@@ -61,12 +61,19 @@
         Sheet sheet = workbook.getSheetAt(0);
         List<ECR> ecrList = new LinkedList<>();
         ECR ecr = new ECR();
-        String numberCellValue = sheet.getRow(1).getCell(5).getStringCellValue();
-        String number = numberCellValue.substring(numberCellValue.indexOf("BG"));
+        Cell numberCell = sheet.getRow(1).getCell(5);
+        if(numberCell == null || !numberCell.getStringCellValue().contains("ECR缂栧彿")){
+            return new Response().set(1,false,"ECR缂栧彿涓嶈兘涓虹┖鎴栧崟鍏冩牸鏍煎紡涓嶈鑼�!");
+        }
+        String numberCellValue = numberCell.getStringCellValue();
+        String number = numberCellValue.substring(6).trim();
+        if(number.equals("")){
+            return new Response().set(1,false,"ECR缂栧彿涓嶈兘涓虹┖!");
+        }
 
         Cell codeCell = sheet.getRow(2).getCell(0);
-        if(codeCell == null){
-            return new Response().set(1,false,"鍙樻洿鏂欏彿涓嶈兘涓虹┖!");
+        if(codeCell == null || !codeCell.getStringCellValue().contains("鍙樻洿鏂欏彿")){
+            return new Response().set(1,false,"鍙樻洿鏂欏彿涓嶈兘涓虹┖鎴栧崟鍏冩牸鏍煎紡涓嶈鑼�!");
         }
         String codeCellValue = codeCell.getStringCellValue();
         //鍙樻洿鏂欏彿:xxx
@@ -79,8 +86,8 @@
         }
 
         Cell modelCell = sheet.getRow(2).getCell(5);
-        if(modelCell == null){
-            return new Response().set(1,false,"鍙樻洿鍨嬪彿涓嶈兘涓虹┖!");
+        if(modelCell == null || !modelCell.getStringCellValue().contains("鍙樻洿鍚嶇О/鍨嬪彿")){
+            return new Response().set(1,false,"鍙樻洿鍨嬪彿涓嶈兘涓虹┖鎴栧崟鍏冩牸鏍煎紡涓嶈鑼�!");
         }
         String modelCellValue = modelCell.getStringCellValue();
         //鍙樻洿鍚嶇О/鍨嬪彿锛歺xx
@@ -92,18 +99,43 @@
             modelSplit = modelStr.split("/");
         }
 
-        String proposeDateCellValue = sheet.getRow(2).getCell(14).getStringCellValue();
+        Cell proposeDateCell = sheet.getRow(2).getCell(14);
+        if(proposeDateCell == null || !proposeDateCell.getStringCellValue().contains("鐢宠鏃ユ湡")){
+            return new Response().set(1,false,"鐢宠鏃ユ湡涓嶈兘涓虹┖鎴栧崟鍏冩牸鏍煎紡涓嶈鑼�!");
+        }
+        String proposeDateCellValue = proposeDateCell.getStringCellValue();
         //鐢宠鏃ユ湡锛歺xx
         String proposeDateStr = proposeDateCellValue.substring(5).trim();
+        if(proposeDateStr.equals("")){
+            return new Response().set(1,false,"鐢宠鏃ユ湡涓嶈兘涓虹┖!");
+        }
         Date proposeDate = DateUtil.YYYY_MM_DD_UNION.parse(proposeDateStr);
 
-        String proposerCellValue = sheet.getRow(2).getCell(22).getStringCellValue();
+        Cell proposerCell = sheet.getRow(2).getCell(22);
+        if(proposerCell == null || !proposerCell.getStringCellValue().contains("鐢宠浜�")){
+            return new Response().set(1,false,"鐢宠浜轰笉鑳戒负绌烘垨鍗曞厓鏍兼牸寮忎笉瑙勮寖!");
+        }
+        String proposerCellValue = proposerCell.getStringCellValue();
         //鐢宠浜猴細xxx
         String proposer = proposerCellValue.substring(4).trim();
+        if(proposer.equals("")){
+            return new Response().set(1,false,"鐢宠浜轰笉鑳戒负绌�!");
+        }
 
-        String parentModel = sheet.getRow(3).getCell(0).getStringCellValue().substring(10).trim();
+        Cell parentModelCell = sheet.getRow(3).getCell(0);
+        if(parentModelCell == null || !parentModelCell.getStringCellValue().contains("鍙樻洿鎵�灞炴満鍨�/绯诲垪")){
+            return new Response().set(1,false,"鐗╂枡鎵�灞炲瀷鍙蜂笉鑳戒负绌烘垨鍗曞厓鏍兼牸寮忎笉瑙勮寖!");
+        }
+        String parentModel = parentModelCell.getStringCellValue().substring(10).trim();
+        if(parentModel.equals("")){
+            return new Response().set(1,false,"鐗╂枡鎵�灞炲瀷鍙蜂笉鑳戒负绌�!");
+        }
 
-        String changeDescriptionCellValue = sheet.getRow(4).getCell(0).getStringCellValue();
+        Cell changeDescriptionCell = sheet.getRow(4).getCell(0);
+        if(changeDescriptionCell == null || changeDescriptionCell.getStringCellValue().trim().equals("")){
+            return new Response().set(1,false,"鍙樻洿鎻忚堪涓嶈兘涓虹┖!");
+        }
+        String changeDescriptionCellValue = changeDescriptionCell.getStringCellValue();
 
         //鐢宠鍙樻洿褰掔被:index浠�16-22,琚�変腑鐨勬爣璇嗕负鈻燚.鍝佽川鏀瑰杽
         StringBuilder changeTypeBuilder = new StringBuilder();
@@ -175,6 +207,8 @@
         if(solutionCellValue.contains("鈻�")){
             String solutionStr = solutionCellValue.split("鈻�")[1];
             solution = solutionStr.split("\\.")[1];
+        }else{
+            return new Response().set(1,false,"澶勭悊鏂瑰紡蹇呴』閫変腑涓�椤�!");
         }
 
         //鍏堝皢鍏卞悓灞炴�ц祴鍊肩粰鍩虹瀵硅薄

--
Gitblit v1.9.1