用能用水统计汇总，增加累计同比月份查询条件

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

@@ -25,7 +25,6 @@ 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;
@@ -52,21 +51,24 @@ public class EnergyWaterSumController {
 	 * 各月汽油、柴油=部门上报的数据（t_other_consume）+当月数据校正+物资ERP填报当月数据=数据校正中表二中的当月数据
 	 * workload,发电机 年累同比按同期月份计算（即是当年按实际月份累计同比）
 	 * @param year
+	 * @param month  累计同比月份
 	 * @param request
 	 * @param response
 	 */
 	@RequestMapping("/rptEnergyWaterSum")
-	public void rptEnergyWaterSum(String year,HttpServletRequest request,HttpServletResponse response){
+	public void rptEnergyWaterSum(String year,Integer month,HttpServletRequest request,HttpServletResponse response){
 		try{
-			int endMonth=12;
+			//int endMonth=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));
 			}
-			else if(Integer.parseInt(year)==ca.get(Calendar.YEAR)){  //等于当前年份,月份就使用足月的月份
+			/*else if(Integer.parseInt(year)==ca.get(Calendar.YEAR)){  //等于当前年份,月份就使用足月的月份
 				endMonth=RptMonthUtil.getFullMonthNum(ca);
-			}
+			}*/
 			List<Map<String,Object>>  mths=new ArrayList<Map<String,Object>>(12);
 			
 			String[] mthNames={"一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"};
@@ -77,7 +79,7 @@ public class EnergyWaterSumController {
 			}
 			String preyear=String.valueOf(Integer.parseInt(year)-1);
 			
-			EnergyWaterSumTotalVal  totalVal=new EnergyWaterSumTotalVal(endMonth),pretotalVal=new EnergyWaterSumTotalVal(endMonth);
+			EnergyWaterSumTotalVal  totalVal=new EnergyWaterSumTotalVal(month),pretotalVal=new EnergyWaterSumTotalVal(month);
 			
 			Map<String,EnergyWaterSumVO> voIndex=EnergyWaterSumVOUtil.build(service.erpMonthGrp(year), service.otherMonthGrp(year), service.wpgSumRpt(year), service.wpgCorrectSumRpt(year), service.workloadSumRpt(year),service.carOilSumRpt(year),totalVal);
 			Map<String,EnergyWaterSumVO> preVoIndex=EnergyWaterSumVOUtil.build(service.erpMonthGrp(preyear), service.otherMonthGrp(preyear), service.wpgSumRpt(preyear), service.wpgCorrectSumRpt(preyear), service.workloadSumRpt(preyear),service.carOilSumRpt(preyear),pretotalVal);

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

@@ -26,12 +26,31 @@
 	       <div class="layui-row">
 	           
 				<div class="layui-col-md4 layui-form-item">
-					<label class="layui-form-label">年份</label>
+					<label class="layui-form-label">统计年份</label>
 					<div class="layui-input-block">
 					   <input type="text" name="year" id="year"  placeholder="请选择年份" autocomplete="off" class="layui-input" style="width:120px;display:inline-block;">
 					</div>
 				</div>
-				<div class="layui-col-md5 layui-form-item" style="text-align:center;">
+				<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" style="text-align:center;">
 				  <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="exportbtn"><span class="fa fa-file-excel-o">&nbsp;&nbsp;</span>导出</button>

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

@@ -1,16 +1,16 @@
-layui.use(['element','mylayer','myform','page','jquery','laydate','formula2','rptEditor2'], function () {
+layui.use(['element','mylayer','myform','page','jquery','laydate','formula2'], function () {
 	 var element = layui.element
 	 ,$=layui.jquery
 	 ,form=layui.myform
 	 ,layer = layui.mylayer
 	 ,page=layui.page
 	 ,laydate = layui.laydate
-	 ,laytpl = layui.laytpl
 	 ,formula=layui.formula2
-	 ,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'
@@ -43,7 +43,7 @@ layui.use(['element','mylayer','myform','page','jquery','laydate','formula2','rp
 		 page.ajax({
 			 url:"rpt/rptEnergyWaterSum.do",
 			 dataType:"text",
-			 data:{year:$("#year").val()}
+			 data:{year:$("#year").val(),month:$("#month").val()}
 		  },function(resp){
 			 layer.close(loading);
 			 if(resp.indexOf("rpt-table-box")>=0){