风机绩效表明细风能利用率修改

src/main/java/com/gyee/frame/service/ProjectPlanService.java

@@ -138,7 +138,11 @@ public class ProjectPlanService implements BaseService<ProjectPlan, ProjectPlanE
 					event.setProjectName(project.getName());
 				}
 
-				event.setWindpowerName(InitialRunner.wpmap.get(pp.getWindpower()).getName());
+				if(InitialRunner.wpmap.containsKey(pp.getWindpower()))
+				{
+					event.setWindpowerName(InitialRunner.wpmap.get(pp.getWindpower()).getName());
+
+				}
 				list.add(event);
 			}
 
@@ -153,19 +157,34 @@ public class ProjectPlanService implements BaseService<ProjectPlan, ProjectPlanE
 				}
 				if(!currentWindpowerStation.equals(vo.getWindpowerName())){
 					ProjectPlanVo wpGc=new ProjectPlanVo();
-					wpGc.setGc01(String.valueOf(windpowerGc[0]));
-					wpGc.setGc02(String.valueOf(windpowerGc[1]));
-					wpGc.setGc03(String.valueOf(windpowerGc[2]));
-					wpGc.setGc04(String.valueOf(windpowerGc[3]));
-					wpGc.setGc05(String.valueOf(windpowerGc[4]));
-					wpGc.setGc06(String.valueOf(windpowerGc[5]));
-					wpGc.setGc07(String.valueOf(windpowerGc[6]));
-					wpGc.setGc08(String.valueOf(windpowerGc[7]));
-					wpGc.setGc09(String.valueOf(windpowerGc[8]));
-					wpGc.setGc10(String.valueOf(windpowerGc[9]));
-					wpGc.setGc11(String.valueOf(windpowerGc[10]));
-					wpGc.setGc12(String.valueOf(windpowerGc[11]));
-					wpGc.setGeneratingcapacity(String.valueOf(windpowerGc[12]));
+//					wpGc.setGc01(String.valueOf(windpowerGc[0]));
+//					wpGc.setGc02(String.valueOf(windpowerGc[1]));
+//					wpGc.setGc03(String.valueOf(windpowerGc[2]));
+//					wpGc.setGc04(String.valueOf(windpowerGc[3]));
+//					wpGc.setGc05(String.valueOf(windpowerGc[4]));
+//					wpGc.setGc06(String.valueOf(windpowerGc[5]));
+//					wpGc.setGc07(String.valueOf(windpowerGc[6]));
+//					wpGc.setGc08(String.valueOf(windpowerGc[7]));
+//					wpGc.setGc09(String.valueOf(windpowerGc[8]));
+//					wpGc.setGc10(String.valueOf(windpowerGc[9]));
+//					wpGc.setGc11(String.valueOf(windpowerGc[10]));
+//					wpGc.setGc12(String.valueOf(windpowerGc[11]));
+//					wpGc.setGeneratingcapacity(String.valueOf(windpowerGc[12]));
+
+
+					wpGc.setGc01(String.valueOf(StringUtils.round(windpowerGc[0],2)));
+					wpGc.setGc02(String.valueOf(StringUtils.round(windpowerGc[1],2)));
+					wpGc.setGc03(String.valueOf(StringUtils.round(windpowerGc[2],2)));
+					wpGc.setGc04(String.valueOf(StringUtils.round(windpowerGc[3],2)));
+					wpGc.setGc05(String.valueOf(StringUtils.round(windpowerGc[4],2)));
+					wpGc.setGc06(String.valueOf(StringUtils.round(windpowerGc[5],2)));
+					wpGc.setGc07(String.valueOf(StringUtils.round(windpowerGc[6],2)));
+					wpGc.setGc08(String.valueOf(StringUtils.round(windpowerGc[7],2)));
+					wpGc.setGc09(String.valueOf(StringUtils.round(windpowerGc[8],2)));
+					wpGc.setGc10(String.valueOf(StringUtils.round(windpowerGc[9],2)));
+					wpGc.setGc11(String.valueOf(StringUtils.round(windpowerGc[10],2)));
+					wpGc.setGc12(String.valueOf(StringUtils.round(windpowerGc[11],2)));
+					wpGc.setGeneratingcapacity(String.valueOf(StringUtils.round(windpowerGc[12],2)));
 					wpGc.setProjectName(currentWindpowerStation);
 
 					wpGc.setYear(year);
@@ -242,19 +261,19 @@ public class ProjectPlanService implements BaseService<ProjectPlan, ProjectPlanE
 
 
 			ProjectPlanVo wpGc=new ProjectPlanVo();
-			wpGc.setGc01(String.valueOf(windpowerGc[0]));
-			wpGc.setGc02(String.valueOf(windpowerGc[1]));
-			wpGc.setGc03(String.valueOf(windpowerGc[2]));
-			wpGc.setGc04(String.valueOf(windpowerGc[3]));
-			wpGc.setGc05(String.valueOf(windpowerGc[4]));
-			wpGc.setGc06(String.valueOf(windpowerGc[5]));
-			wpGc.setGc07(String.valueOf(windpowerGc[6]));
-			wpGc.setGc08(String.valueOf(windpowerGc[7]));
-			wpGc.setGc09(String.valueOf(windpowerGc[8]));
-			wpGc.setGc10(String.valueOf(windpowerGc[9]));
-			wpGc.setGc11(String.valueOf(windpowerGc[10]));
-			wpGc.setGc12(String.valueOf(windpowerGc[11]));
-			wpGc.setGeneratingcapacity(String.valueOf(windpowerGc[12]));
+			wpGc.setGc01(String.valueOf(StringUtils.round(windpowerGc[0],2)));
+			wpGc.setGc02(String.valueOf(StringUtils.round(windpowerGc[1],2)));
+			wpGc.setGc03(String.valueOf(StringUtils.round(windpowerGc[2],2)));
+			wpGc.setGc04(String.valueOf(StringUtils.round(windpowerGc[3],2)));
+			wpGc.setGc05(String.valueOf(StringUtils.round(windpowerGc[4],2)));
+			wpGc.setGc06(String.valueOf(StringUtils.round(windpowerGc[5],2)));
+			wpGc.setGc07(String.valueOf(StringUtils.round(windpowerGc[6],2)));
+			wpGc.setGc08(String.valueOf(StringUtils.round(windpowerGc[7],2)));
+			wpGc.setGc09(String.valueOf(StringUtils.round(windpowerGc[8],2)));
+			wpGc.setGc10(String.valueOf(StringUtils.round(windpowerGc[9],2)));
+			wpGc.setGc11(String.valueOf(StringUtils.round(windpowerGc[10],2)));
+			wpGc.setGc12(String.valueOf(StringUtils.round(windpowerGc[11],2)));
+			wpGc.setGeneratingcapacity(String.valueOf(StringUtils.round(windpowerGc[12],2)));
 			wpGc.setProjectName(currentWindpowerStation);
 
 			wpGc.setYear(year);
@@ -266,19 +285,19 @@ public class ProjectPlanService implements BaseService<ProjectPlan, ProjectPlanE
 			ProjectPlanVo totalVo=new ProjectPlanVo();
 			totalVo.setProjectName("合计");
 			totalVo.setYear(year);
-			totalVo.setGc01(String.valueOf(totalGc[0]));
-			totalVo.setGc02(String.valueOf(totalGc[1]));
-			totalVo.setGc03(String.valueOf(totalGc[2]));
-			totalVo.setGc04(String.valueOf(totalGc[3]));
-			totalVo.setGc05(String.valueOf(totalGc[4]));
-			totalVo.setGc06(String.valueOf(totalGc[5]));
-			totalVo.setGc07(String.valueOf(totalGc[6]));
-			totalVo.setGc08(String.valueOf(totalGc[7]));
-			totalVo.setGc09(String.valueOf(totalGc[8]));
-			totalVo.setGc10(String.valueOf(totalGc[9]));
-			totalVo.setGc11(String.valueOf(totalGc[10]));
-			totalVo.setGc12(String.valueOf(totalGc[11]));
-			totalVo.setGeneratingcapacity(String.valueOf(totalGc[12]));
+			totalVo.setGc01(String.valueOf(StringUtils.round(totalGc[0],2)));
+			totalVo.setGc02(String.valueOf(StringUtils.round(totalGc[1],2)));
+			totalVo.setGc03(String.valueOf(StringUtils.round(totalGc[2],2)));
+			totalVo.setGc04(String.valueOf(StringUtils.round(totalGc[3],2)));
+			totalVo.setGc05(String.valueOf(StringUtils.round(totalGc[4],2)));
+			totalVo.setGc06(String.valueOf(StringUtils.round(totalGc[5],2)));
+			totalVo.setGc07(String.valueOf(StringUtils.round(totalGc[6],2)));
+			totalVo.setGc08(String.valueOf(StringUtils.round(totalGc[7],2)));
+			totalVo.setGc09(String.valueOf(StringUtils.round(totalGc[8],2)));
+			totalVo.setGc10(String.valueOf(StringUtils.round(totalGc[9],2)));
+			totalVo.setGc11(String.valueOf(StringUtils.round(totalGc[10],2)));
+			totalVo.setGc12(String.valueOf(StringUtils.round(totalGc[11],2)));
+			totalVo.setGeneratingcapacity(String.valueOf(StringUtils.round(totalGc[12],2)));
 
 			result=new ArrayList<ProjectPlanVo>(retValue.values());
 			result.add(totalVo);