审计报表修改

廖磊
1 parent 26d3239b
Showing 6 changed files with 356 additions and 25 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/mforms/singledatas/singledata2.html
src/main/resources/static/pages/report/countMileage/countLine/company/countLineMileage.html
src/main/resources/static/pages/report/countMileage/countLine/countLineMileage.html
@@ -1452,20 +1452,17 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		String type="1";
 		if(gsbm.equals("26")){
 			Date date=new Date();
-			Calendar aCalendar = Calendar.getInstance();
-			aCalendar.setTime(date);
-			int day1 = aCalendar.get(Calendar.DAY_OF_YEAR);
 			try {
-				aCalendar.setTime(sdf.parse(rq));
+				long day2=date.getTime();
+				long day1=sdf.parse(rq).getTime();
+				long days = (day2 - day1) / (24*3600*1000);  
+			    if(days>3){
+			    	type="2";
+			    }
 			} catch (ParseException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
-		    int day2 = aCalendar.get(Calendar.DAY_OF_YEAR);
-		    int days=day1-day2;
-		    if(days>3){
-		    	type="2";
-		    }
 		}
 		return type;
 	}
@@ -1248,6 +1248,21 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		                }
 					}
 				}
+				
+				if(!isInOut(t)){
+					Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+					if(!childTaskPlans.isEmpty()){
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+		                while (it.hasNext()) {
+		                    ChildTaskPlan childTaskPlan = it.next();
+	                    	if(childTaskPlan.getType2().equals("1")&&childTaskPlan.getMileageType().equals("empty")){
+			                    if (!childTaskPlan.isDestroy()) {
+			                    	kfks=Arith.add(kfks,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+			                    } 
+		                    }
+		                }
+					}
+				}
 			}
 		}
 		return kfks;
