综合分析报表增加按月份累计同比功能

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

@@ -24,7 +24,6 @@ import com.hb.proj.model.OtherConsume;
 import com.hb.proj.model.Wpg;
 import com.hb.proj.model.WpgCorrect;
 import com.hb.proj.utils.JsonOutUtils;
-import com.hb.proj.utils.RptMonthUtil;
 import com.hb.proj.utils.RptOuter;
 import com.hb.xframework.util.SessionThreadLocal;
 /**
@@ -76,24 +75,28 @@ public class EnergyWaterCompareController {
 	/**
 	 * 报表E7第二表：万元比值同比
 	 * @param year
+	 * @param month  累计同比月份
 	 * @param response
 	 */
 	@RequestMapping("/yearWYRatioCompare")
-	public void yearWYRatioCompare(String year,HttpServletRequest request,HttpServletResponse response){
+	public void yearWYRatioCompare(String year,Integer month,HttpServletRequest request,HttpServletResponse response){
 		try{
-			String month="12";
+			//String month="12";
 			Calendar ca=Calendar.getInstance();
+			if(month==null||month.intValue()<1||month.intValue()>12){
+				month=ca.get(Calendar.MONTH)+1; //默认自然月当月
+			}
 			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)){ //等于当前年份,根据当前日期决定用本月还是上月，否则为12月份
 				
 				month=String.format("%02d",RptMonthUtil.getFullMonthNum(ca));
-			}
-			
+			}*/
+			String monthstr=String.format("%02d",month);
 			String preyear=String.valueOf(Integer.parseInt(year)-1);
-			String startMonth=year+"-01",endMonth=year+"-"+month;
-			String preStartMonth=preyear+"-01",preEndMonth=preyear+"-"+month;
+			String startMonth=year+"-01",endMonth=year+"-"+monthstr;
+			String preStartMonth=preyear+"-01",preEndMonth=preyear+"-"+monthstr;
 			
 			EnergyWaterRatioCompareVO  ratioVO=builderVO(service,startMonth,endMonth);
 			EnergyWaterRatioCompareVO  preratioVO=builderVO(service,preStartMonth,preEndMonth);
