1.按照申请时间倒叙排列

2.刷新时分录数据没有更新

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

@@ -153,6 +153,7 @@ public class ReimWorkBenchesDetailFormPlugin extends AbstractFormPlugin implemen
     @Override
     public void afterCreateNewData(EventObject e) {
         super.afterCreateNewData(e);
+        this.getModel().putContextVariable("MODEL_BOSENTRYSERVERFILTERSORT",true);
     }
 
     @Override
@@ -430,7 +431,7 @@ public class ReimWorkBenchesDetailFormPlugin extends AbstractFormPlugin implemen
         }
         String url = viewImageVo.getUrl();
         String message = viewImageVo.getMessage();
-        if (kd.bos.util.StringUtils.isNotEmpty(message)) {
+        if (StringUtils.isNotEmpty(message)) {
             getView().showMessage(message);
             return;
         }
@@ -543,33 +544,43 @@ public class ReimWorkBenchesDetailFormPlugin extends AbstractFormPlugin implemen
         }
         this.getModel().setValue("reimtype",reportType.getKey());
         // 取值
-        DataSet billDataSet = queryDataSet(reportType);
-
+        DataSet oriDataSet = queryDataSet(reportType);
+        DataSet billDataSet = oriDataSet.orderBy(new String[]{"applydate desc"});
+        int totalRow = billDataSet.copy().count("billid", false);
         // 更新到单据体
         String[] fieldNames = billDataSet.getRowMeta().getFieldNames();
         DynamicObjectCollection entryEntityCol = getModel().getEntryEntity(ENTITY_ENTRY);
-        entryEntityCol.clear();
-
+        getModel().deleteEntryData(ENTITY_ENTRY);
+        if(totalRow == 0 ){
+            return;
+        }
         DataEntityPropertyCollection properties = entryEntityCol.getDynamicObjectType().getProperties();
         Iterator<Row> iterator = billDataSet.iterator();
+        getModel().batchCreateNewEntryRow(ENTITY_ENTRY, totalRow);
+        int index = 0;
         while (iterator.hasNext()){
-            DynamicObject entry = entryEntityCol.addNew();
+            //DynamicObject entry = entryEntityCol.addNew();
             Row next = iterator.next();
             for(String filedName : fieldNames){
                 if(properties.containsKey(filedName)){
                     if("company".equals(filedName)){
-                        entry.set(filedName,BusinessDataServiceHelper.loadSingleFromCache(next.get(filedName),"bos_org"));
+                        getModel().setValue(filedName,BusinessDataServiceHelper.loadSingleFromCache(next.get(filedName),"bos_org"),index);
+                        //entry.set(filedName,BusinessDataServiceHelper.loadSingleFromCache(next.get(filedName),"bos_org"));
                         continue;
                     }
                     if("applier".equals(filedName)){
-                        entry.set(filedName,BusinessDataServiceHelper.loadSingleFromCache(next.get(filedName),"bos_user"));
+                        //entry.set(filedName,BusinessDataServiceHelper.loadSingleFromCache(next.get(filedName),"bos_user"));
+                        getModel().setValue(filedName,BusinessDataServiceHelper.loadSingleFromCache(next.get(filedName),"bos_user"),index);
                         continue;
                     }
-                    entry.set(filedName,next.get(filedName));
+                    //entry.set(filedName,next.get(filedName));
+                    getModel().setValue(filedName,next.get(filedName),index);
                 }
             }
+            index++;
         }
-        getView().updateView(ENTITY_ENTRY);
+        EntryGrid entryGrid = this.getControl(ENTITY_ENTRY);
+        entryGrid.setPageIndex(1);
     }
 
     protected  DataSet queryDataSet(ReimDetailTypeEnum reportType){