行车路单添加当班调派车牌号油电导出格式

廖磊
1 parent ef1bfdae
Showing 9 changed files with 86 additions and 37 deletions
src/main/java/com/bsth/controller/oil/DlbController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/entity/oil/Dlb.java
src/main/java/com/bsth/entity/oil/Ylb.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/mould/listDl.xls
src/main/resources/static/pages/forms/mould/waybill_minhang.xls
src/main/resources/static/pages/forms/statement/waybill.html
@@ -143,12 +143,16 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 			Map<String, Object> m = new HashMap<String, Object>();
 			m.put("rq", y.getRq());
 			m.put("gsname",y.getGsname() );
+			m.put("fgsname", y.getFgsname());
 			m.put("xlname", y.getXlname());
 			m.put("nbbm", y.getNbbm());
 			m.put("jsy", y.getJsy());
+			m.put("name", y.getName());
 			m.put("cdl", y.getCdl());
 			m.put("czcd", y.getCzcd()+"%");
 			m.put("jzcd", y.getJzcd()+"%");
+			m.put("czlc", y.getCzlc());
+			m.put("jzlc", y.getJzlc());
 			m.put("hd", y.getHd());
 			String shyy ="无";
 			if(y.getShyy()!=null){
@@ -162,9 +166,11 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 				 else if(shyy.equals("8")){shyy="车间(小修)";}
 				 else{shyy ="无";}
 			}
+			m.put("ns", y.getNs());
 			m.put("shyy", shyy);
 			m.put("sh", y.getSh());
 			m.put("zlc", y.getZlc());
+			m.put("rdlx", "");
 			m.put("bglyh", y.getBglyh());
 			resList.add(m);
 		}
