修改了一些小问题

娄高锋
1 parent ad153921
Showing 10 changed files with 49 additions and 29 deletions
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/resources/static/pages/forms/mould/shifday.xls
src/main/resources/static/pages/forms/mould/shiftuehiclemanth.xls
src/main/resources/static/pages/forms/mould/shiftuehiclemanthclzbh.xls
src/main/resources/static/pages/forms/mould/shiftuehiclemanthspy.xls
src/main/resources/static/pages/forms/mould/timeAndSpeed.xls
src/main/resources/static/pages/forms/statement/lineTimeAnaly.html
src/main/resources/static/pages/report/countInterval/countInterval.html
@@ -98,14 +98,14 @@ public class ExportController {
 			m.put("lpName", l.getLpName());
 			m.put("carPlate", l.getCarPlate());
 			m.put("jhlc", l.getJhlc());
-			// m.put("sjjhlc", l.getSjjhlc());
+			m.put("sjjhlc", l.getSjjhlc());
 			m.put("yygl", l.getYygl());
 			m.put("emptMileage", l.getEmptMileage());
 			m.put("remMileage", l.getRemMileage());
 			m.put("addMileage", l.getAddMileage());
 			m.put("totalm", l.getTotalm());
 			m.put("jhbc", l.getJhbc());
-			// m.put("sjjhbc", l.getSjjhbc());
+			m.put("sjjhbc", l.getSjjhbc());
 			m.put("cjbc", l.getCjbc());
 			m.put("ljbc", l.getLjbc());
 			m.put("sjbc", l.getSjbc());
@@ -1961,6 +1961,7 @@ public class FormsServiceImpl implements FormsService {
 		tempMap.put("jhbc", jhbc);
 		tempMap.put("sjbc", sjbc);
 		tempMap.put("qz", qz);
+		tempMap.put("sm", "");
 		if(jhcc != 0 && sjcc != 0){
 			tempMap.put("ccl", numberFormat.format(((float)sjcc / jhcc)*100)+"%");
 		}else{
@@ -165,9 +165,14 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						schedule.setZdsjActual(null);
 					}
 					String[] split1 = schedule.getFcsj().split(":");
-					String[] split3 = schedule.getZdsj().split(":");
 					long fcsj = Long.valueOf(split1[0]) * 60 + Long.valueOf(split1[1]);
-					long zdsj = Long.valueOf(split3[0]) * 60 + Long.valueOf(split3[1]);
+					long zdsj = 0l;
+					if(schedule.getZdsj() == null){
+						zdsj = fcsj + schedule.getBcsj();
+					} else {
+						String[] split3 = schedule.getZdsj().split(":");
+						zdsj = Long.valueOf(split3[0]) * 60 + Long.valueOf(split3[1]);
+					}
 					if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())){
 						if(fcsj<23*60)	fcsj += 1440l;
 						if(zdsj<23*60)	zdsj += 1440l;
@@ -904,7 +909,15 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				}
 			}
