update

潘钊
1 parent 13e708cc
Showing 15 changed files with 300 additions and 81 deletions
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/realcontrol/GetSchedulePlanThread.java
src/main/java/com/bsth/service/realcontrol/ScheduleBuffer.java
src/main/java/com/bsth/service/realcontrol/SchedulePersistenceThread.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/vehicle/directive/DirectivePersistenceThread.java
src/main/resources/static/pages/control/line/css/lineControl.css
src/main/resources/static/pages/control/line/js/alone.js
src/main/resources/static/pages/control/line/js/data.js
src/main/resources/static/pages/control/line/js/rightMenu.js
src/main/resources/static/pages/control/line/temps/alone_tp.html
@@ -12,8 +12,8 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 import com.bsth.security.SecurityMetadataSourceService;
-import com.bsth.util.DateUtils;
-import com.bsth.vehicle.GetSchedulePlanThread;
+import com.bsth.service.realcontrol.GetSchedulePlanThread;
+import com.bsth.service.realcontrol.SchedulePersistenceThread;
 import com.bsth.vehicle.common.CommonRefreshThread;
 import com.bsth.vehicle.directive.DirectivePersistenceThread;
 import com.bsth.vehicle.gpsdata.GpsRefreshThread;
@@ -31,7 +31,7 @@ public class StartCommand implements CommandLineRunner{
 	@Autowired
 	SecurityMetadataSourceService invocationSecurityMetadataSourceService;
-	public static ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(4);
+	public static ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(5);
 	@Autowired
 	GpsRefreshThread gpsRefreshThread;
@@ -45,6 +45,9 @@ public class StartCommand implements CommandLineRunner{
 	@Autowired
 	DirectivePersistenceThread directivePersistenceThread;
+	@Autowired
+	SchedulePersistenceThread SchedulePersistenceThread;
+	
 	@Override
 	public void run(String... arg0){
@@ -61,10 +64,13 @@ public class StartCommand implements CommandLineRunner{
 					, 60 * 60 * 24, TimeUnit.SECONDS);*/
 			//两分钟调度指令入库一次
-			//scheduler.scheduleWithFixedDelay(directivePersistenceThread, 20, 60 * 1, TimeUnit.SECONDS);
+			//scheduler.scheduleWithFixedDelay(directivePersistenceThread, 20, 60 * 2, TimeUnit.SECONDS);
 			//两小时刷新一次对照数据
-			scheduler.scheduleWithFixedDelay(commonRefreshThread, 0, 60 * 60 * 2, TimeUnit.SECONDS);
+			//scheduler.scheduleWithFixedDelay(commonRefreshThread, 0, 60 * 60 * 2, TimeUnit.SECONDS);
+			
+			//一分钟持久化一次实际排班
+			scheduler.scheduleWithFixedDelay(SchedulePersistenceThread, 60 * 1, 60 * 1, TimeUnit.SECONDS);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -5,6 +5,7 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -14,7 +15,7 @@ import com.bsth.service.realcontrol.ScheduleRealInfoService;
 @RestController
 @RequestMapping("/realSchedule")
-public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, Integer>{
+public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, Long>{
 	@Autowired
 	ScheduleRealInfoService scheduleRealInfoService;
@@ -33,8 +34,8 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 * @param @param dfsj 待发时间（HH:mm）
 	 * @throws
 	 */
-	public Map<String, Object> outgoAdjust(@RequestParam Integer id, @RequestParam String remarks,@RequestParam String dfsj){
-		
-		return null;
+	@RequestMapping(value = "/outgoAdjust", method = RequestMethod.POST)
+	public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,@RequestParam String dfsj){
+		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj);
 	}
 }
@@ -126,6 +126,12 @@ public class ScheduleRealInfo {
 	 * 待发时间（格式 HH:mm）
 	 */
 	private String dfsj;
+	
+	/**
+	 * 发车时间戳
+	 */
+	@Transient
+	private Long fcsjT;
 	public Long getId() {
 		return id;
@@ -430,5 +436,12 @@ public class ScheduleRealInfo {
 	public void setDfsj(String dfsj) {
 		this.dfsj = dfsj;
 	}
-	
+
+	public Long getFcsjT() {
+		return fcsjT;
+	}
+
+	public void setFcsjT(Long fcsjT) {
+		this.fcsjT = fcsjT;
+	}
 }
@@ -9,7 +9,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.BaseRepository;
 @Repository
-public interface ScheduleRealInfoRepository extends BaseRepository<ScheduleRealInfo, Integer>{
+public interface ScheduleRealInfoRepository extends BaseRepository<ScheduleRealInfo, Long>{
 	@Query("select s from ScheduleRealInfo s where s.xlBm in ?1")
 	List<ScheduleRealInfo> findByLines(List<String> lines);
@@ -58,8 +58,7 @@ public class GetSchedulePlanThread  extends Thread{
 				item.setFcsjT(sdf2.parse(dateStr + " " + item.getFcsj()).getTime());
 			}
-			//scheduleRealInfoRepository.save(realList);
-			new BatchSaveUtils<ScheduleRealInfo>().saveListMysql(realList, ScheduleRealInfo.class);
+			//new BatchSaveUtils<ScheduleRealInfo>().saveList(realList, ScheduleRealInfo.class);
 			//写入缓存
 			ScheduleBuffer.init(realList);
 			logger.info("结束................." + sdf3.format(new Date(System.currentTimeMillis())));
+package com.bsth.service.realcontrol;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.google.common.collect.ArrayListMultimap;
+
+/**
+ * 
+ * @ClassName: ScheduleRealInfoBuffer 
+ * @Description: TODO(当天实际排班缓存) 
+ * @author PanZhao
+ * @date 2016年6月14日 上午9:40:38 
+ *
+ */
+public class ScheduleBuffer {
+	
+	static Logger logger = LoggerFactory.getLogger(ScheduleBuffer.class);
+	
+	/**
+	 * 当天实际排班 
+	 * K 线路编码 V 按时间升序的班次
+	 */
+	public static ArrayListMultimap<String, ScheduleRealInfo> schedulListMap;
+	
+	/**
+	 * 主键 和 排班映射
+	 */
+	public static Map<Long, ScheduleRealInfo> pkSchedulMap;
+	
+	/**
+	 * 需要持久化的排班
+	 */
+	public static LinkedList<ScheduleRealInfo> persistentList;
+	
+	static{
+		schedulListMap = ArrayListMultimap.create();
+		pkSchedulMap = new HashMap<>();
+		persistentList = new LinkedList<>();
+	}
+	
+	public static int init(List<ScheduleRealInfo> list){
+		
+		try{
+			//发车时间排序
+			Collections.sort(list, new Comparator<ScheduleRealInfo>() {
+				
+				@Override
+				public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
+					return (int) (o1.getFcsjT() - o2.getFcsjT());
+				}
+			});
+			
+			for(ScheduleRealInfo schedul : list){
+				schedulListMap.put(schedul.getXlBm(), schedul);
+				pkSchedulMap.put(schedul.getId(), schedul);
+			}
+		}catch(Exception e){
+			logger.error("缓存排班数据失败...", e);
+			return -1;
+		}
+		return 0;
+	}
+}
+package com.bsth.service.realcontrol;
+
+import java.util.LinkedList;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+
+/**
+ * 
+ * @ClassName: SchedulePersistenceThread
+ * @Description: TODO(排班缓存 修改 持久化)
+ * @author PanZhao
+ * @date 2016年6月14日 下午1:11:49
+ *
+ */
+@Component
+public class SchedulePersistenceThread extends Thread {
+
+	@Autowired
+	ScheduleRealInfoRepository scheduleRepository;
+	
+	@Override
+	public void run() {
+		LinkedList<ScheduleRealInfo> list = ScheduleBuffer.persistentList;
+
+		ScheduleRealInfo schedule;
+		for (int i = 0; i < 1000; i++) {
+			schedule = list.poll();
+
+			if (null == schedule)
+				break;
+
+			scheduleRepository.save(schedule);
+		}
+	}
+}
@@ -9,8 +9,10 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.BaseService;
 @Service
-public interface ScheduleRealInfoService extends BaseService<ScheduleRealInfo, Integer>{
+public interface ScheduleRealInfoService extends BaseService<ScheduleRealInfo, Long>{
 	Map<String, Collection<ScheduleRealInfo>> findByLines(String lines);
+	Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj);
+
 }
 package com.bsth.service.realcontrol.impl;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.bsth.common.ResponseCode;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.realcontrol.ScheduleBuffer;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ArrayListMultimap;
@@ -17,11 +22,13 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 @Service
-public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInfo, Integer> implements ScheduleRealInfoService{
+public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInfo, Long> implements ScheduleRealInfoService{
 	@Autowired
 	ScheduleRealInfoRepository scheduleRealInfoRepository;
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+	
 	@Override
 	public Map<String, Collection<ScheduleRealInfo>> findByLines(String lines) {
 		List<String> lineList = Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(lines));
@@ -36,4 +43,29 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		return mMap.asMap();
 	}
+
+	@Override
+	public Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj) {
+		Map<String, Object> map = new HashMap<>();
+		try{
+			
+			ScheduleRealInfo schedule = ScheduleBuffer.pkSchedulMap.get(id);
+			schedule.setDfsj(dfsj);
+			String newRem = schedule.getRemarks();
+			if(null == newRem)
+				newRem = "";
+			newRem += "[待发调整] " + remarks +";";
+			schedule.setRemarks(newRem);
+			//持久化到数据库
+			ScheduleBuffer.persistentList.add(schedule);
+			
+			map.put("status", ResponseCode.SUCCESS);
+			map.put("dfsj", dfsj);
+			map.put("remarks", newRem);
+		}catch(Exception e){
+			logger.error("", e);
+			map.put("status", ResponseCode.ERROR);
+		}
+		return map;
+	}
 }
 package com.bsth.vehicle.directive;
-import java.util.ArrayList;
 import java.util.LinkedList;
-import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,8 +31,6 @@ public class DirectivePersistenceThread extends Thread{
 	public void run() {
 		LinkedList<Directive> list = DirectiveBuffer.transientList;
-		List<Directive> persList = new ArrayList<>();
-		
 		Directive directive;
 		for(int i = 0; i < 1000; i ++){
 			directive = list.poll();
@@ -42,15 +38,7 @@ public class DirectivePersistenceThread extends Thread{
 			if(null == directive)
 				break;
-			persList.add(directive);
-		}
-		
-		if(persList.size() > 0){
-			try{
-				directiveRepository.save(persList);
-			}catch(Exception e){
-				logger.error("", e);
-			}
+			directiveRepository.save(directive);
 		}
 	}
 }
@@ -864,7 +864,7 @@ height: 400px;
 	width: 9%;
 }
 .pb-table tr td:nth-child(5){
-	width: 15%;
+	/* width: 15%; */
 }
 .pb-table tr td:nth-child(6){
 	width: 10%;
@@ -873,7 +873,10 @@ height: 400px;
 	width: 10%;
 }
 .pb-table tr td:nth-child(8){
-	width: 15%;
+	/* width: 15%; */
+}
+.pb-table tr td:nth-child(9){
+	width: 55px;
 }
 .pb-table tr td:nth-child(10){
 	width: 47px;
@@ -1298,6 +1301,9 @@ height: 400px;
     border: 1px solid #d3cfc8;
     padding: 8px 0 4px 5px;
     color: black;
+    
+    height: 240px;
+    overflow: auto;
 }
@@ -1458,4 +1464,12 @@ height: 400px;
 	.hide-lt-1080{
 		display: none;
 	}
+}
+
+.tab_line .panel-wrap ._panel ._body .pb-table a.remarks-popover{
+	color: gray;text-decoration: none;
+}
+
+.form-custom hr{
+	margin: 15px 0;
 }
 \ No newline at end of file
@@ -39,12 +39,36 @@ var _alone = (function(){
 					trigger: 'hover',
 					container: '.portlet-fullscreen'
 				});
+				
+				//备注POPOVER
+				$('.remarks-popover').popover({trigger: 'hover',container: '.portlet-fullscreen',placement:'bottom'});
 			});
 			//$('.tab-pane.aloneline')
 			/*_data.queryStationRoute('10904' , 'lineSvg10904' , drawSvg.init);
 			*/
+		},
+		//刷新班次
+		refreshSchedule: function(schedule){
+			//xlBm
+			var tr = $('tr[data-id='+schedule.id+']', '#tab_line_' + schedule.xlBm)[0]
+				,cells = tr.cells, name;
+			$.each(cells, function(i, cell){
+				name = $(cell).data('name');
+				if(name == 'remarks'){
+					var link = $(cell).find('a');
+					if(link.length == 0){
+						$(cell).append('<a class="remarks-popover" href="javascript:;" data-toggle="popover" data-content="'+schedule[name]+'" >备注</a>')
+					}
+					else{
+						link.attr('data-content', schedule[name]);
+					}
+				}
+				else{
+					$(cell).text(schedule[name]);
+				}
+			});
 		}
 	}
