|
@@ -4,6 +4,7 @@ import com.jeeplus.modules.sg.financial.erpcredit.entity.*;
|
|
import com.jeeplus.modules.sg.financial.settlement.entity.MaintainData;
|
|
import com.jeeplus.modules.sg.financial.settlement.entity.MaintainData;
|
|
|
|
|
|
import java.io.*;
|
|
import java.io.*;
|
|
|
|
+import java.math.BigDecimal;
|
|
import java.text.DecimalFormat;
|
|
import java.text.DecimalFormat;
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
@@ -754,7 +755,18 @@ public class ExportUtilCalculate {
|
|
//摊入
|
|
//摊入
|
|
// powerEqmMater = powerValueTotal+powerInstallFee;//===所有的设备价值+安装费+材料费
|
|
// powerEqmMater = powerValueTotal+powerInstallFee;//===所有的设备价值+安装费+材料费
|
|
if (Double.valueOf(transferOfPower2.getPowerValue())!=0.0){
|
|
if (Double.valueOf(transferOfPower2.getPowerValue())!=0.0){
|
|
- powerStandInFee=Double.valueOf(transferOfPower2.getPowerValue())/powerInstallFee*erpCredit.getOtherTotalFee();
|
|
|
|
|
|
+ BigDecimal bigDecimal = new BigDecimal(transferOfPower2.getPowerValue());
|
|
|
|
+ BigDecimal bigDecimal1 = BigDecimal.valueOf(powerInstallFee);
|
|
|
|
+ BigDecimal bigDecimal2 = new BigDecimal(erpCredit.getOtherTotalFee());
|
|
|
|
+ int i = bigDecimal.compareTo(BigDecimal.ZERO);
|
|
|
|
+ int i1 = bigDecimal1.compareTo(BigDecimal.ZERO);
|
|
|
|
+ if (i1 == 0) {
|
|
|
|
+ powerStandInFee = 0.0;
|
|
|
|
+ } else {
|
|
|
|
+ BigDecimal divide = bigDecimal.divide(bigDecimal1, 2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
+ BigDecimal multiply = divide.multiply(bigDecimal2);
|
|
|
|
+ powerStandInFee = multiply.doubleValue();
|
|
|
|
+ }
|
|
}else {
|
|
}else {
|
|
powerStandInFee =0.0;
|
|
powerStandInFee =0.0;
|
|
}
|
|
}
|