去掉其他投资费用 和 电网

+**/.idea/*
+**/target/*
\ No newline at end of file

@@ -22,6 +22,6 @@ public class No_3_1Tall_Dto {
     private String totalAll;
     @ApiModelProperty("储能备注")
     private String energyStorageRemarks;
-    @ApiModelProperty("其他投资费用")
+    @ApiModelProperty("其他投资")
     private String otherInvestmentCosts;
 }

@@ -35,6 +35,6 @@ public class Synthesize_no_2_5 implements Serializable {
     private String unit2;
     @ApiModelProperty("1三免三减半 2高新技术企业 3都选")
     private String sale;
-    @ApiModelProperty("其他投资费用")
+    @ApiModelProperty("其他投资")
     private Double otherMoney;
 }

@@ -599,7 +599,7 @@ public class ProjectServiceImpl implements ProjectService {
                 no_3_1_1_1Dto.setProjectEarnings(format.apply(new BigDecimal(projectEarnings)));
                 no_3_1_1_1Dto.setRemark(format.apply(new BigDecimal(projectEarnings1)));
                 synthesize_no_3_6.setNo65(projectEarnings1);
-                list2.add(no_3_1_1_1Dto);
+//                list2.add(no_3_1_1_1Dto);//去掉电网投资费用 同时年营业收入 和 年运营成本 中不参与计算
 
                 for (String string : strings) {
                     /**
@@ -634,7 +634,14 @@ public class ProjectServiceImpl implements ProjectService {
                         Double num1 = Double.valueOf(df.format(windAh * synthesizeNo26ServiceById.getNo21() / 10));
                         synthesize_no_3_6.setNo37(num1);
                         no_3_1_1_1Dto.setInvestmentEstimation(format.apply(new BigDecimal(num1)));
-                        Double num2 = Double.valueOf(df.format(windAh * synthesizeNo26ServiceById.getNo124() * synthesize_no_2_5.getElectricitySellingPrice() / 10000));
+                        Double fd = windAh * synthesizeNo26ServiceById.getNo124();
+                        Double num2 = 0d;
+                        if(fd>electricityAll){
+                            num2 = Double.valueOf(df.format(electricityAll * synthesize_no_2_5.getElectricitySellingPrice() / 10000));
+                        }else{
+                             num2 = Double.valueOf(df.format(fd * synthesize_no_2_5.getElectricitySellingPrice() / 10000));
+                        }
+
                         synthesize_no_3_6.setNo25(num2);
                         no_3_1_1_1Dto.setProjectEarnings(format.apply(new BigDecimal(num2)));
                         Double num3 = Double.valueOf(df.format(windAh * synthesizeNo26ServiceById.getNo22() * 1000 / 10000));
@@ -1613,9 +1620,9 @@ public class ProjectServiceImpl implements ProjectService {
         }
         Double otherInvestmentCosts = 0.0;
         if (StringUtils.isEmpty(synthesize_no_2_5.getOtherMoney())) {
-            no_3_1Tall_dto.setOtherInvestmentCosts("注：其他投资费用 0" + "万元");
+            no_3_1Tall_dto.setOtherInvestmentCosts("注：其他投资 0" + "万元");
         } else {
-            no_3_1Tall_dto.setOtherInvestmentCosts("注：其他投资费用 " + Double.valueOf(df.format(synthesize_no_2_5.getOtherMoney())) + "万元");
+            no_3_1Tall_dto.setOtherInvestmentCosts("注：其他投资 " + Double.valueOf(df.format(synthesize_no_2_5.getOtherMoney())) + "万元");
             otherInvestmentCosts = synthesize_no_2_5.getOtherMoney();
         }
 /*        for (No_3_1_1_1Dto no_3_1_1_1Dto : list.get(0).getList()) {
@@ -1779,18 +1786,18 @@ public class ProjectServiceImpl implements ProjectService {
          * 节约标煤=（光伏发电量+风电发电量+年需热量/（空气源热泵能效比-1）/0.9+年需供热量/（1-电锅炉热效率）+年需供热量/（1-燃气锅炉热效率）+年需热量/（多联机空调能效比-1）+年蓄热量/3+年需冷量/
          * （空气源热泵能效比-1）+年需供冷量/（冷水机组能效比-1）+年需冷量/（多联机空调能效比-1）+年蓄冷量/3+[4.2*年总需热水热量/0.9*（0.6+0.4/（空气源热泵（热水型）COP-1）]）*0.404/1000
          */
