Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

潘钊
2 parents df3a5350 5ec0823f
Showing 11 changed files with 72 additions and 39 deletions
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/util/ReportUtils.java
src/main/resources/static/pages/forms/mould/list.xls
src/main/resources/static/pages/forms/mould/listDl.xls
src/main/resources/static/pages/mforms/singledatas/singledata.html
src/main/resources/static/pages/report/inoutstation.html
src/main/resources/static/pages/report/oil/oilListMonth.html
@@ -239,7 +239,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			m.put("rq", y.getRq());
 			m.put("gsname",y.getGsname() );
 			m.put("fgsname", y.getFgsname());
-			m.put("xlname", y.getXlname());
+			m.put("xlname", y.getXlname()==null?"":y.getXlname());
 			m.put("nbbm", y.getNbbm());
 			m.put("jsy", y.getJsy());
 			m.put("name", y.getName());
@@ -258,6 +258,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 			m.put("ns", y.getNs());
 			String shyy ="无";
 			if(y.getShyy()!=null){
+				shyy=y.getShyy();
 				 if(shyy.equals("1")){shyy="票务用油";}
 				 else if(shyy.equals("2")){shyy="保养用油";}
 				 else if(shyy.equals("3")){shyy="报废车用油";}
@@ -486,7 +486,7 @@ public class FormsServiceImpl implements FormsService {
 //				+ " on y.nbbm=t.cl_zbh and y.jsy= t.j_gh";
 		String sql="select r.s_gh,r.s_name, "
-				+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
+				+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
 				+ " from bsth_c_s_sp_info_real r where r.schedule_date_str = '"+startDate+"'";
 		if(xlbm.equals("")){
 			sql +="and r.gs_bm='"+gsdm+"' "
@@ -495,7 +495,7 @@ public class FormsServiceImpl implements FormsService {
 			sql += " and r.xl_bm = '"+xlbm+"'";
 		}
 	       sql += " group  by  r.s_gh,r.s_name,"
-	       		+ " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm";
+	       		+ " r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm order by r.xl_bm";
 		List<Singledata> list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 			//SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -503,7 +503,7 @@ public class FormsServiceImpl implements FormsService {
 			public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Singledata sin = new Singledata();
 				sin.setrQ(startDate);
-				sin.setxL(arg0.getString("xl_name"));
+				sin.setxL(arg0.getString("xl_bm"));
 				sin.setClzbh(arg0.getString("cl_zbh"));
 				sin.setJsy(arg0.getString("j_gh"));
 				sin.setjName(arg0.getString("j_name"));
@@ -520,6 +520,7 @@ public class FormsServiceImpl implements FormsService {
 		for (int i = 0; i < list.size(); i++) {
 			List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
 			Singledata sin=list.get(i);
+			sin.setxL(BasicData.lineCode2NameMap.get(sin.getxL()));
 			String jsy=sin.getJsy();
 			String clzbh=sin.getClzbh();
 			for (int j = 0; j < listReal.size(); j++) {
@@ -114,15 +114,15 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					long fcsj = Long.valueOf(split1[0]) * 60 + Long.valueOf(split1[1]);
 					long zdsj = Long.valueOf(split3[0]) * 60 + Long.valueOf(split3[1]);
 					if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())){
-						fcsj += 1440l;
-						zdsj += 1440l;
+						if(fcsj<23*60)	fcsj += 1440l;
+						if(zdsj<23*60)	zdsj += 1440l;
 					}
 					if(zdsj < fcsj)
 						zdsj += 1440l;
 					if(schedule.getDfsj() != null){
 						String[] split0 = schedule.getDfsj().split(":");
 						long dfsj = Long.valueOf(split0[0]) * 60 + Long.valueOf(split0[1]);
-						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate()))
+						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&dfsj<23*60)
 							dfsj += 1440l;
 						schedule.setDfsj(dfsj/60 + ":" + dfsj%60);
 						schedule.setDfsjT(dfsj);
@@ -130,7 +130,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					if(schedule.getFcsjActual() != null){
 						String[] split2 = schedule.getFcsjActual().split(":");
 						long fcsjA = Long.valueOf(split2[0]) * 60 + Long.valueOf(split2[1]);
-						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate()))
+						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&fcsjA<23*60)
 							fcsjA += 1440l;
 						schedule.setFcsjActual(fcsjA/60 + ":" + fcsjA%60);
 						schedule.setFcsjActualTime(fcsjA);
