Merge branch 'master' of http://gitea.yxtsoft.com/yxt_group/supervise

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<ProjectDailyMapper, Project
             }
             System.out.println(info);
         }
-        projectDailyV.setAccountsBalanceBfb(projectDailyV.getAccountsBalance().subtract(projectDailyYest.getAccountsBalance()).divide(projectDailyYest.getAccountsBalance(),2, RoundingMode.HALF_UP));
-        projectDailyV.setAccountsReceivableBfb(projectDailyV.getAccountsReceivable().subtract(projectDailyYest.getAccountsReceivable()).divide(projectDailyYest.getAccountsReceivable(),2, RoundingMode.HALF_UP));
-        projectDailyV.setStockAmountBfb(projectDailyV.getStockAmount().subtract(projectDailyYest.getStockAmount()).divide(projectDailyYest.getStockAmount(),2, RoundingMode.HALF_UP));
-        projectDailyV.setTransitAmountBfb(projectDailyV.getTransitAmount().subtract(projectDailyYest.getTransitAmount()).divide(projectDailyYest.getTransitAmount(),2, RoundingMode.HALF_UP));
-        projectDailyV.setAdvancePaymentBfb(projectDailyV.getAdvancePayment().subtract(projectDailyYest.getAdvancePayment()).divide(projectDailyYest.getAdvancePayment(),2, RoundingMode.HALF_UP));
+        projectDailyV.setAccountsBalanceBfb(sss(projectDailyV.getAccountsBalance(),projectDailyYest.getAccountsBalance()));
+        projectDailyV.setAccountsReceivableBfb(sss(projectDailyV.getAccountsReceivable(),projectDailyYest.getAccountsReceivable()));
+        projectDailyV.setStockAmountBfb(sss(projectDailyV.getStockAmount(),projectDailyYest.getStockAmount()));
+        projectDailyV.setTransitAmountBfb(sss(projectDailyV.getTransitAmount(),projectDailyYest.getTransitAmount()));
+        projectDailyV.setAdvancePaymentBfb(sss(projectDailyV.getAdvancePayment(),projectDailyYest.getAdvancePayment()));
         return rb.success().setData(projectDailyV);
     }
+    public BigDecimal sss(BigDecimal today,BigDecimal yesterday){
+        BigDecimal  a=new BigDecimal(0);
+        if(today.signum()!=0){
+            if(yesterday.signum()!=0){
+                a=today.subtract(yesterday).divide(yesterday,2, RoundingMode.HALF_UP);
+//                a=today.subtract(yesterday).divide(yesterday,2, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
+            }else{
+                a=new BigDecimal(100);
+            }
+        }else{
+            if(yesterday.signum()!=0){
+                a=new BigDecimal(-100);
+            }else{
+                a=new BigDecimal(0);
+            }
+
+        }
+        return a;
+    }
     public ResultBean<Map<String,Object>> getProjectDailyZx(ProjectDailyQuery query) {
         ResultBean rb=new ResultBean().fail();
         Map<String,Object> m=new HashMap<>();

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;//预付款
 
 
     /**