孔广洋 / synthesize_energy_project · 提交

转到一个项目

作者 wwmin
提交 f4436cb24f761ff3d96aae666ac2063022e0aeba 1 个父辈 30469047

修改三免三减半

内嵌 并排对比
正在显示 1 个修改的文件 包含 8 行增加 和 8 行删除
... ... @@ -1037,12 +1037,12 @@ public class ProjectServiceImpl implements ProjectService {
double n302 = 0.0;
Double num3 = 0.0;
if (Arrays.asList(powerHot).contains("6")) {
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;
n302 = airSourceHeatPump * synthesizeNo26ServiceById.getNo27() + heatStorageInstalledCapacity * synthesizeNo26ServiceById.getNo106() / 10000;
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;
n302 = (airSourceHeatPump * synthesizeNo26ServiceById.getNo27() + heatStorageInstalledCapacity * synthesizeNo26ServiceById.getNo106()) / 10000;
num3 = n301 + n302;
} else if (Arrays.asList(powerHot).contains("7")) {
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;
n302 = airSourceHeatPump * synthesizeNo26ServiceById.getNo27() + doubleStorageCapacity * synthesizeNo26ServiceById.getNo110() / 10000;
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;
n302 = (airSourceHeatPump * synthesizeNo26ServiceById.getNo27() + doubleStorageCapacity * synthesizeNo26ServiceById.getNo110()) / 10000;
num3 = n301 + n302;
} else {
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 {
no_3_1_1_1Dto.setRemark(format.apply(new BigDecimal(num3)));
synthesize_no_3_6.setNo328(n328);
synthesize_no_3_6.setNo329(n329);
// synthesize_no_3_6.setNo75(num3);
// no_3_1_1_1Dto.setRemark(format.apply(new BigDecimal(num2)));
synthesize_no_3_6.setNo75(num3);
no_3_1_1_1Dto.setRemark(format.apply(new BigDecimal(num2)));
list2.add(no_3_1_1_1Dto);
} else if ("5".equals(s1)) {
... ... @@ -2184,7 +2184,7 @@ public class ProjectServiceImpl implements ProjectService {
case 1:
case 2:
case 3:
ownAddedTax = annualProfit;
ownAddedTax = annualProfit * 0;
break;
case 4:
case 5:
... ... @@ -2214,7 +2214,7 @@ public class ProjectServiceImpl implements ProjectService {
case 1:
case 2:
case 3:
ownAddedTax = annualProfit;
ownAddedTax = annualProfit * 0;
break;
case 4:
case 5:
... ...