From 09fe1bd3097124f1d75fcf484c5dbf244c5563ef Mon Sep 17 00:00:00 2001
From: SUNJIABIN <sunjiabin0907@163.com>
Date: Fri, 31 Mar 2023 15:36:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E4=B8=9A=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarBussionessStandServiceImpl.java   | 106 ++++++++++--------
 1 file changed, 60 insertions(+), 46 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index 5465ff1b..a0227d72 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -2148,7 +2148,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                  return Result.error("fail", "读取失败，请严格按照模板文件导入数据");
                                              }
                                              SarBussStandAttrInfoExecl sarBussStandAttrInfo = new SarBussStandAttrInfoExecl();
-                                             if (i != 0 && i != 1) {
+                                             if (i != 0 && i != 1 && !rowList.equals("") && rowList != null ) {
 
                                                  String standSort = rowList.get("*企标类别");
                                                  if (StringUtils.isNotBlank(standSort)) {
@@ -2377,68 +2377,75 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                  }
 
                                                  String sycxclass = rowList.get("适用车型");
-                                                 String[] strings = sycxclass.split(",");
-                                                 String sycx = "";
-                                                 String sycxs = "";
-                                                 if (ObjectUtils.isNotEmpty(strings)) {
-                                                     for (int j = 0; j < strings.length; j++) {
-                                                         sycx = strings[j];
-                                                         if (sycx.equals("N1") || sycx.equals("N2") || sycx.equals("N3") || sycx.equals("M1") || sycx.equals("M2") || sycx.equals("M3")) {
-                                                             if (StringUtils.isNotBlank(sycxs)){
-                                                                 sycxs += "," + sycx;
-                                                             }else {
-                                                                 sycxs = sycx;
+                                                 if (StringUtils.isNotBlank(sycxclass) && !sycxclass.equals("")){
+                                                     String[] strings = sycxclass.split(",");
+                                                     String sycx = "";
+                                                     String sycxs = "";
+                                                     if (ObjectUtils.isNotEmpty(strings)) {
+                                                         for (int j = 0; j < strings.length; j++) {
+                                                             sycx = strings[j];
+                                                             if (sycx.equals("N1") || sycx.equals("N2") || sycx.equals("N3") || sycx.equals("M1") || sycx.equals("M2") || sycx.equals("M3")) {
+                                                                 if (StringUtils.isNotBlank(sycxs)){
+                                                                     sycxs += "," + sycx;
+                                                                 }else {
+                                                                     sycxs = sycx;
+                                                                 }
+                                                             } else {
+                                                                 return Result.error("请输入正确的适用车型");
                                                              }
-                                                         } else {
-                                                             return Result.error("请输入正确的适用车型");
                                                          }
+                                                         sarBussStandAttrInfo.setSycxclass(sycxs);
                                                      }
-                                                     sarBussStandAttrInfo.setSycxclass(sycxs);
                                                  }
 
 
                                                  String nylxclass = rowList.get("能源类型");
-                                                 String[] stringNylxc = nylxclass.split(",");
-                                                 String nylx = "";
-                                                 String nylxs = "";
-                                                 if (ObjectUtils.isNotEmpty(stringNylxc)){
-                                                     for (int j = 0; j < stringNylxc.length; j++) {
-                                                         nylx = stringNylxc[j];
-                                                         if (nylx.equals("汽油") || nylx.equals("柴油") || nylx.equals("纯电动") || nylx.equals("混合动力") || nylx.equals("燃料电池") || nylx.equals("替代燃料")){
-                                                             if (StringUtils.isNotBlank(nylxs)){
-                                                                 nylxs += "," + nylx;
+                                                 if (StringUtils.isNotBlank(nylxclass) && ! nylxclass.equals("")){
+                                                     String[] stringNylxc = nylxclass.split(",");
+                                                     String nylx = "";
+                                                     String nylxs = "";
+                                                     if (ObjectUtils.isNotEmpty(stringNylxc)){
+                                                         for (int j = 0; j < stringNylxc.length; j++) {
+                                                             nylx = stringNylxc[j];
+                                                             if (nylx.equals("汽油") || nylx.equals("柴油") || nylx.equals("纯电动") || nylx.equals("混合动力") || nylx.equals("燃料电池") || nylx.equals("替代燃料")){
+                                                                 if (StringUtils.isNotBlank(nylxs)){
+                                                                     nylxs += "," + nylx;
+                                                                 }else {
+                                                                     nylxs = nylx;
+                                                                 }
                                                              }else {
-                                                                 nylxs = nylx;
+                                                                 return Result.error("请输入正确的能源类型");
                                                              }
-                                                         }else {
-                                                             return Result.error("请输入正确的能源类型");
                                                          }
+                                                         sarBussStandAttrInfo.setNylxclass(nylxs);
                                                      }
-                                                     sarBussStandAttrInfo.setNylxclass(nylxs);
                                                  }
 
 
                                                  String sycpxclass = rowList.get("适用产品线");
-                                                 String[] stringSycpx = sycpxclass.split(",");
-                                                 String sycpx = "";
-                                                 String sycpxs = "";
-                                                 if (ObjectUtils.isNotEmpty(stringSycpx)){
-                                                     for (int j = 0; j < stringSycpx.length; j++) {
-                                                         sycpx = stringSycpx[j];
-                                                         if (sycpx.equals("VAN") || sycpx.equals("微卡") || sycpx.equals("轻卡") || sycpx.equals("皮卡") || sycpx.equals("中卡") || sycpx.equals("重卡") || sycpx.equals("客车")){
-                                                             if (StringUtils.isNotBlank(sycpxs)){
-                                                                 sycpxs += "," + sycpx;
+                                                 if (StringUtils.isNotBlank(sycpxclass) && !sycpxclass.equals("")){
+                                                     String[] stringSycpx = sycpxclass.split(",");
+                                                     String sycpx = "";
+                                                     String sycpxs = "";
+                                                     if (ObjectUtils.isNotEmpty(stringSycpx)){
+                                                         for (int j = 0; j < stringSycpx.length; j++) {
+                                                             sycpx = stringSycpx[j];
+                                                             if (sycpx.equals("VAN") || sycpx.equals("微卡") || sycpx.equals("轻卡") || sycpx.equals("皮卡") || sycpx.equals("中卡") || sycpx.equals("重卡") || sycpx.equals("客车")){
+                                                                 if (StringUtils.isNotBlank(sycpxs)){
+                                                                     sycpxs += "," + sycpx;
+                                                                 }else {
+                                                                     sycpxs = sycpx;
+                                                                 }
                                                              }else {
-                                                                 sycpxs = sycpx;
+                                                                 return Result.error("请输入正确的适用产品线");
                                                              }
-                                                         }else {
-                                                             return Result.error("请输入正确的适用产品线");
                                                          }
+                                                         sarBussStandAttrInfo.setSycpxclass(sycpxs);
                                                      }
-                                                     sarBussStandAttrInfo.setSycpxclass(sycpxs);
                                                  }
 
 
+
                                                  String txlbbuss = rowList.get("体系类别");
                                                  sarBussStandAttrInfo.setTxlbbuss(txlbbuss);
 
@@ -2464,7 +2471,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
 
 ////                                        //采用标准  13
                                                  String cybz = rowList.get("采用标准");
-                                                 if (StringUtils.isNotBlank(cybz)){
+                                                 if (StringUtils.isNotBlank(cybz) && !cybz.equals("")){
                                                      if (cybz.equals("IDT等同采用") || cybz.equals("NEQ非等效采用") || cybz.equals("MOD修改采用")){
                                                          sarBussStandAttrInfo.setCybz(cybz);
                                                      }else {
@@ -2473,10 +2480,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                  }
 
 
-                                                 //文件上传人员
-                                                 String userName = tsUserService.userIdByName(userId);
-                                                 sarBussStandAttrInfo.setWjscrybuss(userName);
-
 ////                                        //采标程度 15
                                                  String cycd = rowList.get("采标程度");
                                                  sarBussStandAttrInfo.setCycd(cycd);
@@ -2659,6 +2662,17 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                      }
                                                  }
 
+                                                 //文件上传人员
+                                                 if ((sarBussStandAttrInfo.getFbgbuss() != null && !sarBussStandAttrInfo.getFbgbuss().equals(""))
+                                                         || (sarBussStandAttrInfo.getBzsmbuss() != null && !sarBussStandAttrInfo.getBzsmbuss().equals(""))
+                                                         || (sarBussStandAttrInfo.getLsbbbuss() != null && !sarBussStandAttrInfo.getLsbbbuss().equals(""))
+                                                         || (sarBussStandAttrInfo.getQtwjbuss() != null && !sarBussStandAttrInfo.getQtwjbuss().equals(""))
+                                                         || (sarBussStandAttrInfo.getXgd() != null && !sarBussStandAttrInfo.getXgd().equals(""))
+                                                         || (sarBussStandAttrInfo.getGlwjbuss() != null && !sarBussStandAttrInfo.getGlwjbuss().equals(""))){
+                                                     String userName = tsUserService.userIdByName(userId);
+                                                     sarBussStandAttrInfo.setWjscrybuss(userName);
+                                                 }
+
                                                  sarBussStandAttrInfo.setMenuId(menuId);
 
                                                  List<SarBussStandAttrInfoExecl> list = new ArrayList<>();