@@ -39,6 +39,9 @@ public class BasicData implements CommandLineRunner {
     //车辆自编号和公司代码对照 （K: 车辆自编号 ，V：公司代码）
     public static Map<String, String> nbbm2CompanyCodeMap;
+    
+    //车辆自编号和公司代码对照 （K: 车辆自编号 ，V：牌照号）
+    public static Map<String, String> nbbmCompanyPlateMap;
     //站点编码和名称对照，包括停车场 （K: lineCode_updown_stationCode ，V：站点名称）
     public static Map<String, String> stationCode2NameMap;
@@ -195,16 +198,22 @@ public class BasicData implements CommandLineRunner {
             BiMap<String, String> deviceId2Nbbm = HashBiMap.create();
             //车辆和公司代码对照
             Map<String, String> nbbm2CompanyCode = new HashMap<>();
+            
+            //车辆自编号和拍照号对照
+            Map<String, String> nbbmCompanyPlate = new HashMap<>();
+            
             Iterator<Cars> carIterator = carsRepository.findAll().iterator();
             Cars car;
             while (carIterator.hasNext()) {
                 car = carIterator.next();
                 deviceId2Nbbm.put(car.getEquipmentCode(), car.getInsideCode());
                 nbbm2CompanyCode.put(car.getInsideCode(), car.getBusinessCode());
+                nbbmCompanyPlate.put(car.getInsideCode(), car.getCarPlate());
             }
             deviceId2NbbmMap = deviceId2Nbbm;
             nbbm2CompanyCodeMap = nbbm2CompanyCode;
+            nbbmCompanyPlateMap =nbbmCompanyPlate;
         }
         /**
@@ -57,7 +57,8 @@ public class Dlb {
 	private int nylx;
 	//进场顺序（根据最先出场和最后进场来关联车辆的存电量）
 	private int jcsx;
-	
+	@Transient
+	private String name;
 	@Transient
 	private String bglyh;
@@ -67,6 +68,9 @@ public class Dlb {
 	@Transient
 	private String gsname;
+	@Transient
+	private String fgsname;
+	
@@ -354,6 +358,20 @@ public class Dlb {
 	public void setGsname(String gsname) {
 		this.gsname = gsname;
 	}
+
+	public String getName() {
+		return BasicData.allPerson.get(this.ssgsdm+"-"+this.jsy);
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
-	
+	public String getFgsname() {
+		return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.ssgsdm);
+	}
+
+	public void setFgsname(String fgsname) {
+		this.fgsname = fgsname;
+	}
 }
@@ -313,7 +313,7 @@ public class Ylb {
 	}
 	public String getName() {
-		return BasicData.allPerson.get(this.jsy);
+		return BasicData.allPerson.get(this.ssgsdm+"-"+this.jsy);
 	}
 	public void setName(String name) {
@@ -22,6 +22,9 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	List<ScheduleRealInfo> findByLines(List<String> lines);
+	@Query(value="select s from ScheduleRealInfo s where s.id = ?1 ")
+	ScheduleRealInfo scheduleById(Long id);
+	
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and bc_type not in ('in','out') order by (lpName+1),clZbh,realExecDate,dfsj")
 	List<ScheduleRealInfo> scheduleDailyQp(String line,String date);
@@ -801,37 +801,38 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         DecimalFormat format = new DecimalFormat("0.00");
 //		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
-
-        Map<String, Object> map;
+      //计算里程和班次数，并放入Map里
+        Map<String, Object>  map = this.MapById(scheduleRealInfos.get(0).getId());
+//      map=new HashMap<String,Object>();
+        Map<String, Object> maps;
         for (ScheduleRealInfo scheduleRealInfo : scheduleRealInfos) {
-                map = new HashMap<String, Object>();
+                maps = new HashMap<String, Object>();
                 try {
                     scheduleRealInfo.setjName(scheduleRealInfo.getjGh() + scheduleRealInfo.getjName());
                     scheduleRealInfo.setsName(scheduleRealInfo.getsGh() + scheduleRealInfo.getsName());
-                    map = rru.getMapValue(scheduleRealInfo);
+                    maps = rru.getMapValue(scheduleRealInfo);
                     String zdsj = scheduleRealInfo.getZdsj();
                     String zdsjActual = scheduleRealInfo.getZdsjActual();
                     if (zdsj != null && zdsjActual != null &&
                             !zdsj.equals(zdsjActual)) {
                         if (zdsj.compareTo(zdsjActual) > 0) {
-                            map.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
-                            map.put("slow", "");
+                        	maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                        	maps.put("slow", "");
                         } else {
-                            map.put("fast", "");
-                            map.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                        	maps.put("fast", "");
+                        	maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
                         }
                     } else {
-                        map.put("fast", "");
-                        map.put("slow", "");
+                    	maps.put("fast", "");
+                    	maps.put("slow", "");
                     }
-                    listMap.add(map);
+                    listMap.add(maps);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
         }
-        //计算里程和班次数，并放入Map里
-        map = new HashMap<String, Object>();
+        
         map.put("jhlc",Arith.add(culateMieageService.culateJhgl(scheduleRealInfos),culateMieageService.culateJhJccgl(scheduleRealInfos)));
         map.put("remMileage",culateMieageService.culateLbgl(lists));
         map.put("addMileage", culateMieageService.culateLjgl(lists));
@@ -849,7 +850,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
         list.add(listMap.iterator());
-        ee.excelReplace(list, new Object[]{scheduleRealInfos.get(0), map}, path + "mould/waybill_minhang.xls",
+        ee.excelReplace(list, new Object[]{scheduleRealInfos.get(0),map}, path + "mould/waybill_minhang.xls",
                 path + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls");
         return scheduleRealInfos;
     }
@@ -3767,7 +3768,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         // 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.findOne(id);
+        ScheduleRealInfo s = scheduleRealInfoRepository.scheduleById(id);
         String xlbm = s.getXlBm();
         String fcrq = s.getScheduleDateStr();
         List<Ylxxb> listYlxxb = ylxxbRepository.queryListYlxxb(s.getClZbh(), fcrq);
@@ -3793,20 +3794,28 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("jcyl", jcyl);
         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);
+            	DutyEmployee t = list.get(i);
+            	if(!(dbdp.indexOf(",")>0)){
+	            	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) {
@@ -3842,6 +3851,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("zdpT", zdpT);
         map.put("zwdpT", zwdpT);
         map.put("wdpT", wdpT);
+        map.put("dbdp", dbdp);
         return map;
     }
@@ -4139,37 +4149,36 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         DecimalFormat format = new DecimalFormat("0.00");
 //		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
-
-        Map<String, Object> map;
+        Map<String, Object>  map = this.MapById(scheduleRealInfos.get(0).getId());
+        Map<String, Object> maps;
         for (ScheduleRealInfo scheduleRealInfo : scheduleRealInfos) {
-                map = new HashMap<String, Object>();
+                maps = new HashMap<String, Object>();
                 try {
                     scheduleRealInfo.setjName(scheduleRealInfo.getjGh() + scheduleRealInfo.getjName());
                     scheduleRealInfo.setsName(scheduleRealInfo.getsGh() + scheduleRealInfo.getsName());
-                    map = rru.getMapValue(scheduleRealInfo);
+                    maps = rru.getMapValue(scheduleRealInfo);
                     String zdsj = scheduleRealInfo.getZdsj();
                     String zdsjActual = scheduleRealInfo.getZdsjActual();
                     if (zdsj != null && zdsjActual != null &&
                             !zdsj.equals(zdsjActual)) {
                         if (zdsj.compareTo(zdsjActual) > 0) {
-                            map.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
-                            map.put("slow", "");
+                            maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                            maps.put("slow", "");
                         } else {
-                            map.put("fast", "");
-                            map.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
+                            maps.put("fast", "");
+                            maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
                         }
                     } else {
-                        map.put("fast", "");
-                        map.put("slow", "");
+                        maps.put("fast", "");
+                        maps.put("slow", "");
                     }
-                    listMap.add(map);
+                    listMap.add(maps);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
         }
         //计算里程和班次数，并放入Map里
-        map = new HashMap<String, Object>();
         map.put("jhlc", Arith.add(culateMieageService.culateJhgl(scheduleRealInfos),culateMieageService.culateJhJccgl(scheduleRealInfos)));
         map.put("remMileage",culateMieageService.culateLbgl(lists));
         map.put("addMileage", culateMieageService.culateLjgl(lists));
@@ -4187,7 +4196,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
         list.add(listMap.iterator());
-        ee.excelReplace(list, new Object[]{scheduleRealInfos.get(0), map}, path + "mould/waybill_minhang.xls",
+        ee.excelReplace(list, new Object[]{map}, path + "mould/waybill_minhang.xls",
                 path + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls");
         return scheduleRealInfos;
     }
@@ -4219,9 +4228,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 String jName = list.get(0);
                 String clZbh = list.get(1);
                 String lpName = list.get(2);
+                String jGh =list.get(3);
                 for (int i = 0; i < lists_line.size(); i++) {
 					ScheduleRealInfo s=lists_line.get(i);
-					if(s.getjName().equals(jName) && s.getClZbh().equals(clZbh) && s.getLpName().equals(lpName)){
+					if(s.getjGh().equals(jGh) && s.getClZbh().equals(clZbh) && s.getLpName().equals(lpName)){
 						newList.add(s);
 					}
 				}
@@ -305,6 +305,9 @@
 				param[index] = new Array();
 				$(this).children().each(function(i){
 					param[index][i] = $(this).text().split("\\")[0];
+					if(i==0){
+						param[index][3] = $(this).text().split("\\")[1];
+					}
 				});
 			});
 			$get('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
@@ -361,11 +364,11 @@
           <td colspan="14">行车路单</td>
       </tr>
       <tr>
-          <td colspan="14">路别:{{xlName}}   路牌:{{lpName}}   车号:{{clZbh}}   出场时间:{{fcsjActual}}   到达站名:{{zdzName}}   当班调派:&nbsp;   日期:{{scheduleDate}}</td>
+          <td colspan="14">路别:{{xlName}}   路牌:{{lpName}}   车号:{{clZbh}}({{plate}})   出场时间:{{fcsjActual}}   到达站名:{{zdzName}}   当班调派:{{dbdp}}   日期:{{scheduleDate}}</td>
       </tr>
       <tr>
-          <td colspan="2">出场存油 {{ccyl}};升</td>
-          <td colspan="2">加注油量 {{jzl}}升</td>
+          <td colspan="2">出场存油 {{ccyl}}升</td>
+          <td colspan="2">加注量 {{jzl}}升</td>
           <td colspan="2">进场存油 {{jcyl}}升</td>
           <td colspan="4">加注机油 &nbsp;升</td>
           <td colspan="4">本日耗油 {{yh}}升</td>