读取excel导入分录功能改

src/main/java/fi/em/formPlugin/SalaryFileUploadEditPlugin.java

@@ -62,7 +62,7 @@ public class SalaryFileUploadEditPlugin extends AbstractBillPlugIn implements Up
             readExcelByRowOrCell(4,44,inputStream,billtype);
         }else if ("B".equals(nckd_entrytype)) {
             billtype="nckd_earlyretiredentry";
-            readExcelByRowOrCell(4,31,inputStream,billtype);
+            readExcelByRowOrCell(4,34,inputStream,billtype);
         } else if ("C".equals(nckd_entrytype)) {
             billtype="nckd_retireentry";
             readExcelByRowOrCell(4,15,inputStream,billtype);
@@ -76,7 +76,7 @@ public class SalaryFileUploadEditPlugin extends AbstractBillPlugIn implements Up
 
 
     /**
-     * @line execel行数
+     * @line execel头行数
      * @column excel列数
      * @inputStream 文件流
      * @nckd_entrytype 分录类型
@@ -141,12 +141,12 @@ public class SalaryFileUploadEditPlugin extends AbstractBillPlugIn implements Up
                 ,"nckd_se_cpy_hopins","nckd_se_cpy_bhopins","nckd_se_cpy_ljins","nckd_se_cpy_birthins","nckd_se_cpy_dmgins","nckd_se_cpy_hosins"
                 ,"nckd_se_cpy_cmymey");
         //薪酬明细（内退）分录字段标识
-        List<String> nckd_earlyretired=Arrays.asList("nckd_orgfield","nckd_ee_empname","nckd_ee_empnumber","nckd_ee_idnumber"
-                ,"nckd_ee_banknumber","nckd_ee_unit","nckd_ee_org","nckd_ee_department","nckd_ee_allbasicsry","nckd_ee_allowance"
-                ,"nckd_ee_otherallowance","nckd_ee_per_endins","nckd_ee_per_ljins","nckd_ee_per_hopins","nckd_ee_per_bhopins"
-                ,"nckd_ee_per_hosins","nckd_ee_per_cmymey","nckd_ee_unionmey","nckd_ee_tax","nckd_ee_otherreduce","nckd_ee_desalary"
-                ,"nckd_ee_netsalary","nckd_ee_cpy_endins","nckd_ee_cpy_hopins","nckd_ee_cpy_bhopins","nckd_ee_cpy_ljins","nckd_ee_cpy_birthins"
-                ,"nckd_ee_cpy_dmgins","nckd_ee_cpy_hosins","nckd_ee_cpy_cmymey");
+        List<String> nckd_earlyretired=Arrays.asList("nckd_orgfield","nckd_ee_empname","nckd_ee_empnumber","nckd_ee_idnumber","nckd_ee_banknumber"
+                ,"nckd_ee_unit","nckd_ee_org","nckd_ee_department","nckd_ee_allbasicsry","nckd_ee_allowance","nckd_ee_otherallowance","nckd_ee_per_endins"
+                ,"nckd_ee_per_ljins","nckd_ee_per_hopins","nckd_ee_per_bhopins","nckd_ee_per_hosins","nckd_ee_per_cmymey","nckd_ee_unionmey"
+                ,"nckd_ee_tax","nckd_ee_desalary","nckd_ee_netsalary","nckd_ee_otherreduce","nckd_ee_cpy_endins","nckd_ee_cpy_bhopins"
+                ,"nckd_ee_cpy_ljins","nckd_ee_cpy_birthins","nckd_ee_cpy_dmgins","nckd_ee_cpy_cmymey","nckd_ee_cpy_hosins","nckd_ee_taxt"
+                ,"nckd_ee_alltaxt","nckd_ee_charge","nckd_ee_finallsys");
         //薪酬明细（退休）分录字段标识
         List<String> nckd_retired=Arrays.asList("nckd_re_institution","nckd_re_empname","nckd_re_empnumber","nckd_re_idnumber","nckd_re_banknumber"
                 ,"nckd_re_unit","nckd_re_org","nckd_re_department","nckd_re_livallowance","nckd_re_otherallowance","nckd_re_reward"
@@ -467,7 +467,7 @@ public class SalaryFileUploadEditPlugin extends AbstractBillPlugIn implements Up
         //薪酬明细（内退）
         if (billtype.equals("nckd_earlyretiredentry")) {
             flag=headList.get(0).getCell(9).getStringCellValue();
-            if (!flag.equals("内退员工基本工资")) {
+            if (!flag.equals("内退生活费")) {
                 throw new KDBizException("上传的文件格式有误，请检查！");
             }
             for (int i=0;i<rowList.size();i++) {