文件导入分录改

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

@@ -141,15 +141,15 @@ 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_ee_institution","nckd_ee_emptype","nckd_ee_empnumber","nckd_ee_empname"
-                ,"nckd_ee_org","nckd_ee_department","nckd_ee_idnumber","nckd_ee_cost","nckd_ee_allbasicsry","nckd_ee_allowance"
+        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_retired=Arrays.asList("nckd_re_institution","nckd_re_emptype","nckd_re_empnumber","nckd_re_empname","nckd_re_org"
-                ,"nckd_re_department","nckd_re_idnumber","nckd_re_cost","nckd_re_livallowance","nckd_re_otherallowance","nckd_re_reward"
+        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"
                 ,"nckd_re_salarypayable","nckd_re_desalary","nckd_re_netsalary");
         //人力薪酬分录标识
         List<String> nckd_pay=Arrays.asList("nckd_sae_institution","nckd_sae_empname","nckd_sae_jobid","nckd_sae_idnumber","nckd_sae_company"
@@ -251,43 +251,44 @@ public class SalaryFileUploadEditPlugin extends AbstractBillPlugIn implements Up
                             .loadSingle(bos_org,"id,entrycostdept",new QFilter[]{filter});
                     this.getModel().setValue(nckd_earlyretired.get(0),entrycostdept,rowIndex);
                 }
-                //员工类别
+                //员工姓名
                 if (!getCellValue(rowList.get(i).getCell(2)).isEmpty()){
                     this.getModel().setValue(nckd_earlyretired.get(1),getCellValue(rowList.get(i).getCell(2)),rowIndex);
                 }
-                //员工编号
+                //员工工号
                 if (!getCellValue(rowList.get(i).getCell(3)).isEmpty()){
                     this.getModel().setValue(nckd_earlyretired.get(2),getCellValue(rowList.get(i).getCell(3)),rowIndex);
                 }
-                //姓名
+                //证件号
                 if (!getCellValue(rowList.get(i).getCell(4)).isEmpty()){
                     this.getModel().setValue(nckd_earlyretired.get(3),getCellValue(rowList.get(i).getCell(4)),rowIndex);
                 }
-                //所在机构
+
+                //银行账号
                 if (!getCellValue(rowList.get(i).getCell(5)).isEmpty()){
-                    QFilter filter=new QFilter("number", QFilter.equals,getCellValue(rowList.get(i).getCell(5)));
-                    DynamicObject entrycostdept= BusinessDataServiceHelper
-                            .loadSingle(bos_adminorg,"id",new QFilter[]{filter});
-                    this.getModel().setValue(nckd_earlyretired.get(4),entrycostdept,rowIndex);
+                    this.getModel().setValue(nckd_earlyretired.get(4),getCellValue(rowList.get(i).getCell(5)),rowIndex);
                 }
