字典update

潘钊
1 parent 9932f6db
Showing 8 changed files with 139 additions and 40 deletions
src/main/java/com/bsth/entity/realcontrol/ChildTaskPlan.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/entity/sys/Dictionary.java
src/main/resources/static/pages/control/line/child_pages/child_task.html
src/main/resources/static/pages/control/line/js/alone.js
src/main/resources/static/pages/control/line/js/rightMenu.js
src/main/resources/static/pages/control/line/temps/alone_tp.html
src/main/resources/static/pages/permission/dictionary/add.html
 package com.bsth.entity.realcontrol;
+import javax.persistence.ManyToOne;
+
 /**
  * 
- * @ClassName: ChildTaskPlan 
- * @Description: TODO(子任务计划) 
+ * @ClassName: ChildTaskPlan
+ * @Description: TODO(子任务计划)
  * @author PanZhao
- * @date 2016年6月20日 上午11:22:22 
+ * @date 2016年6月20日 上午11:22:22
  *
  */
 public class ChildTaskPlan {
-	
+
 	private Long id;
-	
+
 	/**
-	 * 开始时间
-	 * HH:mm
+	 * 开始时间 HH:mm
 	 */
 	private String startTimeStr;
-	
+
 	/**
-	 * 结束时间
-	 * HH:mm
+	 * 结束时间 HH:mm
 	 */
 	private String endTimeStr;
+
+	/**
+	 * 任务类型
+	 */
+	private String type;
+
+	/**
+	 * 起点站名
+	 */
+	private String startStation;
+
+	/**
+	 * 终点站名
+	 */
+	private String endStation;
+
+	/**
+	 * 里程类型
+	 */
+	private String mileageType;
+
+	/**
+	 * 里程
+	 */
+	private Float mileage;
+
+	/**
+	 * 备注
+	 */
+	private String remarks;
+	/**
+	 * 主任务
+	 */
+	@ManyToOne
+	private ScheduleRealInfo schedul;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getStartTimeStr() {
+		return startTimeStr;
+	}
+
+	public void setStartTimeStr(String startTimeStr) {
+		this.startTimeStr = startTimeStr;
+	}
+
+	public String getEndTimeStr() {
+		return endTimeStr;
+	}
+
+	public void setEndTimeStr(String endTimeStr) {
+		this.endTimeStr = endTimeStr;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getStartStation() {
+		return startStation;
+	}
+
+	public void setStartStation(String startStation) {
+		this.startStation = startStation;
+	}
+
+	public String getEndStation() {
+		return endStation;
+	}
+
+	public void setEndStation(String endStation) {
+		this.endStation = endStation;
+	}
+
+	public String getMileageType() {
+		return mileageType;
+	}
+
+	public void setMileageType(String mileageType) {
+		this.mileageType = mileageType;
+	}
+
+	public Float getMileage() {
+		return mileage;
+	}
+
+	public void setMileage(Float mileage) {
+		this.mileage = mileage;
+	}
+
+	public String getRemarks() {
+		return remarks;
+	}
+
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	public ScheduleRealInfo getSchedul() {
+		return schedul;
+	}
+
+	public void setSchedul(ScheduleRealInfo schedul) {
+		this.schedul = schedul;
+	}
 }
@@ -51,7 +51,7 @@ public class ScheduleRealInfo {
 	/** 售票员名字 */
 	private String sName;
-	/** 线路方向（TODO：上下行，上行，下行，这个以后用枚举还是字典再议，现在先用文字） */
+	/** 线路方向 */
 	private String xlDir;
 	/** 起点站id，根据班次类型，会关联 bsth_c_station，或 bsth_c_car_park，不做mapping */
 	private Integer qdz;
@@ -75,7 +75,6 @@ public class ScheduleRealInfo {
 	/**
 	 * 班次类型 TODO：正常班次、出场、进场、加油、临加班次、区间班次、放空班次、放大站班次、两点间空驶
-	 * TODO：这个以后用枚举还是字典再议，现在先用文字
 	 */
 	private String bcType;
@@ -8,11 +8,9 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
 @Entity
-@Table(name = "bsth_c_sys_dictionary", 
-uniqueConstraints = { @UniqueConstraint(columnNames = {"dCode"}) })
+@Table(name = "bsth_c_sys_dictionary")
 public class Dictionary {
 	@Id
@@ -184,11 +184,11 @@
 				</div>
 				<div class="col-md-4">
 					<span class="custom-label">开始时间： </span>
-					<input class="form-control" data-cell="1" type="time">
+					<input class="form-control" data-cell="1" type="time" disabled>
 				</div>
 				<div class="col-md-4">
 					<span class="custom-label">结束时间：</span>
-					<input class="form-control"  data-cell="2" type="time">
+					<input class="form-control"  data-cell="2" type="time" disabled>
 				</div>
 			</div>
@@ -371,7 +371,7 @@ $(function(){
 					scrollTop: $tr.offset().top - cont.offset().top + $tr.scrollTop() - 36 * 4
 			  	}, 500);
-			}, 300);
+			}, 100);
 		});
 	});
 	lpSelect.on('change', refreshMainList);
