自动填充费用申请中费用明细中的费用项目

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/plugin/form/PublicReimburseBillFormPlugin.java

@@ -42,12 +42,10 @@ public class PublicReimburseBillFormPlugin extends AbstractBillPlugIn implements
         String property = evt.getProperty().getName();
         String entityId = ((BasedataProp) evt.getProperty()).getBaseEntityId();
         int curRowIndex = evt.getRow();
-
         if ("expenseitem".equals(property) || "nckd_expenseitem".equals(property)) {
             ListShowParameter showParameter = (ListShowParameter) evt.getFormShowParameter();
             ListFilterParameter filterParam = showParameter.getListFilterParameter();
             List<QFilter> qFilters = filterParam.getQFilters();
-
             Map<String, Object> customParams = this.getView().getFormShowParameter().getCustomParams();
             if (customParams.get("nckd_viewTypeFilter") != null) {
                 QFilter viewTypeFilter = QFilter.fromSerializedString(customParams.get("nckd_viewTypeFilter").toString());
@@ -58,9 +56,7 @@ public class PublicReimburseBillFormPlugin extends AbstractBillPlugIn implements
                 List<Long> idList = (List)collection.stream().mapToLong((x) -> {
                     return x.getLong("fbasedataid_id");
                 }).boxed().collect(Collectors.toList());
-
                 QFilter viewTypeFilter = new QFilter("nckd_payviewtype.id", QCP.in, idList);
-
                 qFilters.add(viewTypeFilter);
             }
         }
@@ -73,14 +69,9 @@ public class PublicReimburseBillFormPlugin extends AbstractBillPlugIn implements
         Map<String, Object> customParams = this.getView().getFormShowParameter().getCustomParams();
         if(customParams.get("viewType") != null){
             String[] typeStrings = customParams.get("viewType").toString().split(",");
-
             QFilter qFilter = new QFilter("number", QCP.in, typeStrings);
-
-            DynamicObject[] viewTypeCols = BusinessDataServiceHelper.load("nckd_payviewtype", "id, number, name", qFilter.toArray());
+            DynamicObject[] viewTypeCols = BusinessDataServiceHelper.load("nckd_payviewtype", "id, masterid,number, name", qFilter.toArray());
             if(viewTypeCols != null && viewTypeCols.length > 0){
-                //页面类型赋值
-                this.getModel().setValue("nckd_payviewtype", viewTypeCols[0]);
-
                 List<Long> idList = Arrays.stream(viewTypeCols)
                         .map(type ->  type.getLong("id"))
                         .collect(Collectors.toList());
@@ -97,6 +88,8 @@ public class PublicReimburseBillFormPlugin extends AbstractBillPlugIn implements
                     DynamicObject[] expenseitemCols = BusinessDataServiceHelper.load("er_expenseitemedit", "id, number,name,fullname", expenseitemFilter.toArray());
                     //费用项目赋值
                     this.getModel().setValue("nckd_expenseitem", expenseitemCols[0]);
+                    //费用明细中的费用项目
+                    this.getModel().setValue("expenseitem", expenseitemCols[0]);
                 }
 
                 /***