Merge branch 'dev_oracle_sherlock' into 'dev_oracle'

export order

See merge request root/atms!194

atms-api/src/main/java/pwc/taxtech/atms/controller/InputInvoiceImportController.java

@@ -112,7 +112,7 @@ public class InputInvoiceImportController {
             inputInvoiceExportDto.setTaxAmount(inputInvoice.getHJSE() != null ? new BigDecimal(inputInvoice.getHJJE().replace(",","")) : BigDecimal.ZERO);
             inputInvoiceExportDtos.add(inputInvoiceExportDto);
         }
-        Map<String, String> header = new HashMap<>();
+        Map<String, String> header = new LinkedHashMap<>();
         header.put("PeriodId", "期间");
         header.put("InvoiceDate", "开票日期");
         header.put("InvoiceCode", "发票代码");
@@ -135,7 +135,7 @@ public class InputInvoiceImportController {
         excelSheetA.setSheetName("sheetA");
 
 
-        Map<String, String> header2 = new HashMap<>();
+        Map<String, String> header2 = new LinkedHashMap<>();
         header2.put("PeriodId", "期间");
         header2.put("InvoiceCode", "发票代码");
         header2.put("InvoiceNumber", "发票号码");

atms-api/src/main/java/pwc/taxtech/atms/controller/OutputInvoiceController.java

@@ -106,7 +106,7 @@ public class OutputInvoiceController {
                 d.setInvoiceTypeName(d.getInvoiceTypeName());
                 list2.add(d);
         });
-        Map<String, String> header = new HashMap<>();
+        Map<String, String> header = new LinkedHashMap<>();
         header.put("InvoiceTypeName", "发票类型");
         header.put("ClassCode", "发票代码");
         header.put("InvoiceNumber", "发票号码");

atms-api/src/main/java/pwc/taxtech/atms/thirdparty/ExcelUtil.java

@@ -273,12 +273,11 @@ public class ExcelUtil {
         // 产生表格标题行
         HSSFRow row = sheet.createRow(0);
         // 标题行转中文
-        Set<String> keys = headers.keySet();
-        Iterator<String> it1 = keys.iterator();
-        String key = "";    //存放临时键变量
+        Iterator<Map.Entry<String, String>> it1 = headers.entrySet().iterator();
+        String key = StringUtils.EMPTY;    //存放临时键变量
         int c= 0;   //标题列数
         while (it1.hasNext()){
-            key = it1.next();
+            key = it1.next().getKey();
             if (headers.containsKey(key)) {
                 HSSFCell cell = row.createCell(c);
                 HSSFRichTextString text = new HSSFRichTextString(headers.get(key));
@@ -300,7 +299,7 @@ public class ExcelUtil {
                     Map<String, Object> map = (Map<String, Object>) t;
                     int cellNum = 0;
                     //遍历列名
-                    Iterator<String> it2 = keys.iterator();
+                    Iterator<String> it2 = headers.keySet().iterator();
                     while (it2.hasNext()){
                         key = it2.next();
                         if (!headers.containsKey(key)) {