@@ -14,7 +14,8 @@ var _data = (function(){
 	var dateStr = moment().format('YYYY-MM-DD');
 	//实际排班
-	var schedules = {};
+	var schedules = {}
+		,scheduleList = [];
 	var dataObject = {
 		getLines: function(){
@@ -68,10 +69,10 @@ var _data = (function(){
 		},
 		//查询实际排班计划
 		queryRealSchedule: function(lineArrayStr, cb){
-			$.get('/realSchedule/lines', {lines: lineArrayStr} ,function(scheduls){
+			$.get('/realSchedule/lines', {lines: lineArrayStr} ,function(rs){
 				var list, sm, em;
-				for(var lineCode in scheduls){
-					list = scheduls[lineCode];
+				for(var lineCode in rs){
+					list = rs[lineCode];
 					$.each(list, function(){
 						//发车时间 + 历时 = 终点时间
 						if(this.bcsj){
@@ -82,9 +83,11 @@ var _data = (function(){
 							this.zdsj = em.format('HH:mm');
 							//终点时间戳
 							this.zdsjT = em.valueOf();
-							//缓存实际排班计划
-							schedules[this.id] = this;
 						}
+						
+						//缓存实际排班计划
+						schedules[this.id] = this;
+						scheduleList.push(this);
 					});
 					//按发车时间排序
@@ -92,13 +95,21 @@ var _data = (function(){
 						return a.fcsjT - b.fcsjT;
 					});
 				}
-				
-				cb && cb(scheduls);
+				cb && cb(rs);
 			});
 		},
 		//根据排班ID获取排班
 		getSchedulById: function(id){
 			return schedules[id];
+		},
+		//根据车辆内部编码获取排班数组
+		getSchedulByVeh: function(nbbm){
+			var array = [];
+			$.each(scheduleList, function(){
+				if(this.clZbh == nbbm)
+					array.push(this);
+			});
+			return array;
 		}
 	};
@@ -15,7 +15,6 @@ var _menu = (function() {
 			layer.alert('无法找到当前项对应的班次信息，请尝试刷新页面！', {icon: 2, title: '异常'});
 			return;
 		}
-		console.log(schedul);
 		menuObject[method](schedul);
 	});
@@ -44,7 +43,7 @@ var _menu = (function() {
 		},
 		//待发调整
 		outgoAdjust: function(schedul){
-			layer.open({
+			var index = layer.open({
 			  type: 1,
 			  area: ['630px', '545px'],
 			  maxmin: true,
@@ -55,25 +54,50 @@ var _menu = (function() {
 			  success: function(){
 				  $('#outgoAdjustForm button.confirm').one('click', function(){
 					  var params = $('#outgoAdjustForm').serializeJSON();
-					  console.log(params);
+					  $post('/realSchedule/outgoAdjust', params, function(rs){
+						  layer.close(index);
+						  layer.msg('调整成功！');
+						  schedul.dfsj = rs.dfsj;
+						  schedul.remarks = rs.remarks;
+						  _alone.refreshSchedule(schedul);
+					  });
 				  });
 			  }
 			});
 		},
 		//计划烂班
-		planDestroy: function(){
+		planDestroy: function(schedul){
+			var data = {item: schedul, array : _data.getSchedulByVeh(schedul.clZbh)}
 			layer.open({
 			  type: 1,
-			  area: ['370px', '585px'],
+			  area: ['370px', '605px'],
 			  maxmin: true,
 			  skin:'layui-layer-molv',
-			  content: template('plan_destroy_body_temp', {}),
+			  content: template('plan_destroy_body_temp', data),
 			  shift: 5,
 			  title: '计划烂班设置',
 			  success: function(){
-				  $('#planDestroyForm .icheck').iCheck({
-						 checkboxClass: 'icheckbox_square-red',
-						 increaseArea: '20%'
+				  var f = $('#planDestroyForm');
+				  $('.icheck', f).iCheck({
+					 checkboxClass: 'icheckbox_square-red',
+					 increaseArea: '20%'
+				  });
+				  //滚动到选中项
+				  var cont = $('.custom-check-box', f)
+					,checked = $('.icheck:checked', f);
+				  if(checked.length > 0){
+					  cont.animate({
+						scrollTop: checked.offset().top - cont.offset().top + checked.scrollTop()
+					  }, 500);
+				  }
+				  //确定
+				  $('button.confirm', f).one('click', function(){
+					  var params = f.serializeJSON()
+					  	,text = '确定烂掉部分班次？，';
+					  $.each(params.ids, function(i, id){
+						  var s = _data.getSchedulById(id);
+						  text += (s.)
+					  });
 				  });
 			  }
 			});
@@ -30,14 +30,18 @@
 						{{each up as item i}}
 						<tr data-id={{item.id}}>
 							<td name="lineNo">{{i + 1}}</td>
-							<td><a href="javascript:;">{{item.lpName}}</a></td>
-							<td>{{item.clZbh}}</td>
-							<td>{{item.zdsj}}</td>
+							<td data-name="lpName"><a href="javascript:;">{{item.lpName}}</a></td>
+							<td data-name="clZbh">{{item.clZbh}}</td>
+							<td data-name="zdsj">{{item.zdsj}}</td>
 							<td></td>
-							<td>{{item.fcsj}}</td>
-							<td>{{item.dfsj}}</td>
+							<td data-name="fcsj">{{item.fcsj}}</td>
+							<td data-name="dfsj">{{item.dfsj}}</td>
 							<td></td>
-							<td class="hide-lt-1080"></td>
+							<td class="hide-lt-1080" data-name="remarks">
+								{{if item.remarks != null}}
+									<a class="remarks-popover" href="javascript:;" data-toggle="popover" data-content="{{item.remarks}}" >备注</a>
+								{{/if}}
+							</td>
 							<td><a href="javascript:;">主</a></td>
 						</tr>
 						{{/each}}
@@ -71,16 +75,20 @@
 				<table class="table table-striped table-bordered table-advance pb-table data">
 					<tbody>
 						{{each down as item i}}
-						<tr>
+						<tr data-id={{item.id}}>
 							<td name="lineNo">{{i + 1}}</td>
-							<td><a href="javascript:;">{{item.lpName}}</a></td>
-							<td>{{item.clZbh}}</td>
-							<td>{{item.zdsj}}</td>
+							<td data-name="lpName"><a href="javascript:;">{{item.lpName}}</a></td>
+							<td data-name="clZbh">{{item.clZbh}}</td>
+							<td data-name="zdsj">{{item.zdsj}}</td>
 							<td></td>
-							<td>{{item.fcsj}}</td>
-							<td>{{item.dfsj}}</td>
+							<td data-name="fcsj">{{item.fcsj}}</td>
+							<td data-name="dfsj">{{item.dfsj}}</td>
 							<td></td>
-							<td class="hide-lt-1080"></td>
+							<td class="hide-lt-1080" data-name="remarks">
+								{{if item.remarks != null}}
+									<a class="remarks-popover" href="javascript:;" data-toggle="popover" data-content="{{item.remarks}}" >备注</a>
+								{{/if}}
+							</td>
 							<td><a href="javascript:;">主</a></td>
 						</tr>
 						{{/each}}
@@ -214,6 +222,7 @@
 <!-- 待发调整 -->
 <script id="outgo_adjust_body_temp" type="text/html">
 <form action="#" class="form-horizontal form-custom" id="outgoAdjustForm">
+   <input value={{id}}  type="hidden" name="id">
    <div class="form-body">
    	 <div class="form-custom-row">
    	 	<div class="item">
@@ -292,7 +301,7 @@
      <div class="form-custom-row">
    	 	<div class="item full">
 			<span class="item-label" style="width: 80px;">内部编码: </span>
-			<input disabled class="form-control" value="W2B-095">
+			<input disabled class="form-control" value="{{item.clZbh}}">
    	 	</div>
    	 </div>
@@ -301,27 +310,12 @@
 			<span class="item-label" style="width: 80px;vertical-align: top;">执行班次: </span>
 			<div class="custom-check-box" >
 				<div class="checkbox-list">
+{{each array as obj i}}
     				<label>
-						<div class="checker"><span><input type="checkbox" class="icheck"></span></div> 11:56
-					</label>
-    				<label>
-						<div class="checker"><span><input type="checkbox" class="icheck"></span></div> 16:31
-					</label>
-    				<label>
-						<div class="checker"><span><input type="checkbox" class="icheck"></span></div> 16:46 
-					</label>
-    				<label>
-						<div class="checker"><span><input type="checkbox" class="icheck"></span></div> 17:34
-					</label>
-    				<label>
-						<div class="checker"><span><input type="checkbox" class="icheck"></span></div> 18:48
-					</label>
-    				<label>
-						<div class="checker"><span><input type="checkbox" class="icheck"></span></div> 19:40
-					</label>
-    				<label>
-						<div class="checker"><span><input type="checkbox" class="icheck"></span></div> 20:33
+						<div class="checker">
+						<span><input type="checkbox" value={{obj.id}} name="ids[]" class="icheck" {{if obj.fcsj==item.fcsj}}checked{{/if}}></span></div> {{obj.fcsj}}
 					</label>
+{{/each}}
 					</div>
 				</div>
    	 		</div>
@@ -352,7 +346,7 @@
 	  <div class="form-custom-row">
    	 	<div class="item full" >
-	   	 	<textarea class="form-control" rows="4" placeholder="不超过50个字符"></textarea>
+	   	 	<textarea class="form-control" rows="4" name="remarks" placeholder="烂班说明！不超过50个字符，必填"></textarea>
    	 	</div>
    	  </div>