Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong

游瑞烽
2 parents e3fbcae3 3cbf015d
Showing 7 changed files with 86 additions and 36 deletions
src/main/java/com/bsth/entity/calc/CalcInterval.java
src/main/java/com/bsth/service/calc/impl/CalcIntervalServiceImpl.java
src/main/resources/static/pages/forms/mould/calcIntervalCount.xls
src/main/resources/static/pages/forms/mould/calcIntervalList1.xls
src/main/resources/static/pages/report/sheet/intervalCount.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sftz.html
@@ -47,6 +47,8 @@ public class CalcInterval {
 	private Integer djgDg;
 	/*最大间隔时间*/
 	private Integer djgTime;
+	/*全日班次数*/
+	private Integer bcs;
 	/*数据创建时间*/
 	private Date createtime;
 	/*数据修改时间*/
@@ -143,6 +145,12 @@ public class CalcInterval {
 	public void setDjgTime(Integer djgTime) {
 		this.djgTime = djgTime;
 	}
+	public Integer getBcs() {
+		return bcs;
+	}
+	public void setBcs(Integer bcs) {
+		this.bcs = bcs;
+	}
 	public Date getCreatetime() {
 		return createtime;
 	}
@@ -67,7 +67,11 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 		if(level.equals("D")){
 			String sql1=" select xl_bm,gsbm,fgsbm,xl_name from bsth_c_calc_interval where date >='"+sDate+"' and date <= '"+eDate+"' and `level`='D'";
 			if(line.equals("")){
-				sql1 +=" and gsbm like '%"+gs+"%' and fgsbm like '%"+fgs+"%'";
+				if(fgs.equals("")){
+					sql1 +=" and gsbm = '"+gs+"'";
+				}else{
+					sql1 +=" and gsbm = '"+gs+"' and fgsbm = '"+fgs+"'";
+				}
 			}else{
 				sql1 +=" and xl_bm ='"+line+"'";
 			}
@@ -76,7 +80,11 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 			String sql2="select gsdm,fgsdm,xl,xl_name,max(id) as id,sum(jhszfcs) as jhszfcs,"
 					+ " sum(sjszfczds) as sjszfczds,sum(sjszddzds) as sjszddzds from bsth_c_calc_sheet where date >= '"+sDate+"' and  date <= '"+eDate+"'";
 			if(line.trim().equals("")){
-				sql2 +=" and gsdm = '"+gs+"' and fgsdm like '%"+fgs+"%'";
+				if(fgs.equals("")){
+					sql2 +=" and gsdm = '"+gs+"'";
+				}else{
+					sql2 +=" and gsdm = '"+gs+"' and fgsdm = '"+fgs+"'";
+				}
 			}else{
 				sql2 +=" and xl ='"+line+"'";
 			}
@@ -110,17 +118,20 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 					 }else{
 						 m.put("zdlv", "0.0%");
 						 m.put("ddzdlv", "0.0%");
-
 					 }
 					 return m;
 				 }
 			});
 		}else{
-			String sql="select gsbm,fgsbm,xl_bm,xl_name,MAX(id) as id,SUM(djg_all) as djgAll,SUM(djg_gf) as djgGf,"
+			String sql="select gsbm,fgsbm,xl_bm,xl_name,SUM(bcs) as bcs,MAX(id) as id,SUM(djg_all) as djgAll,SUM(djg_gf) as djgGf,"
 					+ "SUM(djg_dg) as djgDg,SUM(djg_zgf) as djgZgf,SUM(djg_wgf) as djgWgf,MAX(djg_time) as djgTime "
-					+ "from bsth_c_calc_interval where date>= '"+sDate+"' and date<='"+eDate+"' and level <> 'D' ";
+					+ "from bsth_c_calc_interval where date>= '"+sDate+"' and date<='"+eDate+"' and level <> 'D' and djg_all >0 ";
 			if(line.equals("")){
-				sql +=" and gsbm like '%"+gs+"%' and fgsbm like '%"+fgs+"%'";
+				if(fgs.equals("")){
+					sql +=" and gsbm = '"+gs+"'";
+				}else{
+					sql +=" and gsbm = '"+gs+"' and fgsbm = '"+fgs+"'";
+				}
 			}else{
 				sql +=" and xl_bm ='"+line+"'";
 			}
@@ -135,7 +146,17 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 					 m.put("fgs", BasicData.businessFgsCodeNameMap.get(rs.getString("fgsbm")+"_"+rs.getString("gsbm")));
 					 m.put("xlBm", rs.getString("xl_bm"));
 					 m.put("xlName", rs.getString("xl_name"));
+					 m.put("bcs", rs.getInt("bcs"));
 					 m.put("id", rs.getInt("id"));
+					 int djgAll=rs.getInt("djgAll");
+					 int bcs=rs.getInt("bcs");
+					 //全日发生率 （大间隔次数/全日班次数）
+					 if(bcs>0){
+						 double fsl=(djgAll*1.0)/(bcs*1.0)*100;
+						 m.put("fsl", df.format(fsl)+"%");
+					 }else{
+						 m.put("fsl", "0.0%");
+					 }
 					 m.put("djgAll", rs.getString("djgAll"));
 					 m.put("djgGf", rs.getString("djgGf"));
 					 m.put("djgZgf", rs.getString("djgZgf"));
@@ -149,12 +170,14 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 		if(map.get("type").equals("export")){
 			String lineName="";
-			if(!line.equals("")){
+			if(line.equals("")){
+				if(fgs.equals("")){
+					lineName=list.get(0).get("gs").toString();
+				}else{
+					lineName=list.get(0).get("fgs").toString();
+				}
+			}else{ 
 				lineName=list.get(0).get("xlName").toString();
-			}else if(!fgs.equals("")){
-				lineName=list.get(0).get("fgs").toString();
-			}else{
-				lineName=list.get(0).get("gs").toString();
 			}
 			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 			Map<String, Object> m = new HashMap<String, Object>();
@@ -196,6 +219,8 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 	@Override
 	public List<Map<String, Object>> listInterval(Map<String, Object> map) {
 		// TODO Auto-generated method stub
+    	final DecimalFormat df = new DecimalFormat("0.00");
+
 		String line=map.get("line").toString();
 		String date=map.get("date").toString();
 		String endDate=map.get("endDate").toString();
@@ -216,6 +241,16 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
 				m.put("djgZgf", t.getDjgZgf());
 				m.put("djgWgf", t.getDjgWgf());
 				m.put("djgDg", t.getDjgDg());
+				int djgAll=t.getDjgAll();
+				int bcs=t.getBcs();
+				//全日发生率 （大间隔次数/全日班次数）
+				if(bcs>0){
+					double fsl=(djgAll*1.0)/(bcs*1.0)*100;
+					m.put("fsl", df.format(fsl)+"%");
+				}else{
+					m.put("fsl", "0.0%");
+				}
+				m.put("bcs", t.getBcs());
 				m.put("djgTime", t.getDjgTime());
 				tempList.add(m);
 			}
@@ -78,6 +78,8 @@
 								<td>早高峰次数</td>
 								<td>晚高峰次数</td>
 								<td>低谷次数</td>
+								<td>全日班次数</td>
+								<td>全日发生率</td>
 								<td>最大间隔时间</td>
 								<td>查看</td>
 							</tr>
@@ -122,6 +124,8 @@
 								<td>早高峰次数</td>
 								<td>晚高峰次数</td>
 								<td>低谷次数</td>
+								<td>全日班次数</td>
+								<td>全日发生率</td>
 								<td>最大间隔</td>
 								<td>查看</td>
 							</tr>
@@ -196,7 +200,6 @@
 				for(var i = 0; i < obj.length; i++){
 					options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
 				}
-				
 				if(obj.length ==0){
 					 $("#gsdmDiv").css('display','none');
 				}else if(obj.length ==1){
@@ -213,7 +216,7 @@
 		$("#gsdm").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#gsdm').val();
-			var options = '';
+			var options = '<option value="">全部分公司</option>';
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;
@@ -396,6 +399,9 @@
 			var lineName = $('#line option:selected').text();
 			if(lineName == "全部线路")
 				lineName = $('#fgsdm option:selected').text();
+			if(lineName=="全部分公司")
+				lineName = $('#gsdm option:selected').text();
+
 			var i = layer.load(2);
 			$get('/calcInterval/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,levelType:levelType,type:"export",lineName:lineName},function(result){
 				var dateTime = "";
@@ -450,6 +456,8 @@
 		<td>{{obj.djgZgf}}</td>
 		<td>{{obj.djgWgf}}</td>
 		<td>{{obj.djgDg}}</td>
+		<td>{{obj.bcs}}</td>
+		<td>{{obj.fsl}}</td>
 		<td>{{obj.djgTime}}</td>
 		<td>
 			<button type="button" class="btn btn-sm blue btn-intervalList" 
@@ -502,6 +510,8 @@
 		<td>{{obj.djgZgf}}</td>
 		<td>{{obj.djgWgf}}</td>
 		<td>{{obj.djgDg}}</td>
+		<td>{{obj.bcs}}</td>
+		<td>{{obj.fsl}}</td>
 		<td>{{obj.djgTime}}</td>
 		<td>
 			<button type="button" class="btn btn-sm blue btn-intervalList_1" 
@@ -191,10 +191,10 @@
                 $('input:checkbox').click(function(){
 	                var remark = $('[name=remarks]').val(), title = $(this).prop("title");
                 	if ($(this).prop('checked')) {
-                		if (remark.indexOf(title) > -1) return;
-	                	$('[name=remarks]').val((remark ? remark + ";" : "") + title);
+                		if (remark.indexOf(title + ";;") > -1) return;
+	                	$('[name=remarks]').val((remark ? remark + "," : "") + title + ";;");
                 	} else {
-                		$('[name=remarks]').val(remark.replace(";" + title, "").replace(title + ";", "").replace(title, ""));
+                		$('[name=remarks]').val(remark.replace("," + title + ";;", "").replace(title + ";;", ""));
                 	}
                 });
                 //字典转换
@@ -210,15 +210,13 @@
                 gb_common.personAutocomplete($('.spy-autocom', modal));
                 // 维修类型选中
                 var initReport = function() {
-                	var remark = $('[name=remarks]').val(), items = remark.split(';');
-                	for (var i = 0;i < items.length;i++) {
-               			for (var j = 0;j < reportTypes.length;j++) {
-               				if (items[i] == reportTypes[j].name) {
-               					$('input:checkbox[value=' + reportTypes[j].code + ']').prop('checked', true);
-                				isReport = true;
-               				}
-               			}
-                	}
+                	var remark = $('[name=remarks]').val();
+           			for (var i = 0;i < reportTypes.length;i++) {
+           				if (remark.indexOf(reportTypes[i] + ";;") > -1) {
+           					$('input:checkbox[value=' + reportTypes[i].code + ']').prop('checked', true);
+            				isReport = true;
+           				}
+           			}
                 }
                 initReport();
@@ -94,10 +94,10 @@
                 $('input:checkbox').click(function(){
 	                var remark = $('[name=remarks]').val(), title = $(this).prop("title");
                 	if ($(this).prop('checked')) {
-                		if (remark.indexOf(title) > -1) return;
-	                	$('[name=remarks]').val((remark ? remark + ";" : "") + title);
+                		if (remark.indexOf(title + ";;") > -1) return;
+	                	$('[name=remarks]').val((remark ? remark + "," : "") + title + ";;");
                 	} else {
-                		$('[name=remarks]').val(remark.replace(";" + title, "").replace(title + ";", "").replace(title, ""));
+                		$('[name=remarks]').val(remark.replace("," + title + ";;", "").replace(title + ";;", ""));
                 	}
                 });
@@ -156,14 +156,13 @@
              	// 维修类型选中
                 var initReport = function() {
-                	var remark = $('[name=remarks]').val(), items = remark.split(';');
-                	for (var i = 0;i < items.length;i++) {
-               			for (var j = 0;j < reportTypes.length;j++) {
-               				if (items[i] == reportTypes[j].name) {
-               					$('input:checkbox[value=' + reportTypes[j].code + ']').prop('checked', true);
-               				}
-               			}
-                	}
+                	var remark = $('[name=remarks]').val();
+           			for (var i = 0;i < reportTypes.length;i++) {
+           				if (remark.indexOf(reportTypes[i] + ";;") > -1) {
+           					$('input:checkbox[value=' + reportTypes[i].code + ']').prop('checked', true);
+            				isReport = true;
+           				}
+           			}
                 }
                 initReport();
             });