更新

src/main/java/com/keymobile/rest/controller/TemplateController.java

@@ -169,12 +169,12 @@ public class TemplateController {
             params.setHeadRows(1);
             ExcelImportResult<BankData> excelImportResult = ExcelImportUtil.
                     importExcelMore(new FileInputStream(new File(template.getUpStreamAddr())), BankData.class, params);
-            List<BankData> bankDataList = excelImportResult.getList();
+            List<BankData> allBankDataList = excelImportResult.getList();
             String breakColumnEn = ExcelModelColumnUtils.getBreakColumn(template.getColumnName());
             if (StringUtils.isBlank(breakColumnEn)) {
 
             } else {
-                for (BankData bd : bankDataList) {
+                for (BankData bd : allBankDataList) {
                     Method m = bd.getClass().getMethod("get" + breakColumnEn);
                     if (breakResultMap.get(m.invoke(bd) + "") != null) {
                         breakResultMap.get(m.invoke(bd) + "").add(bd);
@@ -186,33 +186,35 @@ public class TemplateController {
                 }
             }
 
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
 
 //        if (missionType == CommonConstant.MISSION_TYPE_DATA_ENTER) {
 //        } else if (missionType == CommonConstant.MISSION_TYPE_DATA_AUDIT) {
 //        }
-        User user = sessionService.getLoginUser();
-        Map org = feignAuthService.getUserOrgById(user.getId());
-        String key = org.get("fullname").toString().split(",")[1];
-        logger.info("bank name {}", key);
-        List<BankData> bankDataList = breakResultMap.get(key);
-        List<List<String>> listArrayList = new ArrayList<>();
-        bankDataList.forEach(bankData -> {
-            List<String> array = new ArrayList<>();
-            array.add(bankData.getMonth().toString());
-            array.add(bankData.getUniqueKey());
-            array.add(bankData.getOneSubBankName());
-            array.add(bankData.getBranches());
-            array.add(bankData.getCustomerNum());
-            array.add(bankData.getCustomerName());
-            array.add(bankData.getUpdateCustomerNum());
-            array.add(bankData.getUpdateBranches());
-            array.add(bankData.getUpdateCustomerName());
-            listArrayList.add(array);
-        });
-        return listArrayList;
+            User user = sessionService.getLoginUser();
+            Map org = feignAuthService.getUserOrgById(user.getId());
+            String key = org.get("fullname").toString().split(",")[1];
+            logger.info("bank name {}", key);
+            List<BankData> bankDataList = breakResultMap.get(key);
+            List<List<String>> listArrayList = new ArrayList<>();
+            bankDataList.forEach(bankData -> {
+                List<String> array = new ArrayList<>();
+                array.add(bankData.getMonth().toString());
+                array.add(bankData.getUniqueKey());
+                array.add(bankData.getOneSubBankName());
+                array.add(bankData.getBranches());
+                array.add(bankData.getCustomerNum());
+                array.add(bankData.getCustomerName());
+                array.add(bankData.getUpdateCustomerNum());
+                array.add(bankData.getUpdateBranches());
+                array.add(bankData.getUpdateCustomerName());
+                listArrayList.add(array);
+            });
+            return listArrayList;
+        } catch (Exception e) {
+
+            e.printStackTrace();
+        }
+        return null;
     }
 
     @ApiOperation(value = "获取txt或者dat文件的数据", hidden = true)