-                //所在部门
-                if (!getCellValue(rowList.get(i).getCell(6)).isEmpty())
-                {
+                //所在单位
+                if (!getCellValue(rowList.get(i).getCell(6)).isEmpty()){
                     QFilter filter=new QFilter("number", QFilter.equals,getCellValue(rowList.get(i).getCell(6)));
                     DynamicObject entrycostdept= BusinessDataServiceHelper
                             .loadSingle(bos_adminorg,"id",new QFilter[]{filter});
                     this.getModel().setValue(nckd_earlyretired.get(5),entrycostdept,rowIndex);
                 }
-                //身份证号
-                if (!getCellValue(rowList.get(i).getCell(7)).isEmpty()){
-                    this.getModel().setValue(nckd_earlyretired.get(6),getCellValue(rowList.get(i).getCell(6)),rowIndex);
+                //一级机构
+                if (!getCellValue(rowList.get(i).getCell(7)).isEmpty())
+                {
+                    QFilter filter=new QFilter("number", QFilter.equals,getCellValue(rowList.get(i).getCell(7)));
+                    DynamicObject entrycostdept= BusinessDataServiceHelper
+                            .loadSingle(bos_adminorg,"id",new QFilter[]{filter});
+                    this.getModel().setValue(nckd_earlyretired.get(6),entrycostdept,rowIndex);
                 }
-                //成本归结单元
+                //所在部门
                 if (!getCellValue(rowList.get(i).getCell(8)).isEmpty())
                 {
                     QFilter filter=new QFilter("number", QFilter.equals,getCellValue(rowList.get(i).getCell(8)));
                     DynamicObject entrycostdept= BusinessDataServiceHelper
-                            .loadSingle(bos_org,"id,entrycostdept",new QFilter[]{filter});
+                            .loadSingle(bos_adminorg,"id",new QFilter[]{filter});
                     this.getModel().setValue(nckd_earlyretired.get(7),entrycostdept,rowIndex);
                 }
                 //金额类型字段赋值
@@ -318,38 +319,37 @@ public class SalaryFileUploadEditPlugin extends AbstractBillPlugIn implements Up
                             .loadSingle(bos_org,"id,entrycostdept",new QFilter[]{filter});
                     this.getModel().setValue(nckd_retired.get(0),entrycostdept,rowIndex);
                 }
-                //员工类别
+                //员工姓名
                 if (!getCellValue(rowList.get(i).getCell(2)).isEmpty()){
                     this.getModel().setValue(nckd_retired.get(1),getCellValue(rowList.get(i).getCell(2)),rowIndex);
                 }
-                //员工编号
+                //员工工号
                 if (!getCellValue(rowList.get(i).getCell(3)).isEmpty()){
                     this.getModel().setValue(nckd_retired.get(2),getCellValue(rowList.get(i).getCell(3)),rowIndex);
                 }
-                //姓名
+                //证件号
                 if (!getCellValue(rowList.get(i).getCell(4)).isEmpty()){
                     this.getModel().setValue(nckd_retired.get(3),getCellValue(rowList.get(i).getCell(4)),rowIndex);
                 }
-                //所在机构
+                //银行账号
                 if (!getCellValue(rowList.get(i).getCell(5)).isEmpty()){
-                    QFilter filter=new QFilter("number", QFilter.equals,getCellValue(rowList.get(i).getCell(5)));
-                    //获取部门
-                    DynamicObject entrycostdept= BusinessDataServiceHelper
-                            .loadSingle(bos_adminorg,"id",new QFilter[]{filter});
-                    this.getModel().setValue(nckd_retired.get(4),entrycostdept,rowIndex);
+                    this.getModel().setValue(nckd_retired.get(4),getCellValue(rowList.get(i).getCell(5)),rowIndex);
                 }
-                //所在部门
+                //所在单位
                 if (!getCellValue(rowList.get(i).getCell(6)).isEmpty()) {
                     QFilter filter=new QFilter("number", QFilter.equals,getCellValue(rowList.get(i).getCell(6)));
                     DynamicObject entrycostdept= BusinessDataServiceHelper
                             .loadSingle(bos_adminorg,"id",new QFilter[]{filter});
                     this.getModel().setValue(nckd_retired.get(5),entrycostdept,rowIndex);
                 }
-                //身份证号
-                if (!getCellValue(rowList.get(i).getCell(7)).isEmpty()){
-                    this.getModel().setValue(nckd_retired.get(6),getCellValue(rowList.get(i).getCell(6)),rowIndex);
+                //一级机构
+                if (!getCellValue(rowList.get(i).getCell(7)).isEmpty()) {
+                    QFilter filter=new QFilter("number", QFilter.equals,getCellValue(rowList.get(i).getCell(7)));
+                    DynamicObject entrycostdept= BusinessDataServiceHelper
+                            .loadSingle(bos_adminorg,"id",new QFilter[]{filter});
+                    this.getModel().setValue(nckd_retired.get(6),entrycostdept,rowIndex);
                 }
-                //成本归结单元
+                //所在部门
                 if (!getCellValue(rowList.get(i).getCell(8)).isEmpty()) {
                     QFilter filter=new QFilter("number", QFilter.equals,getCellValue(rowList.get(i).getCell(8)));
                     DynamicObject entrycostdept= BusinessDataServiceHelper