@@ -2776,7 +2776,7 @@ public class ReportServiceImpl implements ReportService{
 			double zrwjcclc=culateService.culateZrwJccLc(list, "故障");
 			double zrwjcclc1=culateService.culateZrwJccLc(list, "肇事");
 			double zrwjcclc2=culateService.culateZrwJccLc(list, "纠纷");
-			double zrwjcclcqt=culateService.culateZrwJccLc(list, "其他");
+			double zrwjcclcqt=Arith.add(culateService.culateZrwJccLc(list, "其他"),culateService.culateZrwJccLc(list, ""));
 			map.put("jhwjcclc_z", Arith.add(jhwjcclc,zrwjcclcqt));
 			map.put("zrwjcclc", zrwjcclc);
 			map.put("zrwjcclc1", zrwjcclc1);
@@ -2868,7 +2868,7 @@ public class ReportServiceImpl implements ReportService{
 		List<Map<String, Object>> listGroupBy =null;
 		String sql="";
 		if(zt.equals("zbh")){
-			sql+="select r.xl_bm,r.schedule_date_str,r.cl_zbh"
+			sql+="select r.xl_bm,r.cl_zbh"
 					+ " from bsth_c_s_sp_info_real r where"
 					+ " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
 			if(line.equals("")){
@@ -2877,19 +2877,18 @@ public class ReportServiceImpl implements ReportService{
 			}else{
 				sql += " and r.xl_bm = '"+line+"'";
 			}
-			sql += " group  by  r.xl_bm,r.cl_zbh,r.schedule_date_str";
+			sql += " group  by  r.xl_bm,r.cl_zbh";
 			listGroupBy=jdbcTemplate.query(sql, new RowMapper<Map<String, Object>>() {
 				@Override
 				public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
 					Map<String, Object> map=new HashMap<String,Object>();
 					map.put("line",arg0.getString("xl_bm"));
-					map.put("date", arg0.getString("schedule_date_str"));
 					map.put("nbbm", arg0.getString("cl_zbh"));
 					return map;
 				}
 			});
 		}else{
-			sql+="select r.xl_bm,r.schedule_date_str,r.cl_zbh,r.j_gh,r.s_gh"
+			sql+="select r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh"
 					+ " from bsth_c_s_sp_info_real r where"
 					+ " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
 			if(line.equals("")){
@@ -2898,13 +2897,12 @@ public class ReportServiceImpl implements ReportService{
 			}else{
 				sql += " and r.xl_bm = '"+line+"'";
 			}
-			sql += " group  by  r.xl_bm,r.cl_zbh,r.schedule_date_str,r.j_gh,r.s_gh";
+			sql += " group  by  r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh";
 			listGroupBy=jdbcTemplate.query(sql, new RowMapper<Map<String, Object>>() {
 				@Override
 				public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
 					Map<String, Object> map=new HashMap<String,Object>();
 					map.put("line",arg0.getString("xl_bm"));
-					map.put("date", arg0.getString("schedule_date_str"));
 					map.put("nbbm", arg0.getString("cl_zbh"));
 					map.put("jGh", arg0.getString("j_gh"));
 					map.put("sGh", arg0.getString("s_gh"));
@@ -2919,7 +2917,6 @@ public class ReportServiceImpl implements ReportService{
 		for (int i = 0; i < listGroupBy.size(); i++) {
 			Map<String, Object> m=listGroupBy.get(i);
 			String xl_bm=m.get("line")==null?"":m.get("line").toString();
-			String dateStr=m.get("date")==null?"":m.get("date").toString();
 			String nbbm =m.get("nbbm")==null?"":m.get("nbbm").toString();
 			String jGh= m.get("jGh")==null?"":m.get("jGh").toString();
 			String sGh= m.get("sGh")==null?"":m.get("sGh").toString();
@@ -2927,12 +2924,12 @@ public class ReportServiceImpl implements ReportService{
 			for (int j = 0; j < list.size(); j++) {
 				ScheduleRealInfo s=list.get(j);
 				if(zt.equals("zbh")){
-					if(xl_bm.equals(s.getXlBm()) && nbbm.equals(s.getClZbh())){
+					if(xl_bm.equals(s.getXlBm()) 
+							&& nbbm.equals(s.getClZbh())){
 						lists.add(s);
 					}
 				}else{
 					if(xl_bm.equals(s.getXlBm()) && nbbm.equals(s.getClZbh())
-							&& dateStr.equals(s.getScheduleDateStr())
 							&& jGh.equals(s.getjGh()) && sGh.equals(s.getsGh())){
 						lists.add(s);
 					}
@@ -2985,8 +2982,7 @@ public class ReportServiceImpl implements ReportService{
 				for (int j = 0; j < ylbList.size(); j++) {
 					Ylb y=ylbList.get(j);
 					if(nbbm.equals(y.getNbbm()) && xl_bm.equals(y.getXlbm())
-							&&dateStr.equals(sdf.format(y.getRq()))
-							&&jGh.equals(y.getName())){
+							&&jGh.equals(y.getJsy())){
 						yhl=Arith.add(yhl, y.getYh());
 						jzl=Arith.add(jzl, y.getJzl());
 						hyl=Arith.add(hyl, y.getYh());
@@ -2998,8 +2994,7 @@ public class ReportServiceImpl implements ReportService{
 				for (int j = 0; j < dlbList.size(); j++) {
 					Dlb d=dlbList.get(j);
 					if(nbbm.equals(d.getNbbm())&&xl_bm.equals(d.getXlbm())
-							&&dateStr.equals(sdf.format(d.getRq()))
-							&&jGh.equals(d.getName())){
+							&&jGh.equals(d.getJsy())){
 						dhl=Arith.add(dhl, d.getHd());
 						cdl=Arith.add(cdl, d.getCdl());
 						zlc=Arith.add(zlc, d.getZlc());
@@ -3088,7 +3083,9 @@ public class ReportServiceImpl implements ReportService{
 			public Ylb mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Ylb y = new Ylb();
 				y.setRq(arg0.getDate("rq"));
+				y.setJsy(arg0.getString("jsy"));
 				y.setXlbm(arg0.getString("xlbm"));
+				y.setZlc(arg0.getDouble("zlc"));
 				y.setNbbm(arg0.getString("nbbm"));
 				y.setJzl(arg0.getDouble("jzl"));
 				y.setYh(arg0.getDouble("yh"));
@@ -3106,7 +3103,9 @@ public class ReportServiceImpl implements ReportService{
 				Dlb y = new Dlb();
 				y.setRq(arg0.getDate("rq"));
 				y.setXlbm(arg0.getString("xlbm"));
+				y.setJsy(arg0.getString("jsy"));
 				y.setNbbm(arg0.getString("nbbm"));
+				y.setZlc(arg0.getDouble("zlc"));
 				y.setCdl(arg0.getDouble("cdl"));
 				y.setHd(arg0.getDouble("hd"));
 				y.setSh(arg0.getDouble("sh"));
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px;
+	    text-align: center; }
+	 
+	  .table > tbody + tbody {
+	   border-top: 1px solid; }
+</style>
+
+<div class="page-head">
+	<div class="page-title">
+		<h1>路单数据</h1>
+	</div>
+</div>
+
+<div class="row">
+	<div class="col-md-12">
+		<div class="portlet light porttlet-fit bordered">
+			<div class="portlet-title">
+				<form class="form-inline" action="">
+				 <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_sing">
+						<span class="item-label" style="width: 80px;">公司: </span>
+						<select class="form-control" name="company" id="gsdmSing" style="width: 140px;"></select>
+					</div> 
+					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_sing">
+						<span class="item-label" style="width: 80px;">分公司: </span>
+						<select class="form-control" name="subCompany" id="fgsdmSing" style="width: 140px;"></select>
+					</div> 
+					<div style="display: inline-block;">
+                        <span class="item-label" style="width: 80px;">&nbsp;线路: </span>
+                        <select class="form-control" name="line" id="line" style="width: 140px;"></select>
+                    </div>
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 140px;">时间: </span>
+                        <input class="form-control" type="text" id="startDate" style="width: 140px;"/>
+                    </div>
+                    
+                    <div style="display: inline-block;margin-left: 15px">
+                        <span class="item-label" style="width: 150px;">统计： </span>
+                        <select class="form-control" name="tjtype" id="tjtype" style="width: 140px;">
+                        	<option value="jsy">驾驶员</option>
+                        	<option value="spy">售票员</option>
+                        </select>
+
+                    </div>
+                    <div class="form-group">
+                        <input class="btn btn-default" type="button" id="query" value="筛选"/>
+                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+                    </div>
+				</form>
+			</div>
+			<div class="portlet-body">
+				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+					<table class="table table-bordered table-hover table-checkable" id="forms">
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th>日期</th>
+								<th>所属公司</th>
+								<th>线路</th>
+								<th>车号</th>
+								<th>司机职号</th>
+								<th>司机姓名</th>
+								<th>售票员职号</th>
+								<th>售票员姓名</th>
+								<th>行驶里程(包括空放)</th>
+								<th>空驶里程</th>
+								<th>耗油量</th>
+								<th>加注量</th>
+								<th>非营业用油</th>
+								<th>计划公里</th>
+							</tr>
+						</thead>
+						<tbody id="sinTboday">
+							
+						</tbody>
+							<tr>
+							<td colspan="9">小计</td>
+							<td><span id="total_zgl">&nbsp;</span></td>
+							<td><span id="total_ks">&nbsp;</span></td>
+							<td><span id="total_yh">&nbsp;</span></td>
+							<td><span id="total_jzl">&nbsp;</span></td>
+							<td><span id="total_fyy">&nbsp;</span></td>
+							<td><span id="total_jh">&nbsp;</span></td>
+						</tr>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+		
+		$("#startDate,#endDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
+		});
+		
+		var fage=false;
+		var xlList;
+		var obj = [];
+		
+		$.get('/report/lineList',function(result){
+			xlList=result;
+			$.get('/user/companyData', function(result){
+				obj = result;
+				var options = '';
+				for(var i = 0; i < obj.length; i++){
+					options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+				}
+				
+				if(obj.length ==0){
+					 $("#gsdmDiv_sing").css('display','none');
+				}else if(obj.length ==1){
+					 $("#gsdmDiv_sing").css('display','none');
+					if(obj[0].children.length == 1  || obj[0].children.length ==0)
+						$('#fgsdmDiv_sing').css('display','none');
+				}
+				$('#gsdmSing').html(options);
+				updateCompany();
+			});
+		})
+		$("#gsdmSing").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#gsdmSing').val();
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				if(obj[i].companyCode == company){
+					var children = obj[i].children;
+					for(var j = 0; j < children.length; j++){
+						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+					}
+				}
+			}
+			$('#fgsdmSing').html(options);
+		}
+
+		var tempData = {};
+		$.get('/report/lineList',function(xlList){
+			var data = [];
+			data.push({id: " ", text: "全部线路"});
+			$.get('/user/companyData', function(result){
+				for(var i = 0; i < result.length; i++){
+					var companyCode = result[i].companyCode;
+					var children = result[i].children;
+					for(var j = 0; j < children.length; j++){
+						var code = children[j].code;
+						for(var k=0;k < xlList.length;k++ ){
+							if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+								data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+							}
+						}
+					}
+				}
+				initPinYinSelect2('#line',data,'');
+				
+			});
+		});
+		
+		$("#line").on("change", function(){
+			if($("#line").val() == " "){
+				$("#gsdmSing").attr("disabled", false);
+				$("#fgsdmSing").attr("disabled", false);
+			} else {
+				var temp = tempData[$("#line").val()].split(":");
+				$("#gsdmSing").val(temp[0]);
+				updateCompany();
+				$("#fgsdmSing").val(temp[1]);
+				$("#gsdmSing").attr("disabled", true);
+				$("#fgsdmSing").attr("disabled", true);
+			}
+		});
+		
+		
+		$("#query").on("click",function(){
+			if($("#startDate").val() == null || $("#startDate").val().trim().length == 0){
+				layer.msg("请选择时间！");
+				return;
+			}
+		    var line = $("#line").val();
+		    var startDate = $("#startDate").val();
+		    var lpName = $("#lpName").val(); 
+		    var gsdmSing = $("#gsdmSing").val();
+		    var fgsdmSing = $("#fgsdmSing").val(); 
+		    var tjtype=$("#tjtype").val();
+		    var params = {};
+		    var i = layer.load(2);
+// 		    if(tjtype=='jsy'){
+		    	$get("/mcy_forms/singledatatj",{ gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){		        
+			   		layer.close(i);
+			        var singledata = template('singledata',{list:result});
+	                // 把渲染好的模版html文本追加到表格中
+			        $('#sinTboday').html(singledata);
+			        var total_zgl = 0,total_ks = 0,total_jh = 0;
+			        var total_yh = 0,total_jzl=0,total_fyy=0;
+			       
+			        $.each(result, function(i, obj) {
+			        	total_zgl +=Number(obj.jhlc*10000);
+			        	total_ks +=Number(obj.emptMileage*10000);
+			        	total_yh += Number(obj.hyl*10000);
+			        	total_jzl +=Number(obj.jzl*10000)
+			        	total_fyy +=Number(obj.unyyyl*10000)
+			        	total_jh += Number(obj.jhjl*10000);
+				    	
+		            });
+		            $("#total_zgl").text((total_zgl/10000).toFixed(3));
+		            $("#total_ks").text((total_ks/10000).toFixed(3));
+		            $("#total_yh").text((total_yh/10000).toFixed(2));
+		            $("#total_jzl").text((total_jzl/10000).toFixed(2));
+		            $("#total_fyy").text((total_fyy/10000).toFixed(2));
+		            $("#total_jh").text((total_jh/10000).toFixed(3));
+	                
+			    }); 
+// 		    }else{
+// 		    	$get("/mcy_forms/singledata",{ gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){		        
+// 			   		layer.close(i);
+// 			        var date=new Array();     //存放文本框数组 
+// 			   		$.each(result, function (i, obj) {
+// 	                   if(obj.sgh !='' && obj.sgh!=null){
+// 	                	   date.push(obj);
+// 	                   }
+// 	                });
+// 			        var singledata = template('singledata2',{result});
+// 	                // 把渲染好的模版html文本追加到表格中
+// 			        $('#forms tbody').html(singledata);
+	                
+// 			    }); 
+// 		    }
+		   
+		});
+		
+		$("#export").on("click",function(){
+			 var line = $("#line").val();
+			    var startDate = $("#startDate").val();
+			    var endDate = $("#endDate").val();
+			    var lpName = $("#lpName").val(); 
+			    var gsdmSing = $("#gsdmSing").val();
+			    var fgsdmSing = $("#fgsdmSing").val(); 
+			    var tjtype=$("#tjtype").val();
+// 			    if(tjtype=='jsy'){
+			    	$get('/mcy_export/singledataExportTj',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,type:'export'},function(result){
+						window.open("/downloadFile/download?fileName=路单数据"+moment(startDate).format("YYYYMMDD"));
+					});
+// 			    }else{
+// 			    	$get('/mcy_export/singledataExport',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,type:'export'},function(result){
+// 						window.open("/downloadFile/download?fileName=路单数据"+moment(startDate).format("YYYYMMDD"));
+// 					});
+// 			    }
+			
+		});
+	});
+</script>
+<script type="text/html" id="singledata">
+	{{each list as obj i}}
+		<tr>
+			<td>{{i+1}}</td>
+			<td>{{obj.rQ}}</td>
+			<td>{{obj.gS}}</td>
+ 			<td>{{obj.xlmc}}</td>
+			<td>{{obj.clzbh}}</td>
+			<td>{{obj.jsy}}</td>
+			<td>{{obj.jName}}</td>
+			<td>{{obj.sgh}}</td>
+			<td>{{obj.sName}}</td>
+			<td>{{obj.jhlc}}</td>
+			<td>{{obj.emptMileage}}</td>
+ 			<td>{{obj.hyl}}</td>
+			<td>{{obj.jzl}}</td>
+			<td>{{obj.unyyyl}}</td>
+			<td>{{obj.jhjl}}</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="16"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<script type="text/html" id="singledata2">
+	{{each list as obj i}}
+		<tr>
+			<td>{{i+1}}</td>
+			<td>{{obj.rQ}}</td>
+			<td>{{obj.gS}}</td>
+ 			<td>{{obj.xlmc}}</td>
+			<td>{{obj.clzbh}}</td>
+			<td></td>
+			<td></td>
+			<td>{{obj.sgh}}</td>
+			<td>{{obj.sName}}</td>
+			<td>{{obj.jhlc}}</td>
+			<td>{{obj.emptMileage}}</td>
+ 			<td></td>
+			<td></td>
+			<td></td>
+			<td>{{obj.jhjl}}</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="16"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
@@ -306,7 +306,7 @@
 				<td>{{obj.jhzlc}}</td>
 				<td>{{obj.jhlc}}</td>
 				<td>{{obj.jcclc}}</td>
-				<td>{{obj.zlc}}</td>
+				<td>{{obj.sjzgl}}</td>
 				<td>{{obj.jhnlc}}</td>
 				<td>{{obj.jhwlc}}</td>
 				<td>{{obj.jhnjcclc}}</td>
@@ -305,7 +305,7 @@
 				<td>{{obj.jhzlc}}</td>
 				<td>{{obj.jhlc}}</td>
 				<td>{{obj.jcclc}}</td>
-				<td>{{obj.zlc}}</td>
+				<td>{{obj.sjzgl}}</td>
 				<td>{{obj.jhnlc}}</td>
 				<td>{{obj.jhwlc}}</td>
 				<td>{{obj.jhnjcclc}}</td>