调度日报加当班调派

娄高锋
1 parent 7c9978b2
Showing 3 changed files with 48 additions and 2 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/mould/scheduleDaily.xls
src/main/resources/static/pages/forms/statement/scheduleDaily.html
@@ -2348,6 +2348,28 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("djg_time", m.get("djgsj"));
         map.put("jls", Arith.sub(Arith.add(jhlc, ljgl), lbgl));
         lMap.add(map);
+        
+        if(date.length() == 10){
+	        List<DutyEmployee> list = dutyEmployeeService.getDutyEmployee(line, date + "00:01", date + "23:59");
+	        String dbdp = "";
+	        try {
+	            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();
+	                    }
+	                }
+	            }
+	        } catch (Exception e) {
+				// TODO: handle exception
+	        	e.printStackTrace();
+			}
+	        map.put("dbdp", dbdp);
+        }
+        
         return lMap;
     }
  
@@ -4195,9 +4217,31 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         	dataList3.add(tempMap);
         }
  
+        if(date.length() == 10){
+	        List<DutyEmployee> list = dutyEmployeeService.getDutyEmployee(line, date + "00:01", date + "23:59");
+	        String dbdp = "";
+	        try {
+	            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();
+	                    }
+	                }
+	            }
+	        } catch (Exception e) {
+				// TODO: handle exception
+	        	e.printStackTrace();
+			}
+	        nMap.put("dbdp", dbdp);
+        }
  
         if (type.equals("export")) {
-        	String lineName = map.get("lineName").toString();
+        	String lineName = "";
+        	if(map.containsKey("lineName"))
+        		lineName = "-" + map.get("lineName").toString() + "-";
             SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
                     sdfSimple = new SimpleDateFormat("yyyyMMdd");
             Map<String, Object> m = new HashMap<String, Object>();
@@ -4215,7 +4259,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     sourcePath = path + "mould/scheduleDaily_m.xls";
                 }
                 ee.excelReplace(listI, new Object[]{nMap}, sourcePath,
-                        path + "export/调度日报-"+ lineName + "-" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+                        path + "export/调度日报"+ lineName + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
             } catch (Exception e) {
                 // TODO: handle exception
                 e.printStackTrace();
@@ -62,6 +62,7 @@
 				<div class="table-container" style="margin-top: 10px;min-width: 906px">
 					<label>日期：<span id="rqxs"></span>&nbsp;&nbsp;&nbsp;&nbsp;早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
 					<br/><label>计划+临加-少驶=<span id="jls"></span>&nbsp;&nbsp;计算机实驶:<span id="jsjss"></span></label>
+					&nbsp;&nbsp;当班调派:<span id="dbdp"></span></label>
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
@@ -434,6 +435,7 @@
 				var scheduleDaily_1 = template('scheduleDaily_1',{list:result});
 				$("#jls").html(result[0].jls);
 				$("#jsjss").html(result[0].sjgl);
+				$("#dbdp").html(result[0].dbdp);
 				$('#forms .scheduleDaily_1').html(scheduleDaily_1);
 			});
 			$.get('/realSchedule/queryUserInfo',{line:line,date:date,state:2,type:"query"},function(result){