@@ -138,7 +138,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					if(schedule.getZdsjActual() != null){
 						String[] split4 = schedule.getZdsjActual().split(":");
 						long zdsjA = Long.valueOf(split4[0]) * 60 + Long.valueOf(split4[1]);
-						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate()))
+						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&zdsjA<23*60)
 							zdsjA += 1440l;
 						if(schedule.getFcsjActualTime() != null && zdsjA < schedule.getFcsjActualTime())
 							zdsjA += 1440l;
@@ -648,7 +648,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					if(schedule.getDfsj() != null){
 						String[] split0 = schedule.getDfsj().split(":");
 						long dfsj = Long.valueOf(split0[0]) * 60 + Long.valueOf(split0[1]);
-						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate()))
+						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&dfsj<23*60)
 							dfsj += 1440l;
 						schedule.setDfsj(dfsj/60 + ":" + dfsj%60);
 						schedule.setDfsjT(dfsj);
@@ -656,7 +656,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					if(schedule.getFcsjActual() != null){
 						String[] split2 = schedule.getFcsjActual().split(":");
 						long fcsjA = Long.valueOf(split2[0]) * 60 + Long.valueOf(split2[1]);
-						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate()))
+						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&fcsjA<23*60)
 							fcsjA += 1440l;
 						schedule.setFcsjActual(fcsjA/60 + ":" + fcsjA%60);
 						schedule.setFcsjActualTime(fcsjA);
@@ -664,7 +664,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					if(schedule.getZdsjActual() != null){
 						String[] split4 = schedule.getZdsjActual().split(":");
 						long zdsjA = Long.valueOf(split4[0]) * 60 + Long.valueOf(split4[1]);
-						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate()))
+						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&zdsjA<23*60)
 							zdsjA += 1440l;
 						schedule.setZdsjActual(zdsjA/60 + ":" + zdsjA%60);
 						schedule.setZdsjActualTime(zdsjA);
@@ -675,8 +675,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					long zdsj = Long.valueOf(split3[0]) * 60 + Long.valueOf(split3[1]);
 					if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())){
-						fcsj += 1440l;
-						zdsj += 1440l;
+						if(fcsj<23*60)	fcsj += 1440l;
+						if(zdsj<23*60)	zdsj += 1440l;
 					}
 					schedule.setFcsj(fcsj/60 + ":" + fcsj%60);
 					schedule.setZdsj(zdsj/60 + ":" + zdsj%60);
@@ -773,6 +773,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			Map<Long, ScheduleRealInfo> sortMap = new HashMap<Long, ScheduleRealInfo>();
 			List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
 			List<Long> keyList = new ArrayList<Long>();
+			List<Long> keyList2 = new ArrayList<Long>();
 			List<ScheduleRealInfo> list2 = keyMap.get(key);
 			long jhyysj = 0, sjyysj = 0;
 			long jhyssj = 0, sjyssj = 0;
@@ -794,6 +795,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					keyList.add(fcsj);
 				}
 				sortMap.put(fcsj, schedule);
+
 			}
 			Collections.sort(keyList);
@@ -884,12 +886,20 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					mapList.add(m);
 				}
 			}
