10/24

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDaily.java

@@ -34,7 +34,8 @@ public class ProjectDaily extends EntityWithId {
     private double stockAmount = 0; // 库存货值',
     private double transitAmount = 0; // 在途货值',
     private double advancePayment = 0; // 预付款',
-    private double pledgeRate = 0; // 质押率=（贷款金额-帐户余额）/（库存总价值+应收帐款+在途商品+预付款）',
+//    private double pledgeRate = 0; // 质押率=（贷款金额-帐户余额）/（库存总价值+应收帐款+在途商品+预付款）',
+    private double pledgeRate = 0; // 质押率=（贷款金额）/（库存总价值+应收帐款+在途商品+预付款+帐户余额）',
 
     private int messState = 0; // 消息发送状态: 0=未发送;1=已发送',
     private int messNum = 0; // 消息发送次数',
@@ -59,8 +60,10 @@ public class ProjectDaily extends EntityWithId {
      * @return
      */
     public String getPledgeRateNormal() {
-        double a = totalLoan - accountsBalance;
-        double b = stockAmount + accountsReceivable + transitAmount + advancePayment;
+//        double a = totalLoan - accountsBalance;
+//        double b = stockAmount + accountsReceivable + transitAmount + advancePayment;
+        double a=this.useLimit;
+        double b=stockAmount+accountsReceivable+transitAmount+advancePayment+accountsBalance;
         if (b == 0)
             return "0";
         double v = a / b;
@@ -73,8 +76,10 @@ public class ProjectDaily extends EntityWithId {
      * @return
      */
     public String getPledgeRatePercent() {
-        double a = totalLoan - accountsBalance;
-        double b = stockAmount + accountsReceivable + transitAmount + advancePayment;
+//        double a = totalLoan - accountsBalance;
+//        double b = stockAmount + accountsReceivable + transitAmount + advancePayment;
+        double a=this.useLimit;
+        double b=stockAmount+accountsReceivable+transitAmount+advancePayment+accountsBalance;
         if (b == 0)
             return "0";
         double v = (a / b) * 100;

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyDto.java

@@ -25,7 +25,8 @@ public class ProjectDailyDto implements Dto {
     private double stockAmount = 0; // 库存货值',
     private double transitAmount = 0; // 在途货值',
     private double advancePayment = 0; // 预付款',
-    private double pledgeRate = 0; // 质押率=（贷款金额-帐户余额）/（库存总价值+应收帐款+在途商品+预付款）',
+//    private double pledgeRate = 0; // 质押率=（贷款金额-帐户余额）/（库存总价值+应收帐款+在途商品+预付款）',
+    private double pledgeRate = 0; // 质押率=（贷款金额）/（库存总价值+应收帐款+在途商品+预付款+帐户余额）',
     private BigDecimal useLimit=new BigDecimal(0);//用信总额
     private List<ProjectDailyFiles> fileList;
     private List<ProjectDailyAccountDto> bankList;