调度日报备注路单计划班次

廖磊
1 parent fd0b38d4
Showing 3 changed files with 69 additions and 13 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/forms/statement/scheduleDaily.html
@@ -875,7 +875,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
         map.put("ksgl",ksgl);
         map.put("realMileage", Arith.add(yygl ,ksgl));
-        map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
+        map.put("jhbc", culateMieageService.culateJhbc(scheduleRealInfos,""));
         map.put("cjbc", culateMieageService.culateLbbc(lists));
         map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
         int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
@@ -2674,8 +2674,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         for (int i = 0; i < newList.size(); i++) {
             ScheduleRealInfo t1 = newList.get(i);
+            String reamrks1=t1.getRemarks()==null?"":t1.getRemarks();
+            if(reamrks1.length()>5){
+            	t1.setRemarks(reamrks1.substring(0, 5));
+            	t1.setRemark(reamrks1);
+            }
             for (int j = 0; j < list.size(); j++) {
                 ScheduleRealInfo t2 = list.get(j);
+                String reamrks2=t2.getRemarks()==null?"":t2.getRemarks();
+                if(reamrks2.length()>5){
+                	t2.setRemarks(reamrks2.substring(0, 5));
+                	t2.setRemark(reamrks2);
+                }
                 if (t1.getId() == t2.getId()) {
                     t1 = t2;
                 }
@@ -3989,7 +3999,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
              }
              tempMap.put("fcsjk" + x, fcsjk);
              tempMap.put("fcsjm" + x, fcsjm);
-             tempMap.put("remarks" + x, schedule.getRemarks() != null ? schedule.getRemarks() : "");
+             tempMap.put("remarks" + x, schedule.getRemark() != null ? schedule.getRemark() : "");
              size++;
         }
@@ -4084,7 +4094,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         double ksgl=Arith.add(culateMieageService.culateKsgl(lists),culateMieageService.culateJccgl(lists));
         map.put("ksgl",ksgl);
         map.put("realMileage", Arith.add(yygl ,ksgl));
-        map.put("jhbc", culateMieageService.culateJhgl(scheduleRealInfos));
+        map.put("jhbc", culateMieageService.culateJhbc(scheduleRealInfos,""));
         map.put("cjbc", culateMieageService.culateLbbc(lists));
         map.put("ljbc", culateMieageService.culateLjbc(lists, ""));
         int sjbc =culateMieageService.culateLjbc(lists, "")+culateMieageService.culateSjbc(lists, "");
@@ -864,12 +864,14 @@ public class ReportServiceImpl implements ReportService{
 				//查询时间里程
 				String sqlPc=" (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,ists,2 as xh FROM "
 						+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"' and "
-						+ " fcsj <='"+minfcsj+"' and bc_type!='in' and bc_type!='out' and bc_type!='ldks') "
+						+ " fcsj <='"+minfcsj+"' and bc_type!='in' and bc_type!='out' and bc_type!='ldks'"
+								+ " and bc_type !='region') "
 						+ " union "
 						+ " (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,ists,1 as xh FROM "
 						+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"'  and "
-						+ " fcsj > '"+minfcsj+"' and bc_type!='in' and bc_type!='out' and bc_type!='ldks') "
-						+ " order by xl_dir, xh, fcsj";
+						+ " fcsj > '"+minfcsj+"' and bc_type!='in' and bc_type!='out' and bc_type!='ldks' "
+								+ " and bc_type !='region') "
+						+ " order by xl_dir, xh, lp,fcsj";
 				Map<String, Object> map=new HashMap<String,Object>();
 				List<Map<String, Object>> list= jdbcTemplate.query(sqlPc,
 						new RowMapper<Map<String, Object>>(){
@@ -923,13 +925,17 @@ public class ReportServiceImpl implements ReportService{
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			List<Map<String, Object>> list2 = keyMap.get(key);
 			List<Integer> cjs = new ArrayList<Integer>();
+			List<Integer> fcsj_s = new ArrayList<Integer>();
+			List<Integer> fcsj_x = new ArrayList<Integer>();
 			int sxsj = 0, xxsj = 0, sxtssj = 0, xxtssj = 0;
 			int sxbc = 0, xxbc = 0, sxtsbc = 0, xxtsbc = 0;
 			int temp = 24*60+1, zcj = 0;
 			boolean ists = false;
+			String lpname="";
 			for(Map<String, Object> m : list2){
 				String[] split = m.get("fcsj").toString().split(":");
 				int fcsj = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
+				
 				int xlDir = Integer.valueOf(m.get("dir").toString());
 				int bcsj = Integer.valueOf(m.get("bcsj").toString());
 				if(temp >= fcsj){
@@ -937,28 +943,68 @@ public class ReportServiceImpl implements ReportService{
 					ists = false;
 				}
 				if(xlDir == 0){
+					fcsj_s.add(fcsj);
 					sxsj += bcsj;
 					sxbc ++;
-					if(ists){
-						sxtssj += fcsj - temp;
+					if(!ists){
+						if(lpname.equals("")){
+							lpname=m.get("lp").toString();
+						}else{
+							if(lpname.equals(m.get("lp").toString())){
+								sxtssj += (fcsj+bcsj) - temp;
+							}
+						}
 						sxtsbc++;
 					}
 				} else {
+					fcsj_x.add(fcsj);
 					xxsj += bcsj;
 					xxbc ++;
-					if(ists){
-						xxtssj += fcsj - temp;
+					
+					if(!ists){
+						
+						if(lpname.equals("")){
+							lpname=m.get("lp").toString();
+						}else{
+							if(lpname.equals(m.get("lp").toString())){
+								xxtssj += (fcsj+bcsj) - temp;
+							}
+						}
 						xxtsbc++;
 					}
 				}
-				if(temp < fcsj){
+				/*if(temp < fcsj){
 					cjs.add(fcsj - temp);
 					temp = fcsj;
-				}
+				}*/
 				if(m.get("ists").toString().trim().equals("1")){
 					ists = true;
+				}else{
+					ists=false;
 				}
 			}
+			Collections.sort(fcsj_s);
+			int fcsjs=0;
+			for (int i = 0; i < fcsj_s.size(); i++) {
+				if(i==0){
+					fcsjs =fcsj_s.get(i);
+				}else{
+					cjs.add(fcsj_s.get(i)-fcsjs);
+					fcsjs=fcsj_s.get(i);
+				}
+				
+			}
+			Collections.sort(fcsj_x);
+			int fcsjx=0;
+			for (int i = 0; i < fcsj_x.size(); i++) {
+				if(i==0){
+					fcsjx =fcsj_x.get(i);
+				}else{
+					cjs.add(fcsj_x.get(i)-fcsjx);
+					fcsjx =fcsj_x.get(i);
+				}
+				
+			}
 			Collections.sort(cjs);
 			for(int i : cjs){
 				zcj += i;
@@ -594,7 +594,7 @@
 				<td>{{obj.slow0}}
 				</td>
-				<td colspan="2"></td>
+				<td colspan="2" title="{{obj.remark}}">{{obj.remarks}}</td>
 		{{if (i+1)%3 == 0}}
 				<td>&nbsp;</td>
 			</tr>