-        double savingStandardCoal = ((synthesize_no_3_6.getNo51() + synthesize_no_3_6.getNo52() + Double.parseDouble(format) / (synthesizeNo26ServiceById.getNo26() - 1) / 0.9 + synthesize_no_3_6.getNo55() /
+        double savingStandardCoal = (((synthesize_no_3_6.getNo51() + synthesize_no_3_6.getNo52() + Double.parseDouble(format) / (synthesizeNo26ServiceById.getNo26() - 1) / 0.9 + synthesize_no_3_6.getNo55() /
                 (1 - synthesizeNo26ServiceById.getNo23()) + synthesize_no_3_6.getNo57() / (1 - synthesizeNo26ServiceById.getNo35()) + Double.parseDouble(format) / (synthesizeNo26ServiceById.getNo100() - 1) + synthesize_no_3_6.getNo233() / 3 + Double.parseDouble(format2)
                 / (synthesizeNo26ServiceById.getNo38() - 1) + synthesize_no_3_6.getNo58() / (synthesizeNo26ServiceById.getNo47() - 1) + Double.parseDouble(format2) /
-                (synthesizeNo26ServiceById.getNo101() - 1) + synthesize_no_3_6.getNo234() / 3 + (4.2 * synthesize_no_3_6.getNo62() / 0.9 * (0.6 + 0.4 / (synthesizeNo26ServiceById.getNo53() - 1))) * 0.404 / 1000));
+                (synthesizeNo26ServiceById.getNo101() - 1) + synthesize_no_3_6.getNo234() / 3 + (4.2 * synthesize_no_3_6.getNo62() / 0.9 * (0.6 + 0.4 / (synthesizeNo26ServiceById.getNo53() - 1)))) * 0.404 / 1000));
         /**
          * @description 二氧化碳减排 =（光伏发电量+风电发电量+[4.2*年总需热水热量/0.9*（0.6+0.4*（空气源热泵（热水型）COP-1）]）*0.03/1000
          * 节约标煤=（光伏发电量+风电发电量+年需热量/（热泵能效比-1）/0.9+年需供热量/（1-电锅炉热效率）+年需供热量/（1-燃气锅炉热效率）+年需热量/（多联机空调能效比-1）+年蓄热量/3+年需冷量/（空气源热泵能效比-1）+年需供冷量/（冷水机组能效比-1）+年需冷量/（多联机空调能效比-1）+年蓄冷量/3+[4.2*年总需热水热量/0.9*（0.6+0.4/（空气源热泵（热水型）COP-1）]）*0.03/1000
          */
-        double co2Reduction = ((synthesize_no_3_6.getNo51() + synthesize_no_3_6.getNo52() + Double.parseDouble(format) / (synthesizeNo26ServiceById.getNo26() - 1) / 0.9 + synthesize_no_3_6.getNo54() / (1 - synthesizeNo26ServiceById.getNo23()) +
+        double co2Reduction = (((synthesize_no_3_6.getNo51() + synthesize_no_3_6.getNo52() + Double.parseDouble(format) / (synthesizeNo26ServiceById.getNo26() - 1) / 0.9 + synthesize_no_3_6.getNo54() / (1 - synthesizeNo26ServiceById.getNo23()) +
                 synthesize_no_3_6.getNo57() / (1 - synthesizeNo26ServiceById.getNo35()) + Double.parseDouble(format) / (synthesizeNo26ServiceById.getNo100() - 1) + synthesize_no_3_6.getNo233() / 3 +
                 Double.parseDouble(format2) / (synthesizeNo26ServiceById.getNo47() - 1) + synthesize_no_3_6.getNo59() / (synthesizeNo26ServiceById.getNo38() - 1) + Double.parseDouble(format2) / (synthesizeNo26ServiceById.getNo101() - 1)
-                + synthesize_no_3_6.getNo234() / 3 + (4.2 * synthesize_no_3_6.getNo62() / 0.9 * (0.6 + 0.4 / (synthesizeNo26ServiceById.getNo53() - 1))) * 0.03 / 1000));
+                + synthesize_no_3_6.getNo234() / 3 + (4.2 * synthesize_no_3_6.getNo62() / 0.9 * (0.6 + 0.4 / (synthesizeNo26ServiceById.getNo53() - 1)))) * 0.997 / 1000));
         Map<String, Object> map = new HashMap<>(2);
         if (savingStandardCoal == 0) {
             map.put("num1", 0 + "吨");

+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
+</module>
\ No newline at end of file