-			sql = "select destroy, start_date, end_date, mileage, mileage_type, schedule from bsth_c_s_child_task order by start_date";
+			long id1 = 0, id2 = 0;
+			for(ScheduleRealInfo s : list){
+				if(s.getId() > id2)
+					id2 = s.getId();
+				if(id1 == 0 || id1 > s.getId())
+					id1 = s.getId();
+			}
+			sql = "select destroy, start_date, end_date, mileage, mileage_type, schedule from bsth_c_s_child_task";
+			sql += " where id >= "+id1+" and id <= "+id2+" order by start_date";
 			cList = jdbcTemplate.query(sql,
 					new RowMapper<ChildTaskPlan>(){
@@ -2162,9 +2175,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 //			tempMap.put("dxtz", dxtz);
 			tempMap.put("lbtz", lbtz);
 			tempMap.put("correct", sddf + zddf + lbtz);
-			tempMap.put("dfbl", sjbc>0?df.format((double)(sddf + zddf)/sjbc*100):0 + "%");
+			tempMap.put("dfbl", (sjbc>0?df.format((double)(sddf + zddf)/sjbc*100):0) + "%");
 //			tempMap.put("dxbl", df.format((double)(dxtz)/sjbc*100) + "%");
-			tempMap.put("lbbl", sjbc>0?df.format((double)(lbtz)/sjbc*100):0 + "%");
+			tempMap.put("lbbl", (sjbc>0?df.format((double)(lbtz)/sjbc*100):0) + "%");
 //			tempMap.put("correctbl", df.format((double)(sddf + zddf + dxtz + lbtz)/sjbc*100) + "%");
 //			tempMap.put("workList", tempList);
@@ -2294,9 +2307,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 //			tempMap.put("dxtz", dxtz);
 			tempMap.put("lbtz", lbtz);
 			tempMap.put("correct", sddf + zddf  + lbtz);
-			tempMap.put("dfbl", sjbc>0?df.format((double)(sddf + zddf)/sjbc*100):0 + "%");
+			tempMap.put("dfbl", (sjbc>0?df.format((double)(sddf + zddf)/sjbc*100):0) + "%");
-			tempMap.put("lbbl", sjbc>0?df.format((double)(lbtz)/sjbc*100):0 + "%");
+			tempMap.put("lbbl", (sjbc>0?df.format((double)(lbtz)/sjbc*100):0) + "%");
 //			tempMap.put("correctbl", df.format((double)(sddf + zddf + dxtz + lbtz)/sjbc*100) + "%");
 			resList.add(tempMap);
 		}
@@ -2319,11 +2332,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
         		resMap.put("dxtz", dxtzz);
         		resMap.put("correct",correct+dxtzz);
         		if(sjbc<=0){
-        			resMap.put("dxbl", "0");
-        			resMap.put("correctbl", "0");
+        			resMap.put("dxbl", "0%");
+        			resMap.put("correctbl", "0%");
         		}else{
-        			resMap.put("dxbl", sjbc>0?df.format((double)(dxtzz)/sjbc*100):0 + "%");
-        			resMap.put("correctbl", sjbc>0?df.format((double)(correct+dxtzz)/sjbc*100):0 + "%");
+        			resMap.put("dxbl", (sjbc>0?df.format((double)(dxtzz)/sjbc*100):0) + "%");
+        			resMap.put("correctbl", (sjbc>0?df.format((double)(correct+dxtzz)/sjbc*100):0) + "%");
         		}
@@ -2374,11 +2387,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
         		resMap.put("dxtz", dxtzf);
         		resMap.put("correct",correct+dxtzf);
         		if(sjbc<=0){
-        			resMap.put("dxbl", "0");
-        			resMap.put("correctbl", "0");
+        			resMap.put("dxbl", "0%");
+        			resMap.put("correctbl", "0%");
         		}else{
-        			resMap.put("dxbl", sjbc>0?df.format((double)(dxtzf)/sjbc*100):0 + "%");
-        			resMap.put("correctbl", sjbc>0?df.format((double)(correct+dxtzf)/sjbc*100):0 + "%");
+        			resMap.put("dxbl", (sjbc>0?df.format((double)(dxtzf)/sjbc*100):0) + "%");
+        			resMap.put("correctbl", (sjbc>0?df.format((double)(correct+dxtzf)/sjbc*100):0) + "%");
         		}
         		resMap.put("xlname",BasicData.lineCode2NameMap.get(xlbm));
         	}
@@ -170,14 +170,6 @@
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
-		$("#startDate").datetimepicker({
-			format : 'YYYY-MM-DD',
-			locale : 'zh-cn'
-		});
-		$("#endDate").datetimepicker({
-			format : 'YYYY-MM-DD',
-			locale : 'zh-cn'
-		});
 		$("#times1").datetimepicker({
 			format : 'HH:mm',
@@ -189,6 +181,7 @@
 		});
 		var d = new Date();
+		d.setTime(d.getTime() - 1*1000*60*60*24);
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
 		var day = d.getDate();
@@ -196,8 +189,19 @@
 			month = "0" + month;
 		if(day < 10)
 			day = "0" + day;
-		$("#startDate").val(year + "-" + month + "-" + day);
-		$("#endDate").val(year + "-" + month + "-" + day);
+		var dateTime = year + "-" + month + "-" + day;
+		$("#startDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#endDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#startDate").val(dateTime);
+		$("#endDate").val(dateTime);
 		$("#times1").val("05:00");
 		$("#times2").val("23:00");
@@ -391,7 +395,8 @@
 				var tbodyHtml = template('list_lineTimeAnaly',{list:result});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
-
+				$("#works_hidden").addClass("hidden");
+				$("#printArea").addClass("hidden");
 				list = result;
 			});
@@ -413,6 +418,7 @@
 					$('#works tbody').html(tbodyHtml);
 					$("#works_hidden").removeClass("hidden");
 					$("#works .hidden").removeClass("hidden");
+					$("#printArea").removeClass("hidden");
 					$("#date1").html(g.dates);
 					$("#line1").html(g.line);
 					$("#lp1").html(g.lp);
@@ -314,7 +314,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="9"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>