0110

廖磊
1 parent 8341a4ad
Showing 4 changed files with 56 additions and 10 deletions
src/main/java/com/bsth/controller/DownloadController.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/util/ReportUtils.java
src/main/resources/static/pages/forms/statement/waybillQp.html
@@ -31,7 +31,7 @@ public class DownloadController
 	@RequestMapping("download")    
     public ResponseEntity<byte[]> download(String fileName) throws IOException {
     	fileName = fileName+".xls";
-    	String moudelPath = this.getClass().getResource("/").getPath()+ "static\\pages\\forms\\export\\"+fileName; 
+    	String moudelPath = this.getClass().getResource("/").getPath()+ "static/pages/forms/export/"+fileName; 
     	System.out.println(moudelPath);
 //       String path="D:\\export\\target\\"+jName+".xls";  
         File file=new File(moudelPath);  
@@ -2201,12 +2201,43 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		map.put("sjbc", jhbc-cjbc+ljbc);
 		map.put("zgl", format.format(yygl+remMileage+ksgl+jcclc));
 		map.put("ljbc", ljbc);
-		
-		String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
-
+		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");
+		try {
+			Long fcsj1=sdf.parse(date+" 03:00").getTime();
+			Long fcsj2=sdf.parse(date+" 11:00").getTime();
+			Long fcsj3=sdf.parse(date+" 22:00").getTime();
+			for(int i=0;i<list.size();i++){
+				DutyEmployee t=listDtuy.get(i);
+				Long ts=t.getTs();
+				if(ts>fcsj1&&ts<fcsj2){
+					if(zdp.indexOf(t.getuName())==-1){
+						zdp +=t.getuName()+",";
+						
+					}
+				}else if(ts>fcsj2 && ts<fcsj3){
+					if(zwdp.indexOf(t.getuName())==-1){
+						zwdp +=t.getuName()+",";
+					}
+				}else{
+					if(wdp.indexOf(t.getuName())==-1){
+						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);
+		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_qingpu.xls",
-				path+"export\\" + date+"-"+clZbh+"-行车路单.xls");
+		ee.excelReplace(list, new Object[] { scheduleRealInfos.get(0),map }, path+"mould/waybill_qingpu.xls",
+				path+"export/" + date+"-"+clZbh+"-行车路单.xls");
+		
 		return scheduleRealInfos;
 	}
@@ -2304,6 +2335,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		map.put("sjbc", jhbc-cjbc+ljbc);
 		map.put("zgl", format.format(yygl+remMileage+ksgl+jcclc));
 		map.put("ljbc", ljbc);
+	
 		return map;
 	}
@@ -2356,6 +2388,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				map.put("zdzName", s.getZdzName());
 				map.put("scheduleDate", s.getScheduleDateStr());
 				String zdp="",zwdp="",wdp="";
+				String zdpT="",zwdpT="",wdpT="";
 				List<DutyEmployee> list= dutyEmployeeService.getDutyEmployee(xlbm, fcrq+"00:00", fcrq+"23:59");
 				try {
@@ -2367,14 +2400,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 						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()+",";
 							}
 						}
@@ -2386,6 +2429,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				map.put("zdp", zdp);
 				map.put("zwdp", zwdp);
 				map.put("wdp", wdp);
+				map.put("zdpT", zdpT);
+				map.put("zwdpT", zwdpT);
+				map.put("wdpT", wdpT);
 				return map;
 	}
@@ -452,7 +452,7 @@ public class ReportUtils {
 			targetFile.delete();
 		}
 		// 创建目标文件夹
-		targetFile = new File(path.substring(0, path.lastIndexOf("\\")));
+		targetFile = new File(path.substring(0, path.lastIndexOf("/")));
 		if (!targetFile.exists()) {
 			targetFile.mkdirs();
 		}
@@ -258,11 +258,11 @@
       <tr>
           <td colspan="2">调度员</td>
           <td colspan="2">早班(职号)</td>
-          <td >{{map.zdp}}</td>
+          <td title={{map.zdp}}>{{map.zdpT}}</td>
           <td >中班(职号)</td>
-          <td >{{map.zwdp}}</td>
+          <td title={{map.zwdp}}>{{map.zwdpT}}</td>
           <td colspan="2">夜班(职号)</td>
-          <td colspan="2">{{map.wdp}}</td>
+          <td colspan="2" title={{map.wdp}}>{{map.wdpT}}</td>
           <td colspan="2">其他</td>
           <td colspan="2">&nbsp;</td>
       </tr>