青浦行车路单修改

廖磊
1 parent b1782d6a
Showing 4 changed files with 159 additions and 16 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/waybillQp.html
@@ -483,6 +483,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> MapById(@RequestParam("id") Long id){
 		return scheduleRealInfoService.MapById(id);
 	}
+	
+	@RequestMapping(value="/MapByIdQp",method = RequestMethod.GET)
+	public Map<String, Object> MapByIdQp(@RequestParam("id") Long id){
+		return scheduleRealInfoService.MapByIdQp(id);
+	}
  
 	/**
 	 * @Title: scheduleDaily
@@ -144,6 +144,8 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String,Object> historySave(ScheduleRealInfo sch);
  
     Map<String, Object> MapById(Long id) ;
+    Map<String, Object> MapByIdQp(Long id) ;
+
  
     Map<String,Object> svgAttr(String jsonStr);
  
@@ -3732,22 +3732,23 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
  
         //计算里程和班次数，并放入Map里
-        map = new HashMap<String, Object>();
+        map = findKMBCQp(clZbh, date, line);
         map.put("jzl", jzl);
-        map.put("jhlc", format.format(jhlc + jcclc));
-        map.put("yygljh", format.format(jhlc));
-        map.put("ssgl", format.format(remMileage));
-        map.put("ksgl", format.format(ksgl));
-        map.put("yyglsj", format.format(yygl));
-        map.put("jhbc", jhbc);
-        map.put("jcclc", jcclc);
-
-        map.put("ljgl", format.format(addMileage));
-        map.put("ssbc", cjbc);
-        map.put("ysgl", format.format(yygl));
-        map.put("sjbc", jhbc - cjbc + ljbc);
-        map.put("zgl", format.format(yygl + ksgl + jcclc));
-        map.put("ljbc", ljbc);
+//        map.put("jhlc", format.format(jhlc + jcclc));
+//        map.put("yygljh", format.format(jhlc));
+//        map.put("ssgl", format.format(remMileage));
+//        map.put("ksgl", format.format(ksgl));
+//        map.put("yyglsj", format.format(yygl));
+//        map.put("jhbc", jhbc);
+//        map.put("jcclc", jcclc);
+//
+//        map.put("ljgl", format.format(addMileage));
+//        map.put("ssbc", cjbc);
+//        map.put("ysgl", format.format(yygl));
+//        map.put("sjbc", jhbc - cjbc + ljbc);
+//        map.put("zgl", format.format(yygl + ksgl + jcclc));
+//        map.put("ljbc", ljbc);
+        
         String zdp = "", zwdp = "", wdp = "";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         List<DutyEmployee> listDtuy = dutyEmployeeService.getDutyEmployee(line, date + "00:00", date + "23:59");
@@ -4006,6 +4007,141 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("dbdp", dbdp);
         return map;
     }
+    
+    @Override
+    public Map<String, Object> MapByIdQp(Long id) {
+        // TODO Auto-generated method stub
+        Map<String, Object> map = new HashMap<String, Object>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        ScheduleRealInfo s = scheduleRealInfoRepository.scheduleById(id);
+        String xlbm = s.getXlBm();
+        String fcrq = s.getScheduleDateStr();
+
+        int type=0;
+        Double ccyl = 0.0;
+        Double jcyl = 0.0;
+        Double yh = 0.0;
+        Double jzl = 0.0;
+        Double zlc=0.0;
+//        List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
+//        List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
+//        if(listYlb.size()>0){
+//        	 type=0;
+//        	for (int i = 0; i < listYlb.size(); i++) {
+//                Ylb y = listYlb.get(i);
+//                if(y.getLp()==null){
+//                	ccyl=Arith.add(ccyl, y.getCzyl());
+//                    jcyl=Arith.add(jcyl, y.getJzyl());
+//                    yh =Arith.add(yh ,y.getYh());
+//                    jzl =Arith.add(jzl, y.getJzl());
+//                    zlc =Arith.add(zlc, y.getZlc());
+//                }else{
+//                	if(y.getLp().equals(s.getLpName())){
+//                		ccyl=Arith.add(ccyl, y.getCzyl());
+//                        jcyl=Arith.add(jcyl, y.getJzyl());
+//                        yh =Arith.add(yh ,y.getYh());
+//                        jzl =Arith.add(jzl, y.getJzl());
+//                        zlc =Arith.add(zlc, y.getZlc());
+//                	}
+//                }
+//                
+//            }
+//        }else{
+//        	 type=1;
+//        	for (int i = 0; i < listDlb.size(); i++) {
+//				Dlb d=listDlb.get(i);
+//				if(d.getLp()==null){
+//					ccyl=Arith.add(ccyl, d.getCzcd());
+//	                jcyl=Arith.add(jcyl, d.getJzcd());
+//	                yh =Arith.add(yh ,d.getHd());
+//	                jzl =Arith.add(jzl, d.getCdl());
+//	                zlc =Arith.add(zlc, d.getZlc());
+//				}else{
+//					if(d.getLp().equals(s.getLpName())){
+//						ccyl=Arith.add(ccyl, d.getCzcd());
+//		                jcyl=Arith.add(jcyl, d.getJzcd());
+//		                yh =Arith.add(yh ,d.getHd());
+//		                jzl =Arith.add(jzl, d.getCdl());
+//		                zlc =Arith.add(zlc, d.getZlc());
+//					}
+//				}
+//				
+//			}
+//        }
+        
+        List<Ylxxb> listylxxb=ylxxbRepository.queryListYlxxb(s.getClZbh(), fcrq);
+        for (int i = 0; i < listylxxb.size(); i++) {
+        	Ylxxb t=listylxxb.get(i);
+            jzl =Arith.add(jzl, t.getJzl());
+		}
+        map.put("jzl", jzl);
+        map.put("yh", yh);
+        map.put("ccyl", ccyl);
+        map.put("jcyl", jcyl);
+        map.put("type", type);
+        map.put("zlc", zlc);
+        map.put("xlName", s.getXlName());
+        map.put("clZbh", s.getClZbh());
+        map.put("plate", BasicData.nbbmCompanyPlateMap.get(s.getClZbh()));
+        map.put("fcsjActual", s.getFcsjActual());
+        map.put("zdzName", s.getZdzName());
+        map.put("scheduleDate", s.getScheduleDateStr());
+        map.put("lpName", s.getLpName());
+        String zdp = "", zwdp = "", wdp = "";
+        String zdpT = "", zwdpT = "", wdpT = "";
+        String dbdp="";
+        List<DutyEmployee> list = dutyEmployeeService.getDutyEmployee(xlbm, fcrq + "00:01", fcrq + "23:59");
+        try {
+            Long fcsj1 = sdf.parse(fcrq + " 00:01").getTime();
+            Long fcsj2 = sdf.parse(fcrq + " 11:00").getTime();
+            Long fcsj3 = sdf.parse(fcrq + " 23:59").getTime();
+            for (int i = 0; i < list.size(); i++) {
+                DutyEmployee t = list.get(i);
+                if(dbdp.indexOf(t.getuName()) == -1){
+                    if(!(dbdp.length()>0)){
+                        dbdp  =t.getuName();
+                    }else{
+                        dbdp +=","+t.getuName();
+                    }
+                }
+                Long ts = t.getTs();
+                if (ts > fcsj1 && ts < fcsj2) {
+                    if (zdp.indexOf(t.getuName()) == -1) {
+                        if (!(zdp.length() > 0)) {
+                            zdpT = t.getuName() + "...";
+                        }
+                        zdp += t.getuName() + ",";
+
+                    }
+                } else if (ts > fcsj2 && ts < fcsj3) {
+                    if (zwdp.indexOf(t.getuName()) == -1) {
+                        if (!(zwdp.length() > 0)) {
+                            zwdpT = t.getuName() + "...";
+                        }
+                        zwdp += t.getuName() + ",";
+                    }
+                } else {
+                    if (wdp.indexOf(t.getuName()) == -1) {
+                        if (!(wdp.length() > 0)) {
+                            wdpT = t.getuName() + "...";
+                        }
+                        wdp += t.getuName() + ",";
+                    }
+                }
+            }
+        } catch (ParseException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        map.put("zdp", zdp);
+        map.put("zwdp", zwdp);
+        map.put("wdp", wdp);
+        map.put("zdpT", zdpT);
+        map.put("zwdpT", zwdpT);
+        map.put("wdpT", wdpT);
+        map.put("dbdp", dbdp);
+        return map;
+    }
  
     @Override
     public List<Map<String, Object>> scheduleDailyQp(String line, String date) {
@@ -173,7 +173,7 @@
  
 			var id = $("#"+params[0]).val();
  
-			$get('/realSchedule/MapById',{id:id},function(result){
+			$get('/realSchedule/MapByIdQp',{id:id},function(result){
 // 			    result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
 				var ludan_1 = template('ludan_1',{map:result});
 				//var ludan_4 = template('ludan_4',result);