项目部署 算法修改

@@ -961,7 +961,7 @@ public class ProjectServiceImpl implements ProjectService {
                             } else if (electricBoilerAll >= 2000 && electricBoilerAll <= 4000) {
                                 num = 800.0;
                             } else if (electricBoilerAll >= 4000) {
-                                num = 320 + 13 * (electricBoilerAll - 4000);
+                                num = (320 + 13 * (electricBoilerAll - 4000) / 1000) * 10000 / electricBoilerAll;
                             }
                         } else {
                             num = synthesizeNo26ServiceById.getNo25();
@@ -3517,14 +3517,20 @@ public class ProjectServiceImpl implements ProjectService {
                         equipmentCapacityDto1.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo53())));
                         equipmentCapacityDto1.setType("3");
                         list2.add(equipmentCapacityDto1);
-                    } else {
+                    }
+/*                    else {
                         EquipmentCapacityDto equipmentCapacityDto1 = new EquipmentCapacityDto();
                         equipmentCapacityDto1.setName("电网");
                         equipmentCapacityDto1.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo50())));
                         equipmentCapacityDto1.setType("4");
                         list2.add(equipmentCapacityDto1);
-                    }
+                    }*/
                 }
+                EquipmentCapacityDto equipmentCapacityDto1 = new EquipmentCapacityDto();
+                equipmentCapacityDto1.setName("电网");
+                equipmentCapacityDto1.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo50())));
+                equipmentCapacityDto1.setType("4");
+                list2.add(equipmentCapacityDto1);
                 Double date = 0.0;
                 for (EquipmentCapacityDto capacityDto : list2) {
                     date += Double.parseDouble(capacityDto.getData());