孔广洋 / synthesize_energy_project · 提交

转到一个项目

作者 wwmin
提交 f4436cb24f761ff3d96aae666ac2063022e0aeba 1 个父辈 30469047

修改三免三减半

内嵌 并排对比
正在显示 1 个修改的文件 包含 8 行增加 和 8 行删除
@@ -1037,12 +1037,12 @@ public class ProjectServiceImpl implements ProjectService { @@ -1037,12 +1037,12 @@ public class ProjectServiceImpl implements ProjectService {
1037 double n302 = 0.0; 1037 double n302 = 0.0;
1038 Double num3 = 0.0; 1038 Double num3 = 0.0;
1039 if (Arrays.asList(powerHot).contains("6")) { 1039 if (Arrays.asList(powerHot).contains("6")) {
1040 - n301 = (annualTotalHeatRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObject.get("hotA"))) / 100 - heatStorage * Double.parseDouble(String.valueOf(jsonObject.get("hotA"))) / 100) / synthesizeNo26ServiceById.getNo26() * averageElectricityPrice + heatStorage / 0.9 * Double.parseDouble(String.valueOf(jsonObject.get("hotA"))) / 100 * end / 10000;  
1041 - n302 = airSourceHeatPump * synthesizeNo26ServiceById.getNo27() + heatStorageInstalledCapacity * synthesizeNo26ServiceById.getNo106() / 10000; 1040 + n301 = ((annualTotalHeatRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObject.get("hotA"))) / 100 - heatStorage * Double.parseDouble(String.valueOf(jsonObject.get("hotA"))) / 100) / synthesizeNo26ServiceById.getNo26() * averageElectricityPrice + heatStorage / 0.9 * Double.parseDouble(String.valueOf(jsonObject.get("hotA"))) / 100 * end) / 10000;
  1041 + n302 = (airSourceHeatPump * synthesizeNo26ServiceById.getNo27() + heatStorageInstalledCapacity * synthesizeNo26ServiceById.getNo106()) / 10000;
1042 num3 = n301 + n302; 1042 num3 = n301 + n302;
1043 } else if (Arrays.asList(powerHot).contains("7")) { 1043 } else if (Arrays.asList(powerHot).contains("7")) {
1044 - n301 = (annualTotalHeatRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObject.get("hotA"))) / 100 - heatStorage * Double.parseDouble(String.valueOf(jsonObject.get("hotA"))) / 100) / synthesizeNo26ServiceById.getNo26() * averageElectricityPrice + heatStorage / 0.9 * Double.parseDouble(String.valueOf(jsonObject.get("hotA"))) / 100 * end / 10000;  
1045 - n302 = airSourceHeatPump * synthesizeNo26ServiceById.getNo27() + doubleStorageCapacity * synthesizeNo26ServiceById.getNo110() / 10000; 1044 + n301 = ((annualTotalHeatRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObject.get("hotA"))) / 100 - heatStorage * Double.parseDouble(String.valueOf(jsonObject.get("hotA"))) / 100) / synthesizeNo26ServiceById.getNo26() * averageElectricityPrice + heatStorage / 0.9 * Double.parseDouble(String.valueOf(jsonObject.get("hotA"))) / 100 * end) / 10000;
  1045 + n302 = (airSourceHeatPump * synthesizeNo26ServiceById.getNo27() + doubleStorageCapacity * synthesizeNo26ServiceById.getNo110()) / 10000;
1046 num3 = n301 + n302; 1046 num3 = n301 + n302;
1047 } else { 1047 } else {
1048 n301 = (annualTotalHeatRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObject.get("hotA"))) / 100) / synthesizeNo26ServiceById.getNo26() * averageElectricityPrice / 10000; 1048 n301 = (annualTotalHeatRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObject.get("hotA"))) / 100) / synthesizeNo26ServiceById.getNo26() * averageElectricityPrice / 10000;
@@ -1559,8 +1559,8 @@ public class ProjectServiceImpl implements ProjectService { @@ -1559,8 +1559,8 @@ public class ProjectServiceImpl implements ProjectService {
1559 no_3_1_1_1Dto.setRemark(format.apply(new BigDecimal(num3))); 1559 no_3_1_1_1Dto.setRemark(format.apply(new BigDecimal(num3)));
1560 synthesize_no_3_6.setNo328(n328); 1560 synthesize_no_3_6.setNo328(n328);
1561 synthesize_no_3_6.setNo329(n329); 1561 synthesize_no_3_6.setNo329(n329);
1562 -// synthesize_no_3_6.setNo75(num3);  
1563 -// no_3_1_1_1Dto.setRemark(format.apply(new BigDecimal(num2))); 1562 + synthesize_no_3_6.setNo75(num3);
  1563 + no_3_1_1_1Dto.setRemark(format.apply(new BigDecimal(num2)));
1564 1564
1565 list2.add(no_3_1_1_1Dto); 1565 list2.add(no_3_1_1_1Dto);
1566 } else if ("5".equals(s1)) { 1566 } else if ("5".equals(s1)) {
@@ -2184,7 +2184,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -2184,7 +2184,7 @@ public class ProjectServiceImpl implements ProjectService {
2184 case 1: 2184 case 1:
2185 case 2: 2185 case 2:
2186 case 3: 2186 case 3:
2187 - ownAddedTax = annualProfit; 2187 + ownAddedTax = annualProfit * 0;
2188 break; 2188 break;
2189 case 4: 2189 case 4:
2190 case 5: 2190 case 5:
@@ -2214,7 +2214,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -2214,7 +2214,7 @@ public class ProjectServiceImpl implements ProjectService {
2214 case 1: 2214 case 1:
2215 case 2: 2215 case 2:
2216 case 3: 2216 case 3:
2217 - ownAddedTax = annualProfit; 2217 + ownAddedTax = annualProfit * 0;
2218 break; 2218 break;
2219 case 4: 2219 case 4:
2220 case 5: 2220 case 5: