孔广洋 / synthesize_energy_project · 提交

转到一个项目

作者 wwmin
提交 17d9e302b9a1dc3580b7ae1ebe0784a1c927710e 1 个父辈 04761778

能源方案 容量 投资 收入 计算修改

内嵌 并排对比
正在显示 1 个修改的文件 包含 21 行增加 和 19 行删除
@@ -628,7 +628,8 @@ public class ProjectServiceImpl implements ProjectService { @@ -628,7 +628,8 @@ public class ProjectServiceImpl implements ProjectService {
628 Double num1 = Double.valueOf(df.format(photovoltaicInstall * synthesizeNo26ServiceById.getNo18() / 10)); 628 Double num1 = Double.valueOf(df.format(photovoltaicInstall * synthesizeNo26ServiceById.getNo18() / 10));
629 no_3_1_1_1Dto.setInvestmentEstimation(format.apply(new BigDecimal(num1))); 629 no_3_1_1_1Dto.setInvestmentEstimation(format.apply(new BigDecimal(num1)));
630 synthesize_no_3_6.setNo36(num1); 630 synthesize_no_3_6.setNo36(num1);
631 - Double num2 = Double.valueOf(df.format(electricityAll * synthesize_no_2_5.getElectricitySellingPrice() / 10000)); 631 +// Double num2 = Double.valueOf(df.format(electricityAll * synthesize_no_2_5.getElectricitySellingPrice() / 10000));
  632 + Double num2 = Double.valueOf(df.format(synthesize_no_3_6.getNo51() * synthesize_no_2_5.getElectricitySellingPrice() / 10000));
632 no_3_1_1_1Dto.setProjectEarnings(format.apply(new BigDecimal(num2))); 633 no_3_1_1_1Dto.setProjectEarnings(format.apply(new BigDecimal(num2)));
633 synthesize_no_3_6.setNo24(num2); 634 synthesize_no_3_6.setNo24(num2);
634 Double num3 = Double.valueOf(df.format(photovoltaicInstall * synthesizeNo26ServiceById.getNo17() * 1000 / 10000)); 635 Double num3 = Double.valueOf(df.format(photovoltaicInstall * synthesizeNo26ServiceById.getNo17() * 1000 / 10000));
@@ -848,7 +849,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -848,7 +849,7 @@ public class ProjectServiceImpl implements ProjectService {
848 } 849 }
849 if (calculateLoad.getNo3().equals(calculateLoad.getNo33())) { 850 if (calculateLoad.getNo3().equals(calculateLoad.getNo33())) {
850 for (Synthesize_no_2_1 synthesizeNo21 : synthesize_no_2_1s) { 851 for (Synthesize_no_2_1 synthesizeNo21 : synthesize_no_2_1s) {
851 - hotLoadAll += synthesizeNo21.getDesignCoolingLoadIndex(); 852 + coldLoadAll += synthesizeNo21.getDesignCoolingLoadIndex();
852 } 853 }
853 //coldLoadAll += coldLoadDataMapper.queryName(zd_name, dict.getId()); 854 //coldLoadAll += coldLoadDataMapper.queryName(zd_name, dict.getId());
854 } else { 855 } else {
@@ -1241,12 +1242,13 @@ public class ProjectServiceImpl implements ProjectService { @@ -1241,12 +1242,13 @@ public class ProjectServiceImpl implements ProjectService {
1241 * =10*150*供冷面积*设计冷负荷*0.75/1000 1242 * =10*150*供冷面积*设计冷负荷*0.75/1000
1242 * 8 * 150 * coldArea * coldLoadAll * 0.75 / 1000 1243 * 8 * 150 * coldArea * coldLoadAll * 0.75 / 1000
1243 */ 1244 */
1244 - double annualTotalHeatRequirement = 0.0; 1245 + double annualTotalColdRequirement = 0.0;
1245 for (CalculateLoad calculateLoad : list1) { 1246 for (CalculateLoad calculateLoad : list1) {
1246 - annualTotalHeatRequirement += calculateLoad.getNo33(); 1247 + annualTotalColdRequirement += calculateLoad.getNo33();
1247 } 1248 }
1248 java.text.NumberFormat nf = java.text.NumberFormat.getInstance(); 1249 java.text.NumberFormat nf = java.text.NumberFormat.getInstance();
1249 nf.setGroupingUsed(false); 1250 nf.setGroupingUsed(false);
  1251 + /**年总需热量*/
1250 double AnnualTotalHeatRequirement = 0.0; 1252 double AnnualTotalHeatRequirement = 0.0;
1251 for (CalculateLoad calculateLoad : list1) { 1253 for (CalculateLoad calculateLoad : list1) {
1252 AnnualTotalHeatRequirement += calculateLoad.getNo22(); 1254 AnnualTotalHeatRequirement += calculateLoad.getNo22();
@@ -1269,7 +1271,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -1269,7 +1271,7 @@ public class ProjectServiceImpl implements ProjectService {
1269 * 选择单位 元/GJ 1271 * 选择单位 元/GJ
1270 * 供冷收入=供总需冷量*售冷价格 1272 * 供冷收入=供总需冷量*售冷价格
1271 */ 1273 */
1272 - coolingIncome = annualTotalHeatRequirement * synthesize_no_2_5.getColdSellingPrice(); 1274 + coolingIncome = annualTotalColdRequirement * synthesize_no_2_5.getColdSellingPrice();
1273 } 1275 }
1274 synthesize_no_3_6.setNo3(Double.valueOf(df.format(coolingIncome))); 1276 synthesize_no_3_6.setNo3(Double.valueOf(df.format(coolingIncome)));
1275 1277
@@ -1294,7 +1296,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -1294,7 +1296,7 @@ public class ProjectServiceImpl implements ProjectService {
1294 /** 1296 /**
1295 * 空气源热泵（制冷）年供冷量=年总需热量/0.9 1297 * 空气源热泵（制冷）年供冷量=年总需热量/0.9
1296 */ 1298 */
1297 - synthesize_no_3_6.setNo58(Double.valueOf(df.format(annualTotalHeatRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldA"))) / 100))); 1299 + synthesize_no_3_6.setNo58(Double.valueOf(df.format(annualTotalColdRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldA"))) / 100)));
1298 synthesize_no_3_6.setNo18(Double.valueOf(df.format(airSourceHeatPump))); 1300 synthesize_no_3_6.setNo18(Double.valueOf(df.format(airSourceHeatPump)));
1299 No_3_1_1_1Dto no_3_1_1_1Dto = new No_3_1_1_1Dto(); 1301 No_3_1_1_1Dto no_3_1_1_1Dto = new No_3_1_1_1Dto();
1300 no_3_1_1_1Dto.setName(array2[8]); 1302 no_3_1_1_1Dto.setName(array2[8]);
@@ -1302,14 +1304,14 @@ public class ProjectServiceImpl implements ProjectService { @@ -1302,14 +1304,14 @@ public class ProjectServiceImpl implements ProjectService {
1302 Double num1 = Double.valueOf(df.format(airSourceHeatPump * synthesizeNo26ServiceById.getNo39() / 10000)); 1304 Double num1 = Double.valueOf(df.format(airSourceHeatPump * synthesizeNo26ServiceById.getNo39() / 10000));
1303 synthesize_no_3_6.setNo43(num1); 1305 synthesize_no_3_6.setNo43(num1);
1304 no_3_1_1_1Dto.setInvestmentEstimation(format.apply(new BigDecimal(num1))); 1306 no_3_1_1_1Dto.setInvestmentEstimation(format.apply(new BigDecimal(num1)));
1305 - Double num2 = Double.valueOf(df.format((coolingIncome - annualTotalHeatRequirement / synthesizeNo26ServiceById.getNo38() * averageElectricityPrice) / 10000)); 1307 + Double num2 = Double.valueOf(df.format((coolingIncome - annualTotalColdRequirement / synthesizeNo26ServiceById.getNo38() * averageElectricityPrice) / 10000));
1306 synthesize_no_3_6.setNo31(num2); 1308 synthesize_no_3_6.setNo31(num2);
1307 no_3_1_1_1Dto.setProjectEarnings(format.apply(new BigDecimal(coolingIncome * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldA"))) / 100 / 10000))); 1309 no_3_1_1_1Dto.setProjectEarnings(format.apply(new BigDecimal(coolingIncome * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldA"))) / 100 / 10000)));
1308 Double num3 = 0.0; 1310 Double num3 = 0.0;
1309 if (Arrays.asList(powerCold).contains("6")) { 1311 if (Arrays.asList(powerCold).contains("6")) {
1310 - num3 = Double.valueOf(df.format(((annualTotalHeatRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldA"))) / 100 - coldStorageCapacity * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldA"))) / 100) / synthesizeNo26ServiceById.getNo38() * averageElectricityPrice + coldStorageCapacity * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldA"))) / 100 / 0.9 / synthesizeNo26ServiceById.getNo38() * end + airSourceHeatPump * synthesizeNo26ServiceById.getNo40() + coolStorageInstalledCapacity * synthesizeNo26ServiceById.getNo113()) / 10000)); 1312 + num3 = Double.valueOf(df.format(((annualTotalColdRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldA"))) / 100 - coldStorageCapacity * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldA"))) / 100) / synthesizeNo26ServiceById.getNo38() * averageElectricityPrice + coldStorageCapacity * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldA"))) / 100 / 0.9 / synthesizeNo26ServiceById.getNo38() * end + airSourceHeatPump * synthesizeNo26ServiceById.getNo40() + coolStorageInstalledCapacity * synthesizeNo26ServiceById.getNo113()) / 10000));
1311 } else { 1313 } else {
1312 - num3 = Double.valueOf(df.format(((annualTotalHeatRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldA"))) / 100) / synthesizeNo26ServiceById.getNo38() * averageElectricityPrice + airSourceHeatPump * synthesizeNo26ServiceById.getNo40()) / 10000)); 1314 + num3 = Double.valueOf(df.format(((annualTotalColdRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldA"))) / 100) / synthesizeNo26ServiceById.getNo38() * averageElectricityPrice + airSourceHeatPump * synthesizeNo26ServiceById.getNo40()) / 10000));
1313 } 1315 }
1314 no_3_1_1_1Dto.setRemark(format.apply(new BigDecimal(num3))); 1316 no_3_1_1_1Dto.setRemark(format.apply(new BigDecimal(num3)));
1315 synthesize_no_3_6.setNo73(num3); 1317 synthesize_no_3_6.setNo73(num3);
@@ -1322,14 +1324,14 @@ public class ProjectServiceImpl implements ProjectService { @@ -1322,14 +1324,14 @@ public class ProjectServiceImpl implements ProjectService {
1322 no_3_1_1_1Dto.setName(array2[9]); 1324 no_3_1_1_1Dto.setName(array2[9]);
1323 no_3_1_1_1Dto.setInstallCapacity("0.00"); 1325 no_3_1_1_1Dto.setInstallCapacity("0.00");
1324 no_3_1_1_1Dto.setInvestmentEstimation("0.00"); 1326 no_3_1_1_1Dto.setInvestmentEstimation("0.00");
1325 - Double num2 = Double.valueOf(df.format((coolingIncome - annualTotalHeatRequirement / synthesizeNo26ServiceById.getNo31() * averageElectricityPrice) / 10000)); 1327 + Double num2 = Double.valueOf(df.format((coolingIncome - annualTotalColdRequirement / synthesizeNo26ServiceById.getNo31() * averageElectricityPrice) / 10000));
1326 synthesize_no_3_6.setNo32(num2); 1328 synthesize_no_3_6.setNo32(num2);
1327 no_3_1_1_1Dto.setProjectEarnings(format.apply(new BigDecimal(coolingIncome * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldB"))) / 100 / 10000))); 1329 no_3_1_1_1Dto.setProjectEarnings(format.apply(new BigDecimal(coolingIncome * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldB"))) / 100 / 10000)));
1328 Double num3 = 0.0; 1330 Double num3 = 0.0;
1329 if (Arrays.asList(powerCold).contains("6")) { 1331 if (Arrays.asList(powerCold).contains("6")) {
1330 - num3 = Double.valueOf(df.format(((annualTotalHeatRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldB"))) / 100 - coldStorageCapacity * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldB"))) / 100) / synthesizeNo26ServiceById.getNo31() * averageElectricityPrice + coldStorageCapacity * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldB"))) / 100 / 0.9 / synthesizeNo26ServiceById.getNo31() * end + synthesize_no_3_6.getNo16() * synthesizeNo26ServiceById.getNo33() + coolStorageInstalledCapacity * synthesizeNo26ServiceById.getNo113()) / 10000)); 1332 + num3 = Double.valueOf(df.format(((annualTotalColdRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldB"))) / 100 - coldStorageCapacity * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldB"))) / 100) / synthesizeNo26ServiceById.getNo31() * averageElectricityPrice + coldStorageCapacity * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldB"))) / 100 / 0.9 / synthesizeNo26ServiceById.getNo31() * end + synthesize_no_3_6.getNo16() * synthesizeNo26ServiceById.getNo33() + coolStorageInstalledCapacity * synthesizeNo26ServiceById.getNo113()) / 10000));
1331 } else { 1333 } else {
1332 - num3 = Double.valueOf(df.format(((annualTotalHeatRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldB"))) / 100) / synthesizeNo26ServiceById.getNo31() * averageElectricityPrice + synthesize_no_3_6.getNo16() * synthesizeNo26ServiceById.getNo33()) / 10000)); 1334 + num3 = Double.valueOf(df.format(((annualTotalColdRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldB"))) / 100) / synthesizeNo26ServiceById.getNo31() * averageElectricityPrice + synthesize_no_3_6.getNo16() * synthesizeNo26ServiceById.getNo33()) / 10000));
1333 } 1335 }
1334 no_3_1_1_1Dto.setRemark(format.apply(new BigDecimal(num3))); 1336 no_3_1_1_1Dto.setRemark(format.apply(new BigDecimal(num3)));
1335 synthesize_no_3_6.setNo74(num3); 1337 synthesize_no_3_6.setNo74(num3);
@@ -1338,7 +1340,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -1338,7 +1340,7 @@ public class ProjectServiceImpl implements ProjectService {
1338 /** 1340 /**
1339 * 冷水机组 1341 * 冷水机组
1340 */ 1342 */
1341 - synthesize_no_3_6.setNo59(Double.valueOf(df.format(annualTotalHeatRequirement / 0.85 * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldC"))) / 100))); 1343 + synthesize_no_3_6.setNo59(Double.valueOf(df.format(annualTotalColdRequirement / 0.85 * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldC"))) / 100)));
1342 synthesize_no_3_6.setNo19(Double.valueOf(df.format(assemblyCapacityOfChiller))); 1344 synthesize_no_3_6.setNo19(Double.valueOf(df.format(assemblyCapacityOfChiller)));
1343 No_3_1_1_1Dto no_3_1_1_1Dto = new No_3_1_1_1Dto(); 1345 No_3_1_1_1Dto no_3_1_1_1Dto = new No_3_1_1_1Dto();
1344 no_3_1_1_1Dto.setName(array2[10]); 1346 no_3_1_1_1Dto.setName(array2[10]);
@@ -1346,14 +1348,14 @@ public class ProjectServiceImpl implements ProjectService { @@ -1346,14 +1348,14 @@ public class ProjectServiceImpl implements ProjectService {
1346 Double num1 = Double.valueOf(df.format(assemblyCapacityOfChiller * synthesizeNo26ServiceById.getNo49() / 10000)); 1348 Double num1 = Double.valueOf(df.format(assemblyCapacityOfChiller * synthesizeNo26ServiceById.getNo49() / 10000));
1347 no_3_1_1_1Dto.setInvestmentEstimation(format.apply(new BigDecimal(num1))); 1349 no_3_1_1_1Dto.setInvestmentEstimation(format.apply(new BigDecimal(num1)));
1348 synthesize_no_3_6.setNo45(num1); 1350 synthesize_no_3_6.setNo45(num1);
1349 - Double num2 = Double.valueOf(df.format((coolingIncome - annualTotalHeatRequirement / synthesizeNo26ServiceById.getNo47() * averageElectricityPrice) / 10000)); 1351 + Double num2 = Double.valueOf(df.format((coolingIncome - annualTotalColdRequirement / synthesizeNo26ServiceById.getNo47() * averageElectricityPrice) / 10000));
1350 synthesize_no_3_6.setNo33(num2); 1352 synthesize_no_3_6.setNo33(num2);
1351 no_3_1_1_1Dto.setProjectEarnings(format.apply(new BigDecimal(coolingIncome * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldC"))) / 100 / 10000))); 1353 no_3_1_1_1Dto.setProjectEarnings(format.apply(new BigDecimal(coolingIncome * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldC"))) / 100 / 10000)));
1352 Double num3 = 0.0; 1354 Double num3 = 0.0;
1353 if (Arrays.asList(powerCold).contains("6")) { 1355 if (Arrays.asList(powerCold).contains("6")) {
1354 - num3 = Double.valueOf(df.format(((annualTotalHeatRequirement / 0.85 * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldC"))) / 100 - coldStorageCapacity * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldC"))) / 100) / synthesizeNo26ServiceById.getNo47() * averageElectricityPrice + coldStorageCapacity * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldC"))) / 100 / 0.9 / synthesizeNo26ServiceById.getNo47() * end + assemblyCapacityOfChiller * synthesizeNo26ServiceById.getNo48() + coolStorageInstalledCapacity * synthesizeNo26ServiceById.getNo113()) / 10000)); 1356 + num3 = Double.valueOf(df.format(((annualTotalColdRequirement * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldC"))) / 100 - coldStorageCapacity * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldC"))) / 100) / synthesizeNo26ServiceById.getNo47() * averageElectricityPrice + coldStorageCapacity * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldC"))) / 100 / 0.9 / synthesizeNo26ServiceById.getNo47() * end + assemblyCapacityOfChiller * synthesizeNo26ServiceById.getNo48() + coolStorageInstalledCapacity * synthesizeNo26ServiceById.getNo113()) / 10000));
1355 } else { 1357 } else {
1356 - num3 = Double.valueOf(df.format(((annualTotalHeatRequirement / 0.85 * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldC"))) / 100) / synthesizeNo26ServiceById.getNo47() * averageElectricityPrice + assemblyCapacityOfChiller * synthesizeNo26ServiceById.getNo48()) / 10000)); 1358 + num3 = Double.valueOf(df.format(((annualTotalColdRequirement * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldC"))) / 100) / synthesizeNo26ServiceById.getNo47() * averageElectricityPrice + assemblyCapacityOfChiller * synthesizeNo26ServiceById.getNo48()) / 10000));
1357 } 1359 }
1358 no_3_1_1_1Dto.setRemark(format.apply(new BigDecimal(num3))); 1360 no_3_1_1_1Dto.setRemark(format.apply(new BigDecimal(num3)));
1359 synthesize_no_3_6.setNo75(num3); 1361 synthesize_no_3_6.setNo75(num3);
@@ -1372,12 +1374,12 @@ public class ProjectServiceImpl implements ProjectService { @@ -1372,12 +1374,12 @@ public class ProjectServiceImpl implements ProjectService {
1372 /** 1374 /**
1373 * 多联机中央空调成本=（多联机中央空调年供冷量/多联机中央空调制冷能效比*平均电价+年蓄冷量/0.9*低谷电价+单位运维*容量+蓄热单位运维*容量）/10000 1375 * 多联机中央空调成本=（多联机中央空调年供冷量/多联机中央空调制冷能效比*平均电价+年蓄冷量/0.9*低谷电价+单位运维*容量+蓄热单位运维*容量）/10000
1374 */ 1376 */
1375 - synthesize_no_3_6.setNo226(Double.valueOf(df.format(annualTotalHeatRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldD"))) / 100))); 1377 + synthesize_no_3_6.setNo226(Double.valueOf(df.format(annualTotalColdRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldD"))) / 100)));
1376 Double num2 = 0.0; 1378 Double num2 = 0.0;
1377 if (Arrays.asList(powerCold).contains("6")) { 1379 if (Arrays.asList(powerCold).contains("6")) {
1378 - num2 = Double.valueOf(df.format(((annualTotalHeatRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldD"))) / 100 - coldStorageCapacity * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldD"))) / 100) / synthesizeNo26ServiceById.getNo101() * averageElectricityPrice + coldStorageCapacity * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldD"))) / 100 / 0.9 * end + synthesizeNo26ServiceById.getNo103() * synthesize_no_3_6.getNo201() + coolStorageInstalledCapacity * synthesizeNo26ServiceById.getNo113()) / 10000)); 1380 + num2 = Double.valueOf(df.format(((annualTotalColdRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldD"))) / 100 - coldStorageCapacity * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldD"))) / 100) / synthesizeNo26ServiceById.getNo101() * averageElectricityPrice + coldStorageCapacity * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldD"))) / 100 / 0.9 * end + synthesizeNo26ServiceById.getNo103() * synthesize_no_3_6.getNo201() + coolStorageInstalledCapacity * synthesizeNo26ServiceById.getNo113()) / 10000));
1379 } else { 1381 } else {
1380 - num2 = Double.valueOf(df.format(((annualTotalHeatRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldD"))) / 100) / synthesizeNo26ServiceById.getNo101() * averageElectricityPrice + synthesizeNo26ServiceById.getNo103() * synthesize_no_3_6.getNo201()) / 10000)); 1382 + num2 = Double.valueOf(df.format(((annualTotalColdRequirement / 0.9 * Double.parseDouble(String.valueOf(jsonObjectCold.get("coldD"))) / 100) / synthesizeNo26ServiceById.getNo101() * averageElectricityPrice + synthesizeNo26ServiceById.getNo103() * synthesize_no_3_6.getNo201()) / 10000));
1381 } 1383 }
1382 no_3_1_1_1Dto.setRemark(format.apply(new BigDecimal(num2))); 1384 no_3_1_1_1Dto.setRemark(format.apply(new BigDecimal(num2)));
1383 list2.add(no_3_1_1_1Dto); 1385 list2.add(no_3_1_1_1Dto);