上传活动计划，优化表头验证

src/main/java/com/wangxiaolu/promotion/service/activity/manage/impl/ActivityPlanRecordCoreServiceImpl.java

@@ -130,22 +130,31 @@ public class ActivityPlanRecordCoreServiceImpl implements ActivityPlanRecordCore
 
     public void validateHeader(String[] templateHeader) {
         StringBuilder msg = new StringBuilder();
-        if (templateHeader.length < 6) {
-            msg.append("模板列不正确");
+        if (templateHeader.length < 5 || templateHeader.length > 7) {
+             throw new DataException("模板异常");
         }
-        String[] expectedHeader = {"执行城市（二级行政单位市）\n例：成都市", "门店负责人-工号\n例：000516", "经销商编码（T100中的编码）\n例：001584", "系统名称\n例：北京华联", "门店编码（勤策-终端编码）\n例：POS00038920", "门店全称（系统名称+分店地址）\n例：北京华联-经华南西店", "活动模式（下拉选择）\n例：单点CP"};
-        boolean containsGh = templateHeader[1].contains(expectedHeader[1]);
+
+        String[] expectedHeaderGh = {"执行城市（二级行政单位市）", "门店负责人-工号", "经销商编码（T100中的编码）", "系统名称", "门店编码（勤策-终端编码）", "门店全称（系统名称+分店地址）", "活动模式（下拉选择）"};
+        String[] expectedHeader = {"执行城市（二级行政单位市）", "经销商编码（T100中的编码）", "系统名称", "门店编码（勤策-终端编码）", "门店全称（系统名称+分店地址）", "活动模式（下拉选择）"};
         // 包含工号
-        for (int i = 0; i < templateHeader.length; i++) {
-            if (i == 1 && containsGh) {
-                continue;
+        boolean containsGh = templateHeader[1].contains("门店负责人-工号");
+        if(containsGh){
+            for (int i = 0; i < expectedHeaderGh.length; i++) {
+                String expectHeaderStr = String.format("第%d列表头是：%s;", i + 1, expectedHeaderGh[i]);
+                if (!(i< templateHeader.length && templateHeader[i].contains(expectedHeaderGh[i]) )) {
+                    msg.append(expectHeaderStr);
+                }
             }
-            if (!templateHeader[i].contains(expectedHeader[i])) {
-                msg.append(String.format("第%d列表头是：%s", i + 1, expectedHeader[i]));
+        }else{
+            for (int i = 0; i < expectedHeader.length; i++) {
+                String expectHeaderStr = String.format("第%d列表头是：%s;", i + 1, expectedHeader[i]);
+                if (!(i< templateHeader.length && templateHeader[i].contains(expectedHeader[i]) )) {
+                    msg.append(expectHeaderStr);
+                }
             }
         }
         if (msg.toString().length() > 0) {
-            throw new DataException("模板不正确：" + msg.toString());
+            throw new DataException("模板不正确:"+ msg);
         }
     }
 
@@ -293,10 +302,10 @@ public class ActivityPlanRecordCoreServiceImpl implements ActivityPlanRecordCore
                 QinCeClienteleStoreDto oneStore = qinCeClienteleStoreDao.getOneStore(storeWrap);
                 if (ObjectUtil.isEmpty(oneStore)) {
                     sb.append("勤策店铺编码不正确；");
-                }else{
+                } else {
                     if (StringUtils.isBlank(storeName)) {
                         sb.append("店铺名称不可为空；");
-                    }else if (!storeName.equals(oneStore.getStoreName())){
+                    } else if (!storeName.equals(oneStore.getStoreName())) {
                         sb.append("店铺名称不正确；");
                     }
                 }
@@ -376,10 +385,10 @@ public class ActivityPlanRecordCoreServiceImpl implements ActivityPlanRecordCore
                 QinCeClienteleStoreDto oneStore = qinCeClienteleStoreDao.getOneStore(storeWrap);
                 if (ObjectUtil.isEmpty(oneStore)) {
                     sb.append("勤策店铺编码不正确；");
-                }else{
+                } else {
                     if (StringUtils.isBlank(storeName)) {
                         sb.append("店铺名称不可为空；");
-                    }else if (!storeName.equals(oneStore.getStoreName())){
+                    } else if (!storeName.equals(oneStore.getStoreName())) {
                         sb.append("店铺名称不正确；");
                     }
                 }