Kaynağa Gözat

1.按照单据编码倒叙排列
2.待报销的费用申请单的可用余额取值逻辑

lisheng 1 hafta önce
ebeveyn
işleme
dae7ef5115

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

@@ -545,7 +545,7 @@ public class ReimWorkBenchesDetailFormPlugin extends AbstractFormPlugin implemen
         this.getModel().setValue("reimtype",reportType.getKey());
         // 取值
         DataSet oriDataSet = queryDataSet(reportType);
-        DataSet billDataSet = oriDataSet.orderBy(new String[]{"applydate desc"});
+        DataSet billDataSet = oriDataSet.orderBy(new String[]{"applydate desc","billno desc"});
         int totalRow = billDataSet.copy().count("billid", false);
         // 更新到单据体
         String[] fieldNames = billDataSet.getRowMeta().getFieldNames();

+ 1 - 1
code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/plugin/form/ReimWorkBenchesHelper.java

@@ -129,7 +129,7 @@ public class ReimWorkBenchesHelper {
 
         DataSet dailyApplyDataSet = QueryServiceHelper.queryDataSet(this.getClass().getName(), "er_dailyapplybill",
                 "id billid,bizdate applydate,'er_dailyapplybill' billtype,'er_dailyapplybill' pageid,billno billno,description description,applyamount applyamount," +
-                        "approveamount approveamount,null balanceamount,billstatus billstatus,costcompany.id company,applier.id applier",
+                        "approveamount approveamount,balanceamount balanceamount,billstatus billstatus,costcompany.id company,applier.id applier",
                 getFilterArr(projectPersonFilter,quickFilter,applyStatusFilter), "");
         dataSetList.add(dailyVehDataSet);
         dataSetList.add(tripReqDataSet);