-			for(int i = 1; i < mapList.size(); i++){
-				Map<String, Object> m1 = mapList.get(i - 1);
-				Map<String, Object> m2 = mapList.get(i);
-				if(m1.get("fcsj") != null && m2.get("fcsj") != null){
-					long fcsj2 = Long.valueOf(m2.get("fcsj").toString());
-					long fcsj1 = Long.valueOf(m1.get("fcsj").toString());
+
+			for(Map<String, Object> m : mapList){
+				if(m.get("fcsj") != null && m.get("fcsj").toString().trim().length()!=0){
+					keyList2.add(Long.valueOf(m.get("fcsj").toString()));
+				}
+			}
+			Collections.sort(keyList2);
+			for(long l : keyList2){
+				System.out.println(l);
+			}
+			for(int i = 1; i < keyList2.size(); i++){
+				long fcsj1 = keyList2.get(i - 1);
+				long fcsj2 = keyList2.get(i);
+				if(fcsj2 - fcsj1 < 90){
 					if(sfqr == 1 && time1 > fcsj1){
 						sjyysj += fcsj2 - time1;
 					}else if(sfqr == 1 && time2 < fcsj2){
@@ -898,7 +908,25 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						sjyysj += fcsj2 - fcsj1;
 					}
 					sjyysj1 += fcsj2 - fcsj1;
+					System.out.println("---"+(fcsj2-fcsj1)+"---"+sjyysj+"---"+sjyysj1);
 				}
+			}
+			
+			for(int i = 1; i < mapList.size(); i++){
+				Map<String, Object> m1 = mapList.get(i - 1);
+				Map<String, Object> m2 = mapList.get(i);
+//				if(m1.get("fcsj") != null && m2.get("fcsj") != null){
+//					long fcsj2 = Long.valueOf(m2.get("fcsj").toString());
+//					long fcsj1 = Long.valueOf(m1.get("fcsj").toString());
+//					if(sfqr == 1 && time1 > fcsj1){
+//						sjyysj += fcsj2 - time1;
+//					}else if(sfqr == 1 && time2 < fcsj2){
+//						sjyysj += time2 - fcsj1;
+//					}else{
+//						sjyysj += fcsj2 - fcsj1;
+//					}
+//					sjyysj1 += fcsj2 - fcsj1;
+//				}
 				if(m2.get("fcsj") != null && m2.get("zdsj") != null){
 					long zdsj = Long.valueOf(m2.get("zdsj").toString());
 					long fcsj = Long.valueOf(m2.get("fcsj").toString());
@@ -311,7 +311,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					Cars car = carsRepository.findOne(new CustomerSpecs<Cars>(map));
 					// 获取线路是否使用标识，如果未使用，则不查该线路数据
 					line = lineRepository.findByLineCode(schRealInfo.get("xlBm")+"");
-					if(line.getInUse() == null || line.getInUse() == 0){
+					if(line == null || line.getInUse() == null || line.getInUse() == 0){
 						continue;
 					}
 					sf.append("<DLD>");
@@ -403,8 +403,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			// 获取车辆存油信息
 			List<Cyl> cylList = cylRepository.obtainCyl(nbbm,gsbm);
 			// 指定日期YLB信息
-			List<Ylb> ylbList =repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
-			List<Ylb> iterator2=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
+			List<Ylb> ylbList =repository.obtainYl(rq,gsbm,fgsbm,"",nbbm,"nbbm,jcsx");
+			List<Ylb> iterator2=repository.obtainYl(rq,gsbm,fgsbm,"",nbbm,"jcsx");
 			for (int i=0;i<ylbList.size();i++) {
 				Ylb ylb = ylbList.get(i);
 				// 判断是否已经计算过
@@ -412,7 +412,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					String nbbm_eq = ylb.getNbbm();
 					Date rq_eq = ylb.getRq();
 					// 得到一天总的加油和里程（根据车，时间）
-					List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,ylb.getXlbm(),gsbm,fgsbm);
+					List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,"",gsbm,fgsbm);
 					// 保存总的加油量
 					Double jzl = 0.0;
 					// 保存总的里程
@@ -1112,7 +1112,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				String nbbm_eq = ylb.getNbbm();
 				Date rq_eq = ylb.getRq();
 				// 得到一天总的加油和里程（根据车，时间）
-				List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,ylb.getXlbm(),ylb.getSsgsdm(),ylb.getFgsdm());
+				List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,"",ylb.getSsgsdm(),ylb.getFgsdm());
 				// 保存总的加油量
 				Double jzl = 0.0;
 				// 保存总的里程
@@ -1135,7 +1135,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				map.put("nbbm_eq", nbbm_eq);
 				map.put("rq_eq", rq_eq);
-				List<Ylb> iterator2=repository.obtainYl(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),ylb.getXlbm(),
+				List<Ylb> iterator2=repository.obtainYl(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
 						ylb.getNbbm(),"jcsx");
 				DecimalFormat df = new DecimalFormat("#.00");
 				Double zyl = 0.0;
@@ -194,7 +194,7 @@ public class ReportUtils {
 				// 创建新行
 				newRow = sheet.createRow(index + k++);
 				// 把新行的内容换成和模板行一样
-				copyRow(wb, orgRow, newRow, true);
+				copyRow(wb, orgRow, newRow, true, wb.createCellStyle());
 				tmpCellNum = newRow.getLastCellNum();
 				for (int l = 0; l < tmpCellNum; l++) {
 					cell = newRow.getCell(l);
@@ -357,11 +357,11 @@ public class ReportUtils {
 	 * @param toRow
 	 */
 	private void copyRow(HSSFWorkbook wb, HSSFRow fromRow, HSSFRow toRow,
-			boolean copyValueFlag) {
+			boolean copyValueFlag, HSSFCellStyle style) {
 		for (Iterator<Cell> cellIt = fromRow.cellIterator(); cellIt.hasNext();) {
 			HSSFCell tmpCell = (HSSFCell) cellIt.next();
 			HSSFCell newCell = toRow.createCell(tmpCell.getColumnIndex(), 0);
-			copyCell(wb, tmpCell, newCell, copyValueFlag);
+			copyCell(wb, tmpCell, newCell, copyValueFlag, style);
 		}
 	}
@@ -374,8 +374,8 @@ public class ReportUtils {
 	 *            true则连同cell的内容一起复制
 	 */
 	public void copyCell(HSSFWorkbook wb, HSSFCell srcCell, HSSFCell distCell,
-			boolean copyValueFlag) {
-		HSSFCellStyle newstyle = wb.createCellStyle();
+			boolean copyValueFlag, HSSFCellStyle newstyle) {
+//		HSSFCellStyle newstyle = wb.createCellStyle();
 		copyCellStyle(wb, srcCell.getCellStyle(), newstyle);
 		// 样式
 		distCell.setCellStyle(newstyle);
@@ -140,6 +140,7 @@
 		$("#fgsdmSing").on("change",initXl);
 		function initXl(){
 			var data=[];
+			data.push({id: " ", text: "请选择"});
 			if(fage){
 				$("#line").select2("destroy").html('');
 			}
@@ -49,24 +49,24 @@
 					</div>
 					<br/>
 					<div>
-						<div id="bczxDiv" style="display: inline-block;margin-left: 15px;">
-							<div style="display: inline-block;margin-left: 15px;">
+						<div id="bczxDiv" style="display: inline-block;margin-left: 10px;">
+							<div style="display: inline-block;margin-left: 5px;">
 								<span class="item-label" style="width: 80px;">时间: </span>
 								<input class="form-control" type="text" id="date" style="width: 180px;"/>
 							</div>
-							<div style="display: inline-block;margin-left: 15px;">
+							<div style="display: inline-block;margin-left: 5px;">
 								<span class="item-label" style="width: 80px;">车辆: </span>
 								<select class="form-control"  id="nbbm" style="width: 180px;"></select>
 							</div>
 						</div>
-						<div id="clzdDiv" style="display:none ;margin-left: 15px;" >
-							<div style="display: inline-block;margin-left: 15px;">
+						<div id="clzdDiv" style="display:none ;margin-left: 10px;" >
+							<div style="display: inline-block;margin-left: 5px;">
 								<span class="item-label" style="width: 80px;">时间: </span>
 								<input class="form-control" type="text" id="date1" style="width: 180px;"/>
-								<span class="item-label" style="width: 60px;">至: </span>
+								<span class="item-label" style="width: 60px;margin-left: 19px;">至: </span>
 								<input class="form-control" type="text" id="date2" style="width: 180px;"/>
 								<span class="item-label" style="width: 80px;">站点: </span>
-								<select id="zdlx" class="sreach-zd" > 
+								<select class="form-control" id="zdlx" class="sreach-zd" > 
 										<option value="">请选择</option>
 										<option value="0">上行</option>
 										<option value="1">下行</option>
@@ -37,7 +37,7 @@
                     </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="导出"/>
+<!--                         <input class="btn btn-default" type="button" id="export" value="导出"/> -->
                     </div>
 				</form>
 			</div>
@@ -97,6 +97,8 @@
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
 		var day = d.getDate();
+		if(day < 10)
+			day = "0"+day;
 		if(month > 9){
 			$("#date").val(year + "-" + month + "-" + day);
 		} else {