薪酬计提单一般员工分录（改）

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

@@ -131,8 +131,8 @@ public class SalaryFileUploadEditPlugin extends AbstractBillPlugIn implements Up
      */
     public void createNewRow(List<Row> rowList,String nckd_entry){
         //薪酬明细（一般员工）分录字段标识
-        List<String> nckd_generalemployees =Arrays.asList("nckd_se_institution","nckd_se_emptype","nckd_se_empnumber"
-                ,"nckd_se_empname","nckd_se_org","nckd_se_department","nckd_se_idnumber","nckd_se_cost","nckd_se_allbasicsry"
+        List<String> nckd_generalemployees =Arrays.asList("nckd_se_institution","nckd_se_empname","nckd_se_empnumber"
+                ,"nckd_se_idnumber","nckd_se_banknumber","nckd_se_unit","nckd_se_org","nckd_se_department","nckd_se_allbasicsry"
                 ,"nckd_se_basicsry","nckd_se_acmsry","nckd_se_reacmsry","nckd_se_bsnrwd","nckd_se_otreward","nckd_se_cmcsbd"
                 ,"nckd_se_otherpysry","nckd_se_clearrwd","nckd_se_awareward","nckd_se_otherdevreward","nckd_se_coldsbad"
                 ,"nckd_se_warmsbad","nckd_se_nursabd","nckd_se_otherallowance","nckd_se_salarypayable","nckd_se_per_endins"
@@ -182,44 +182,44 @@ public class SalaryFileUploadEditPlugin extends AbstractBillPlugIn implements Up
                             .loadSingle(bos_org,"id,entrycostdept",new QFilter[]{filter});
                     this.getModel().setValue(nckd_generalemployees.get(0),entrycostdept,rowIndex);
                 }
-                //员工类别
+                //员工名称
                 if (!getCellValue(rowList.get(i).getCell(2)).isEmpty()){
                     this.getModel().setValue(nckd_generalemployees.get(1),getCellValue(rowList.get(i).getCell(2)),rowIndex);
                 }
-                //员工编号
+                //员工工号
                 if (!getCellValue(rowList.get(i).getCell(3)).isEmpty()){
                     this.getModel().setValue(nckd_generalemployees.get(2),getCellValue(rowList.get(i).getCell(3)),rowIndex);
                 }
-                //姓名
+                //证件号
                 if (!getCellValue(rowList.get(i).getCell(4)).isEmpty()){
                     this.getModel().setValue(nckd_generalemployees.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_generalemployees.get(4),entrycostdept,rowIndex);
+                    this.getModel().setValue(nckd_generalemployees.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_generalemployees.get(5),entrycostdept,rowIndex);
                 }
-                //身份证号
-                if (!getCellValue(rowList.get(i).getCell(7)).isEmpty()){
-                    this.getModel().setValue(nckd_generalemployees.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,entrycostdept",new QFilter[]{filter});
+                    this.getModel().setValue(nckd_generalemployees.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_generalemployees.get(7),entrycostdept,rowIndex);
                 }
                 //金额类型字段赋值
@@ -430,7 +430,6 @@ public class SalaryFileUploadEditPlugin extends AbstractBillPlugIn implements Up
             }
 
         }
-
     }