diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java index ec4faa15..27b02001 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java @@ -435,13 +435,32 @@ public class ProjectDailyService extends ServiceImpl> getProjectDailyZx(ProjectDailyQuery query) { ResultBean rb=new ResultBean().fail(); Map m=new HashMap<>(); diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVosBig.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVosBig.java index e11e4da7..7d28e616 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVosBig.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyVosBig.java @@ -67,11 +67,11 @@ public class ProjectDailyVosBig { private BigDecimal dcUseLimit=new BigDecimal(0); private int yingShou; private BigDecimal ysUseLimit=new BigDecimal(0); - private BigDecimal accountsBalanceBfb; - private BigDecimal accountsReceivableBfb; - private BigDecimal stockAmountBfb; - private BigDecimal transitAmountBfb; - private BigDecimal advancePaymentBfb; + private BigDecimal accountsBalanceBfb;//帐户余额 + private BigDecimal accountsReceivableBfb;//应收账款 + private BigDecimal stockAmountBfb;//库存货值 + private BigDecimal transitAmountBfb;//在途货值 + private BigDecimal advancePaymentBfb;//预付款 /**