用能用水汇总报表增加发电机耗能

src/main/java/com/hb/proj/model/EnergyWaterSumTotalVal.java

@@ -30,10 +30,10 @@ public class EnergyWaterSumTotalVal {
 		if(preval==null){
 			return ;
 		}
-		this.wellCountCompared=getCompareVal(this.wellCountCompared,preval.wellCountCompared);
-		this.industryValueCompared=getCompareVal(this.industryValueCompared,preval.industryValueCompared);
-		this.addedValueCompared=getCompareVal(this.addedValueCompared,preval.addedValueCompared);
-		this.engineCostCompared=getCompareVal(this.engineCostCompared,preval.engineCostCompared);
+		this.wellCountCompared=getCompareVal(this.wellCount,preval.wellCount);
+		this.industryValueCompared=getCompareVal(this.industryValue,preval.industryValue);
+		this.addedValueCompared=getCompareVal(this.addedValue,preval.addedValue);
+		this.engineCostCompared=getCompareVal(this.engineCost,preval.engineCost);
 	}
 	
 	
@@ -90,27 +90,27 @@ public class EnergyWaterSumTotalVal {
 		if(engineCostCompared==null||engineCostCompared.isNaN()){
 			return null;
 		}
-		return DataUtils.format(engineCostCompared*100, 1)+"%";
+		return DataUtils.format(engineCostCompared*100, 2)+"%";
 	}
 	
 	public String getWellCountCompared() {
 		if(wellCountCompared==null||wellCountCompared.isNaN()){
 			return null;
 		}
-		return DataUtils.format(wellCountCompared*100, 1)+"%";
+		return DataUtils.format(wellCountCompared*100, 2)+"%";
 	}
 	
 	public String getIndustryValueCompared() {
 		if(industryValueCompared==null||industryValueCompared.isNaN()){
 			return null;
 		}
-		return DataUtils.format(industryValueCompared*100, 1)+"%";
+		return DataUtils.format(industryValueCompared*100, 2)+"%";
 	}
 	
 	public String getAddedValueCompared() {
 		if(addedValueCompared==null||addedValueCompared.isNaN()){
 			return null;
 		}
-		return DataUtils.format(addedValueCompared*100, 1)+"%";
+		return DataUtils.format(addedValueCompared*100, 2)+"%";
 	}
 }

src/main/java/com/hb/proj/model/EnergyWaterSumVO.java

@@ -179,21 +179,21 @@ public class EnergyWaterSumVO {
 		if(wellCountCompared==null||wellCountCompared.isNaN()){
 			return null;
 		}
-		return DataUtils.format(wellCountCompared*100, 1)+"%";
+		return DataUtils.format(wellCountCompared*100, 2)+"%";
 	}
 	
 	public String getIndustryValueCompared() {
 		if(industryValueCompared==null||industryValueCompared.isNaN()){
 			return null;
 		}
-		return DataUtils.format(industryValueCompared*100, 1)+"%";
+		return DataUtils.format(industryValueCompared*100, 2)+"%";
 	}
 	
 	public String getAddedValueCompared() {
 		if(addedValueCompared==null||addedValueCompared.isNaN()){
 			return null;
 		}
-		return DataUtils.format(addedValueCompared*100, 1)+"%";
+		return DataUtils.format(addedValueCompared*100, 2)+"%";
 	}
 	
 	public String getWaterCompared() {
@@ -352,7 +352,7 @@ public class EnergyWaterSumVO {
 		if(engineCostCompared==null||engineCostCompared.isNaN()){
 			return null;
 		}
-		return DataUtils.format(engineCostCompared*100, 1)+"%";
+		return DataUtils.format(engineCostCompared*100, 2)+"%";
 	}
 
 	public void setEngineCostCompared(Double engineCostCompared) {

src/main/java/com/hb/proj/model/EnergyWaterSumVOUtil.java

@@ -123,23 +123,34 @@ public class EnergyWaterSumVOUtil {
 			total1+=wk.getIndustryValue()!=null?wk.getIndustryValue().doubleValue():0;
 			total2+=wk.getAddedValue()!=null?wk.getAddedValue().doubleValue():0;
 		}
-		totalVal.setWellCount(total3);
-		totalVal.setIndustryValue(total1);
-		totalVal.setAddedValue(total2);
 		
-		total1=0;
-		Map<String,CarConsume>  monthCarConsume=new HashMap<String,CarConsume>(carConsumes.size()); //车辆明细消耗统计
-		for(CarConsume carCon : carConsumes){
-			month=DateUtil.format(carCon.getRptDate(), "MM");
-			monthCarConsume.put(month, carCon);
-			total1+=carCon.getEngineCostKg()!=null?carCon.getEngineCostKg().doubleValue():0;
+		if(totalVal!=null){
+			totalVal.setWellCount(total3);
+			totalVal.setIndustryValue(total1);
+			totalVal.setAddedValue(total2);
+		}
+		
+		
+		Map<String,CarConsume>  monthCarConsume=null;
+		if(carConsumes!=null){
+			total1=0;
+			monthCarConsume=new HashMap<String,CarConsume>(carConsumes.size()); //车辆明细消耗统计
+			for(CarConsume carCon : carConsumes){
+				month=DateUtil.format(carCon.getRptDate(), "MM");
+				monthCarConsume.put(month, carCon);
+				total1+=carCon.getEngineCostKg()!=null?carCon.getEngineCostKg().doubleValue():0;
+			}
+			
+			if(totalVal!=null){
+				totalVal.setEngineCost(total1);
+			}
+			
 		}
 		
-		totalVal.setEngineCost(total1);
 		
 		for(int m=1;m<=12;m++){
 			month=String.format("%02d", m);
-			vo=new EnergyWaterSumVO(monthErps.get(month),monthWpgs.get(month),monthWorkloads.get(month),monthCarConsume.get(month));
+			vo=new EnergyWaterSumVO(monthErps.get(month),monthWpgs.get(month),monthWorkloads.get(month),monthCarConsume!=null?monthCarConsume.get(month):null);
 			vo.initCoal();
 			voIdx.put(month, vo);
 		}