统一报表中统计月份的划定

src/main/java/com/hb/proj/car/controller/EnergyWaterSumController.java

@@ -25,6 +25,7 @@ import com.hb.proj.model.EnergyWaterSumVOUtil;
 import com.hb.proj.model.Workload;
 import com.hb.proj.utils.JsonOutUtils;
 import com.hb.proj.utils.MySessionUser;
+import com.hb.proj.utils.RptMonthUtil;
 import com.hb.proj.utils.RptOuter;
 import com.hb.xframework.util.MapUtils;
 import com.hb.xframework.util.SessionThreadLocal;
@@ -62,10 +63,9 @@ public class EnergyWaterSumController {
 			
 			if(StringUtils.isEmpty(year)){
 				year=String.valueOf(ca.get(Calendar.YEAR));
-				endMonth=ca.get(Calendar.MONTH)+1;  //是当年的话，截至到实际月份
 			}
-			else if(Integer.parseInt(year)==ca.get(Calendar.YEAR)){
-				endMonth=ca.get(Calendar.MONTH)+1; 
+			else if(Integer.parseInt(year)==ca.get(Calendar.YEAR)){  //等于当前年份,月份就使用足月的月份
+				endMonth=RptMonthUtil.getFullMonthNum(ca);
 			}
 			List<Map<String,Object>>  mths=new ArrayList<Map<String,Object>>(12);
 			

src/main/java/com/hb/proj/car/controller/HomeRptController.java

@@ -58,11 +58,8 @@ public class HomeRptController {
 			year=nowYear;
 		}
 		int nowMonth=12;
-		if(year.equals(nowYear)){  //统计的是今年 就截至到当前月份的前一月，否则就是12月份
-			nowMonth=RptMonthUtil.getMonthNum(ca)-1;
-			if(nowMonth==0){
-				nowMonth=1;
-			}
+		if(year.equals(nowYear)){  //统计的是今年 就足月的月份
+			nowMonth=RptMonthUtil.getFullMonthNum(ca); 
 		}
 		String endMonth=String.format("%02d",nowMonth);
 		
@@ -184,7 +181,7 @@ public class HomeRptController {
 			if(StringUtils.isEmpty(year)){
 				year=String.valueOf(ca.get(Calendar.YEAR));
 			}
-			if(Integer.parseInt(year)==ca.get(Calendar.YEAR)){ //等于当前年份,月份就应该为当前月份，否则为12月份
+			if(Integer.parseInt(year)==ca.get(Calendar.YEAR)){ //等于当前年份,使用足月的月份
 				month=String.format("%02d",RptMonthUtil.getFullMonthNum(ca));
 			}
 			String preyear=String.valueOf(Integer.parseInt(year)-1);