@@ -3,9 +3,8 @@
  */
 var _alone = (function(){
-	//暂时用文字判断上下行
-	var upCode = '上行'
-		,downCode = '下行';
+	var upCode = 0
+		,downCode = 1;
 	var aloneObject = {
 		init: function(cb){
@@ -52,6 +52,7 @@ var _menu = (function() {
 			  shift: 5,
 			  title: '待发调整',
 			  success: function(){
+				  dictionaryUtils.transformDom($('#outgoAdjustForm .nt-dictionary'));
 				  $('#outgoAdjustForm button.confirm').one('click', function(){
 					  var params = $('#outgoAdjustForm').serializeJSON();
 					  $post('/realSchedule/outgoAdjust', params, function(rs){
@@ -225,23 +225,17 @@
    	 <div class="form-custom-row">
    	 	<div class="item">
    	 		<span class="item-label" style="width: 80px;">班次类型：</span>
-	   	 	<select class="form-control" disabled>
-	          	<option value="{{bcType}}" name="bcType">{{bcType}}</option>
-	        </select>
+	   	 	<input class="form-control nt-dictionary" disabled data-code={{bcType}} data-group=ScheduleType>
    	 	</div>
    	 </div>
    	 <div class="form-custom-row">
    	 	<div class="item">
    	 		<span class="item-label" style="width: 80px;">从: </span>
-	   	 	<select class="form-control" disabled>
-	          	<option value="{{qdzName}}" name="qdzName">{{qdzName}}</option>
-	        </select>
+	        <input class="form-control" value="{{qdzName}}" name="qdzName" disabled>
    	 	</div>
    	 	<div class="item">
    	 		<span class="item-label" style="width: 60px;text-align: center">到: </span>
-	   	 	<select class="form-control" disabled>
-	          	<option value="{{zdzName}}"  name="zdzName">{{zdzName}}</option>
-	        </select>
+			<input class="form-control" value="{{zdzName}}" name="qdzName" disabled>
    	 	</div>
    	 </div>
@@ -126,23 +126,16 @@ $(function(){
 		submitHandler : function(f) {
 			var params = form.serializeJSON();
 			error.hide();
-			
 			//查询代码的顺延号
-			$get('/dictionary/all', {dCode_prefixLike: params.dCode},function(dicts){
+			$get('/dictionary/all', {dCode_eq: params.dCode, dGroup_eq: params.dGroup},function(dicts){
 				var suff = '', len = dicts.length;
 				if(len > 0){
-					var oldCode = params.dCode;
-					params.dCode += '' + len;
-					params.dName += '' + len;
-
-					layer.confirm('代码【'+oldCode+'%】已存在！自动顺延为如下：<br>代码：'+params.dCode+'<br>名称：'+params.dName+'', {
-							btn : [ '确认提示并提交', '取消' ]
-					}, submit);
+					alert('代码['+ params.dCode +']已存在');
 				}
 				else{
 					submit();
 				}
-				});
+			});
 				function submit(){