修改基金

wwmin
synthesize_energy_api/src/main/java/com/synthesize_energy/item/web/service/impl/ProjectServiceImpl.java
--- a/synthesize_energy_api/src/main/java/com/synthesize_energy/item/web/service/impl/ProjectServiceImpl.java
查看文件 @c23e002
+++ b/synthesize_energy_api/src/main/java/com/synthesize_energy/item/web/service/impl/ProjectServiceImpl.java
查看文件 @c23e002
@@ -1348,7 +1348,7 @@ public class ProjectServiceImpl implements ProjectService {
                  *  多联机中央空调 装机容量
                  * 供冷面积*设计冷负荷/多联机中央空调制冷能效比*供冷比例
                  */
-                double a4 = (coldArea * coldLoadAll * synthesizeNo26ServiceById.getNo101() * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldD"))) / 100) / 1000;
+                double a4 = (coldArea * coldLoadAll * synthesizeNo26ServiceById.getNo101() * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldA"))) / 100) / 1000;
                 if (a3 > a4) {
                     MultiLineCentralAirConditioningInstalledCapacity = a3;
                 } else {
@@ -1730,16 +1730,12 @@ public class ProjectServiceImpl implements ProjectService {
                         synthesize_no_3_6.setNo47(num1);
                         no_3_1_1_1Dto.setInvestmentEstimation(format.apply(new BigDecimal(num1)));
                         no_3_1_1_1Dto.setProjectEarnings(format.apply(BigDecimal.valueOf((totalAnnualTotalHotWaterRequirement * synthesize_no_2_5.getHotWaterSellingPrice()) / 10000 * 0.4)));
-//                        double n319 = annualTotalHotWaterRequirement * commitmentRatio / 0.9 / synthesizeNo26ServiceById.getNo53() * (8 * end + 2 * tall) / 10 * Double.parseDouble(String.valueOf(jsonObject.get("hotWaterA"))) / 100 / 10000;
-//                        double n320 = (totalAnnualTotalHotWaterRequirement * synthesizeNo26ServiceById.getNo129() * Double.parseDouble(String.valueOf(jsonObject.get("hotWaterA"))) / 100 + airSourceHeatPumpCapacity * synthesizeNo26ServiceById.getNo59()) / 10000;
                         //空气源热泵(热水型)电费
                         double n319 = annualTotalHotWaterRequirement * 0.4 / 0.9 / synthesizeNo26ServiceById.getNo53() * (8 * end + 2 * tall) / 10 * Double.parseDouble(String.valueOf(jsonObject.get("hotWaterA"))) / 100 / 10000;/*供热水比例*/
                         //空气源热泵(热水行) 自来水费
                         double n320 = totalAnnualTotalHotWaterRequirement * synthesizeNo26ServiceById.getNo129() * Double.parseDouble(String.valueOf(jsonObject.get("hotWaterA"))) / 100 * 0.4 / 10000;
                         //空气源热泵(热水型)  运维费
-                        double n321 = airSourceHeatPumpCapacity * synthesizeNo26ServiceById.getNo59();
-                        //double n319 = 0.0;
-
+                        double n321 = airSourceHeatPumpCapacity * synthesizeNo26ServiceById.getNo59() / 10000;
                         Double num3 = n319 + n320 + n321;
                         no_3_1_1_1Dto.setRemark(format.apply(new BigDecimal(num3)));
@@ -2155,8 +2151,6 @@ public class ProjectServiceImpl implements ProjectService {
         currentYearFundData.setAnnualProfit(0.0);
         double zeroYearDeductionAddedTax = 0.0;
         for (int i = 0; i <= yearLength; i++) {
-
-
             //总 电费+ 燃气水费 + 运维费
             double annualTotalTransportationCost = annualElectricFee + annualFuelGasAndWaterFee + annualOperationFee;
@@ -2240,16 +2234,22 @@ public class ProjectServiceImpl implements ProjectService {
                 else ownAddedTax = annualProfit * 0.25;
             }
             //endregion
+            //TODO: 当利润小于0时 所得税为0 , 后续仍需处理
+//            if (annualProfit < 0) {
+//                ownAddedTax = 0;
+//            }
             //净现金流
             double NCF = annualIncome - annualOutcome - ownAddedTax;
             if (i == 0) {
 //                double r = 1 / Math.pow((1 + synthesize_no_2_6.getNo63()), 1);//第0年的折现因子
-                NCF = -totalInvestment ;
+                NCF = -totalInvestment;
             }
             list.add(NCF);
         }
         //region
+        //建设期
+        double buildingYear = synthesize_no_2_6.getNo61();
         for (int i = 0; i < list.size(); i++) {
             npvData = new NpvData();
             npvData.setYear(yearLength);
@@ -2262,21 +2262,9 @@ public class ProjectServiceImpl implements ProjectService {
          * 净现值（NPV）
          */
         double sum = 0;
-        int yearIndex = 0;
-        List<Double> sumList = new ArrayList<>();
         for (NpvData data : npvDatas) {
-//            if (yearIndex == 0) {
-//                sum = data.getRmb();
-//                sumList.add(sum);
-//            } else {
-//                double d = formatDouble1(data.getRmb()) * formatDouble1(data.getY());
-//                sumList.add(d);
-//                sum += d;
-//            }
             double d = formatDouble1(data.getRmb()) * formatDouble1(data.getY());
-            sumList.add(d);
             sum += d;
-            yearIndex++;
         }
         map.put("num1", df.format(sum));
         /**