@@ -130,24 +133,28 @@ public class EnergyWaterCompareController {
 	/**
 	 * 用能用水年度对比
 	 * @param year
+	 * @param month  累计同比月份
 	 * @param request
 	 * @param response
 	 */
 	@RequestMapping("/yearSumCompare")
-	public void yearSumCompare(String year,HttpServletRequest request,HttpServletResponse response){
+	public void yearSumCompare(String year,Integer month,HttpServletRequest request,HttpServletResponse response){
 		try{
-			String month="12";
+			//String month="12";
 			Calendar ca=Calendar.getInstance();
+			if(month==null||month.intValue()<1||month.intValue()>12){
+				month=ca.get(Calendar.MONTH)+1; //默认自然月当月
+			}
 			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)){ //等于当前年份,月份就应该为当前月份，否则为12月份
 				month=String.format("%02d",RptMonthUtil.getFullMonthNum(ca));
-			}
-			
+			}*/
+			String monthstr=String.format("%02d",month);
 			String preyear=String.valueOf(Integer.parseInt(year)-1);
-			String startMonth=year+"-01",endMonth=year+"-"+month;
-			String preStartMonth=preyear+"-01",preEndMonth=preyear+"-"+month;
+			String startMonth=year+"-01",endMonth=year+"-"+monthstr;
+			String preStartMonth=preyear+"-01",preEndMonth=preyear+"-"+monthstr;
 			
 			EnergyWaterCompareVO  yearSum=builderCompareVO(service,startMonth,endMonth);
 		

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

@@ -126,25 +126,30 @@ public class HomeRptController {
 	/**
 	 * 用能用水耗量同比
 	 * @param year
+	 * @param month
 	 * @param type
 	 * @param request
 	 * @param response
 	 */
 	@RequestMapping("/energyCompareRpt")
-	public void energyCompareRpt(String year,String type,HttpServletRequest request,HttpServletResponse response){
+	public void energyCompareRpt(String year,Integer month,String type,HttpServletRequest request,HttpServletResponse response){
 		try{
-			String month="12";
+			//String month="12";
 			Calendar ca=Calendar.getInstance();
+			if(month==null||month.intValue()<1||month.intValue()>12){
+				month=ca.get(Calendar.MONTH)+1; //默认自然月当月
+			}
 			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)){ //等于当前年份,月份就应该为当前月份，否则为12月份
 				month=String.format("%02d",RptMonthUtil.getFullMonthNum(ca));
 				
-			}
+			}*/
+			String monthstr=String.format("%02d",month);
 			String preyear=String.valueOf(Integer.parseInt(year)-1);
-			String startMonth=year+"-01",endMonth=year+"-"+month;
-			String preStartMonth=preyear+"-01",preEndMonth=preyear+"-"+month;
+			String startMonth=year+"-01",endMonth=year+"-"+monthstr;
+			String preStartMonth=preyear+"-01",preEndMonth=preyear+"-"+monthstr;
 			
 			
 			
@@ -170,23 +175,29 @@ public class HomeRptController {
 	/**
 	 * 能耗费用占比分析  
 	 * @param year
+	 * @param month 累计同比月份
+	 * @param type
 	 * @param request
 	 * @param response
 	 */
 	@RequestMapping("/costRatioRpt")
-	public void costRatioRpt(String year,String type,HttpServletRequest request,HttpServletResponse response){
+	public void costRatioRpt(String year,Integer month,String type,HttpServletRequest request,HttpServletResponse response){
 		try{
-			String month="12";
+			//String month="12";
 			Calendar ca=Calendar.getInstance();
+			if(month==null||month.intValue()<1||month.intValue()>12){
+				month=ca.get(Calendar.MONTH)+1; //默认自然月当月
+			}
 			if(StringUtils.isEmpty(year)){
 				year=String.valueOf(ca.get(Calendar.YEAR));
 			}
-			if(Integer.parseInt(year)==ca.get(Calendar.YEAR)){ //等于当前年份,使用足月的月份
+			/*if(Integer.parseInt(year)==ca.get(Calendar.YEAR)){ //等于当前年份,使用足月的月份
 				month=String.format("%02d",RptMonthUtil.getFullMonthNum(ca));
-			}
+			}*/
+			String monthstr=String.format("%02d",month);
 			String preyear=String.valueOf(Integer.parseInt(year)-1);
-			String startMonth=year+"-01",endMonth=year+"-"+month;
-			String preStartMonth=preyear+"-01",preEndMonth=preyear+"-"+month;
+			String startMonth=year+"-01",endMonth=year+"-"+monthstr;
+			String preStartMonth=preyear+"-01",preEndMonth=preyear+"-"+monthstr;
 			
 			
 			

src/main/webapp/page/rpt/js/multiRpt.js

@@ -9,7 +9,9 @@ layui.use(['page','layer','myElement','myform','jquery','formula2','laydate','rp
 	 ,editor=layui.rptEditor2
 	 ;
 	
-	 $("#year").val(page.getNow("yyyy"));
+	 let nows=(page.getNow()).split("-");
+	
+	 form.val("my-query-form",{year:nows[0],month:parseInt(nows[1])});
 	 
 	 laydate.render({
 		  elem: '#year'
@@ -34,21 +36,23 @@ layui.use(['page','layer','myElement','myform','jquery','formula2','laydate','rp
 	 query();
 	 
 	 function query(){
-		 var year=$("#year").val();
+		 let year=$("#year").val();
 		 if(year==""){
 			 year=(new Date()).getFullYear()+"";
 		 }
-		 querySumCompare(year);
-		 queryRatioCompare(year);
+		 let month=$("#month").val();
+		 
+		 querySumCompare(year,month);
+		 queryRatioCompare(year,month);
 		 loadCoalRatioRpt(year);
 		 loadCoalRatioChart(year);
 		 loadEnergyMthGroup(year);
 		 loadWorkloadRpt(year);
 		 loadWorkloadChart(year);
-		 loadCostRatioRpt(year);
-		 loadCostRatioChart(year);
-		 loadEnergyCompareRpt(year);
-		 loadEnergyCompareChart(year);
+		 loadCostRatioRpt(year,month);
+		 loadCostRatioChart(year,month);
+		 loadEnergyCompareRpt(year,month);
+		 loadEnergyCompareChart(year,month);
 	 }
 	 
 	 
@@ -86,11 +90,11 @@ layui.use(['page','layer','myElement','myform','jquery','formula2','laydate','rp
 	 }
 	 
 	 //占比同比报表
-	 function queryRatioCompare(yyyy){
+	 function queryRatioCompare(yyyy,mm){
 		 page.ajax({
 			 url:"rpt/yearWYRatioCompare.do",
 			 dataType:"text",
-			 data:{year:yyyy}
+			 data:{year:yyyy,month:mm}
 		  },function(resp){
 			 layer.close(loading);
 			 if(resp.indexOf("rpt-table-box")>=0){
@@ -113,11 +117,11 @@ layui.use(['page','layer','myElement','myform','jquery','formula2','laydate','rp
 	 }
 	 
 	 //总量同比
-	 function querySumCompare(yyyy){
+	 function querySumCompare(yyyy,mm){
 		 page.ajax({
 			 url:"rpt/yearSumCompare.do",
 			 dataType:"text",
-			 data:{year:yyyy}
+			 data:{year:yyyy,month:mm}
 		  },function(resp){
 			 layer.close(loading);
 			 if(resp.indexOf("rpt-table-box")>=0){
@@ -143,11 +147,11 @@ layui.use(['page','layer','myElement','myform','jquery','formula2','laydate','rp
 	 }
 	 
 	//用能用水 耗量同比
-		function loadEnergyCompareRpt(yyyy){
+		function loadEnergyCompareRpt(yyyy,mm){
 			page.ajax({
 				 dataType:"text",
 				 url:"home/rpt/energyCompareRpt.do",
-				 data:{type:"grid",year:yyyy}
+				 data:{type:"grid",year:yyyy,month:mm}
 			},function(resp){
 				if(resp.indexOf("rpt-table-box")>=0){
 					$("#energyComparebox").html(resp);
@@ -160,11 +164,11 @@ layui.use(['page','layer','myElement','myform','jquery','formula2','laydate','rp
 			 });
 		}
 		
-		function loadEnergyCompareChart(yyyy){
+		function loadEnergyCompareChart(yyyy,mm){
 			 page.ajax({
 				 dataType:"json",
 				 url:"home/rpt/energyCompareRpt.do",
-				 data:{type:"chart",year:yyyy}
+				 data:{type:"chart",year:yyyy,month:mm}
 			},function(resp){
 				if(!resp.success){
 					layer.msg(resp.exception);
@@ -223,11 +227,11 @@ layui.use(['page','layer','myElement','myform','jquery','formula2','laydate','rp
 	 
 	 
 	//用能用水费用占比统计
-	function loadCostRatioRpt(yyyy){
+	function loadCostRatioRpt(yyyy,mm){
 		page.ajax({
 			 dataType:"text",
 			 url:"home/rpt/costRatioRpt.do",
-			 data:{type:"grid",year:yyyy}
+			 data:{type:"grid",year:yyyy,month:mm}
 		},function(resp){
 			if(resp.indexOf("rpt-table-box")>=0){
 				$("#costRatiobox").html(resp);
@@ -241,11 +245,11 @@ layui.use(['page','layer','myElement','myform','jquery','formula2','laydate','rp
 	}
 		
 	 
-		function loadCostRatioChart(yyyy){
+		function loadCostRatioChart(yyyy,mm){
 			 page.ajax({
 				 dataType:"json",
 				 url:"home/rpt/costRatioRpt.do",
-				 data:{type:"chart",year:yyyy}
+				 data:{type:"chart",year:yyyy,month:mm}
 			},function(resp){
 				if(!resp.success){
 					layer.msg(resp.exception);

src/main/webapp/page/rpt/multiRpt.html

@@ -5,6 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 		<title>综合报表</title>
 		<link rel="stylesheet" href="../../js/layui/css/layui.css"/>
+		<link rel="stylesheet" href="../../css/querytab.css"/>
 		<link rel="stylesheet" href="css/default3.css"/>
 		<link rel="stylesheet" href="../../css/font-awesome/css/font-awesome.min.css"/>
 		
@@ -26,21 +27,44 @@ body{
 </style>
 </head>
 <body>
-<div style="width:100%;position:relative;top:0px;height:40px;padding:10px 0px;background:#ffffff;overflow:hidden;z-index:10;border-bottom:1px solid #ccc;">
+<div style="position:relative;width:100%;top:0px;height:40px;padding:10px 0px;background:#ffffff;z-index:1;border-bottom:1px solid #ccc;">
 	<form class="layui-form my-query-form" action="" lay-filter="my-query-form">
-
-				<div class="layui-form-item" style="text-align:center;">
+		<div class="layui-row">
+				<div class="layui-col-md4  layui-form-item" style="text-align:center;">
 					
 					<div class="layui-input-block">
 						 <label>年份</label>
 					     <input type="text" name="year" id="year"  placeholder="请选择年份" autocomplete="off" class="layui-input" style="width:120px;display:inline-block;">
-					     <button type="button" class="layui-btn" lay-filter="querybtn">开始检索</button>
-				 		 <button type="button" class="layui-btn layui-btn-danger" lay-filter="clearbtn">清空</button>	
-				 		 <button type="button" class="layui-btn  layui-btn-normal" lay-filter="savebtn">保存数据</button>
 					</div>
 				</div>
-				     
 				
+				<div class="layui-col-md4 layui-form-item">
+					<label class="layui-form-label" style="width:100px;">累计同比月份</label>
+					<div class="layui-input-block" style="margin-left:130px;width:120px;">
+						<select name="month" id="month">
+							<option value="1">1月</option>
+							<option value="2">2月</option>
+							<option value="3">3月</option>
+							<option value="4">4月</option>
+							<option value="5">5月</option>
+							<option value="6">6月</option>
+							<option value="7">7月</option>
+							<option value="8">8月</option>
+							<option value="9">9月</option>
+							<option value="10">10月</option>
+							<option value="11">11月</option>
+							<option value="12">12月</option>
+						</select>
+					</div>
+				</div>
+				
+				<div class="layui-col-md4 layui-form-item">
+					<button type="button" class="layui-btn" lay-filter="querybtn">开始检索</button>
+				 	<button type="button" class="layui-btn layui-btn-danger" lay-filter="clearbtn">清空</button>	
+				 	<button type="button" class="layui-btn  layui-btn-normal" lay-filter="savebtn">保存数据</button>
+				</div>
+				     
+		</div>		
 	</form>
 </div>
 <div style="position:absolute;left:0px;right:0px;top:60px;bottom:0px;overflow-y:auto;overflow-x:hidden;">