Merge branch 'qingpu' of http://222.66.0.204:8800/panzhaov5/bsth_control

into qingpu # Conflicts: # src/main/java/com/bsth/service/schedule/rules/ttinfo/TTInfo_input.java

Merge branch 'qingpu' of http://222.66.0.204:8800/panzhaov5/bsth_control
into qingpu # Conflicts: # src/main/java/com/bsth/service/schedule/rules/ttinfo/TTInfo_input.java
潘钊
2 parents 2f136edb d283920b
Showing 6 changed files with 487 additions and 169 deletions
src/main/java/com/bsth/controller/schedule/TTInfoDetailController.java
src/main/java/com/bsth/entity/schedule/EmployeeConfigInfo.java
src/main/java/com/bsth/service/schedule/rules/ttinfo/TTInfo_input.java
src/main/resources/datatools/ktrs/ttinfodetailDataInput.ktr
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/timeTableManage.js
@@ -3,10 +3,13 @@ package com.bsth.controller.schedule;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
 import com.bsth.entity.CarPark;
+import com.bsth.entity.LineInformation;
 import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.repository.schedule.TTInfoDetailRepository;
 import com.bsth.service.CarParkService;
+import com.bsth.service.LineInformationService;
 import com.bsth.service.schedule.TTInfoDetailServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -26,27 +29,52 @@ public class TTInfoDetailController extends BaseController&lt;TTInfoDetail, Long&gt; {
     @Autowired
     private CarParkService carParkService;
     @Autowired
+    private LineInformationService lineInformationService;
+    @Autowired
     private TTInfoDetailRepository ttInfoDetailRepository;
     @RequestMapping(value = "/dataImportExtend", method = RequestMethod.POST)
     public Map<String, Object> uploadDataAndImport(
-            MultipartFile file, String xlmc, String ttinfoname, String tcccode) throws Exception {
+            MultipartFile file, String xlmc, String ttinfoname) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         try {
-            // 查看停车场是否存在，不存在报错
+            // 查找lineinformation对象，没有报错
             Map<String, Object> param = new HashMap<>();
-            param.put("parkCode_eq", tcccode);
-            Iterator<CarPark> carParkIterator = carParkService.list(param).iterator();
-            if (!carParkIterator.hasNext()) {
-                // 没有停车场，报错
+            param.put("line.name_eq", xlmc);
+            Iterator<LineInformation> lineInformationIterator = lineInformationService.list(param).iterator();
+            if (!lineInformationIterator.hasNext()) {
+                // 没有lineinformation，报错
                 resultMap.put("status", ResponseCode.ERROR);
-                resultMap.put("msg", "没有停车场数据，停车场代码=" + tcccode);
+                resultMap.put("msg", "没有lineinfomation，线路名称=" + xlmc);
             } else {
-                CarPark carPark = carParkIterator.next();
-                ttInfoDetailService.fileDataImport(file, xlmc, ttinfoname, carPark.getParkName());
-                resultMap.put("status", ResponseCode.SUCCESS);
-                resultMap.put("msg", "导入成功");
+                String tcccode = lineInformationIterator.next().getCarPark();
+                if (StringUtils.isEmpty(tcccode)) {
+                    // 没有停车场code，报错
+                    resultMap.put("status", ResponseCode.ERROR);
+                    resultMap.put("msg", "线路lineinfomation没有停车场code信息，线路名称=" + xlmc);
+                } else {
+                    // 使用停车场code查找停车场
+                    param.clear();;
+                    param.put("parkCode_eq", tcccode);
+                    Iterator<CarPark> carParkIterator = carParkService.list(param).iterator();
+                    if (!carParkIterator.hasNext()) {
+                        // 指定的停车场code没有找到停车场信息，报错
+                        resultMap.put("status", ResponseCode.ERROR);
+                        resultMap.put("msg", "没有找到停车场信息，停车场code=" + tcccode);
+                    } else {
+                        String tccname = carParkIterator.next().getParkName();
+                        if (StringUtils.isEmpty(tccname)) {
+                            // 没有停车场名字，报错
+                            resultMap.put("status", ResponseCode.ERROR);
+                            resultMap.put("msg", "停车场信息没有停车场名字，停车场code=" + tcccode);
+                        } else {
+                            ttInfoDetailService.fileDataImport(file, xlmc, ttinfoname, tccname);
+                            resultMap.put("status", ResponseCode.SUCCESS);
+                            resultMap.put("msg", "导入成功");
+                        }
+                    }
+                }
             }
         } catch (Exception exp) {
             exp.printStackTrace();
@@ -4,6 +4,7 @@ import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
 import com.bsth.entity.sys.SysUser;
+import org.hibernate.annotations.Formula;
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
@@ -45,6 +46,10 @@ public class EmployeeConfigInfo {
     @NotNull
     private String dbbm;
+    @Formula(" dbbm + 0 ")
+    private Integer dbbmFormula;
+
+
     /** 创建人 */
     @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
     private SysUser createBy;
@@ -91,6 +96,30 @@ public class EmployeeConfigInfo {
         this.jsy = jsy;
     }
+    public Integer getDbbmFormula() {
+        return dbbmFormula;
+    }
+
+    public void setDbbmFormula(Integer dbbmFormula) {
+        this.dbbmFormula = dbbmFormula;
+    }
+
+    public SysUser getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(SysUser createBy) {
+        this.createBy = createBy;
+    }
+
+    public SysUser getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(SysUser updateBy) {
+        this.updateBy = updateBy;
+    }
+
     public Personnel getSpy() {
         return spy;
     }
-package com.bsth.service.schedule.rules.ttinfo;
-
-import com.bsth.entity.schedule.TTInfo;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 时刻表_输入
- */
-public class TTInfo_input implements Comparable<TTInfo_input> {
-    /** 时刻表id */
-    private String ttInfoId;
-    /** 线路Id */
-    private String xlId;
-    /** 周一到周日是否启用 */
-    private List<Boolean> weekdays = new ArrayList<>();
-    /** 特殊节假日 */
-    private List<DateTime> specialDays = new ArrayList<>();
-    /** 最新修改时间 */
-    private DateTime updateDate;
-    /** 是否启用 */
-    private Boolean isEnable;
-    /** 启用日期 */
-    private DateTime qyDate;
-
-    public TTInfo_input() {
-
-    }
-
-    @Override
-    public int compareTo(TTInfo_input ttInfo_input) {
-        if (ttInfo_input != null) {
-            if (ttInfo_input.updateDate != null && this.updateDate != null)
-                return - this.updateDate.compareTo(ttInfo_input.updateDate);
-        }
-        return -1;
-    }
-
-    public TTInfo_input(TTInfo ttInfo) {
-        this.ttInfoId = String.valueOf(ttInfo.getId());
-        this.xlId = String.valueOf(ttInfo.getXl().getId());
-        String[] days = ttInfo.getRule_days().split(",");
-        System.out.println(days.length);
-        for (int i = 0; i < 7; i++) {
-            if ("1".equals(days[i])) {
-                weekdays.add(true);
-            } else {
-                weekdays.add(false);
-            }
-        }
-        String[] sdays = ttInfo.getSpecial_days().split(",");
-        for (int i = 0; i < sdays.length; i++) {
-            specialDays.add(DateTimeFormat.forPattern("yyyy-MM-dd").
-                    parseDateTime(sdays[i]));
-        }
-        this.updateDate = new DateTime(ttInfo.getUpdateDate());
-        this.isEnable = ttInfo.getIsEnableDisTemplate();
-        this.qyDate = new DateTime(ttInfo.getQyrq());
-
-    }
-
-    public String getTtInfoId() {
-        return ttInfoId;
-    }
-
-    public void setTtInfoId(String ttInfoId) {
-        this.ttInfoId = ttInfoId;
-    }
-
-    public String getXlId() {
-        return xlId;
-    }
-
-    public void setXlId(String xlId) {
-        this.xlId = xlId;
-    }
-
-    public List<Boolean> getWeekdays() {
-        return weekdays;
-    }
-
-    public void setWeekdays(List<Boolean> weekdays) {
-        this.weekdays = weekdays;
-    }
-
-    public List<DateTime> getSpecialDays() {
-        return specialDays;
-    }
-
-    public void setSpecialDays(List<DateTime> specialDays) {
-        this.specialDays = specialDays;
-    }
-
-    public DateTime getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(DateTime updateDate) {
-        this.updateDate = updateDate;
-    }
-
-    public Boolean getIsEnable() {
-        return isEnable;
-    }
-
-    public void setIsEnable(Boolean isEnable) {
-        this.isEnable = isEnable;
-    }
-
-    public DateTime getQyDate() {
-        return qyDate;
-    }
-
-    public void setQyDate(DateTime qyDate) {
-        this.qyDate = qyDate;
-    }
-}
+package com.bsth.service.schedule.rules.ttinfo;
+
+import com.bsth.entity.schedule.TTInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 时刻表_输入
+ */
+public class TTInfo_input implements Comparable<TTInfo_input> {
+    /** 时刻表id */
+    private String ttInfoId;
+    /** 线路Id */
+    private String xlId;
+    /** 周一到周日是否启用 */
+    private List<Boolean> weekdays = new ArrayList<>();
+    /** 特殊节假日 */
+    private List<DateTime> specialDays = new ArrayList<>();
+    /** 最新修改时间 */
+    private DateTime updateDate;
+    /** 是否启用 */
+    private Boolean isEnable;
+    /** 启用日期 */
+    private DateTime qyDate;
+
+    public TTInfo_input() {
+
+    }
+
+    @Override
+    public int compareTo(TTInfo_input ttInfo_input) {
+        if (ttInfo_input != null) {
+            if (ttInfo_input.updateDate != null && this.updateDate != null)
+                return - this.updateDate.compareTo(ttInfo_input.updateDate);
+        }
+        return -1;
+    }
+
+    public TTInfo_input(TTInfo ttInfo) {
+        this.ttInfoId = String.valueOf(ttInfo.getId());
+        this.xlId = String.valueOf(ttInfo.getXl().getId());
+        String[] days = ttInfo.getRule_days().split(",");
+        System.out.println(days.length);
+        for (int i = 0; i < 7; i++) {
+            if ("1".equals(days[i])) {
+                weekdays.add(true);
+            } else {
+                weekdays.add(false);
+            }
+        }
+        if (StringUtils.isNotEmpty(ttInfo.getSpecial_days())) {
+            String[] sdays = ttInfo.getSpecial_days().split(",");
+            for (int i = 0; i < sdays.length; i++) {
+                specialDays.add(DateTimeFormat.forPattern("yyyy-MM-dd").
+                        parseDateTime(sdays[i]));
+            }
+        }
+
+        this.updateDate = new DateTime(ttInfo.getUpdateDate());
+        this.isEnable = ttInfo.getIsEnableDisTemplate();
+        this.qyDate = new DateTime(ttInfo.getQyrq());
+
+    }
+
+    public String getTtInfoId() {
+        return ttInfoId;
+    }
+
+    public void setTtInfoId(String ttInfoId) {
+        this.ttInfoId = ttInfoId;
+    }
+
+    public String getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(String xlId) {
+        this.xlId = xlId;
+    }
+
+    public List<Boolean> getWeekdays() {
+        return weekdays;
+    }
+
+    public void setWeekdays(List<Boolean> weekdays) {
+        this.weekdays = weekdays;
+    }
+
+    public List<DateTime> getSpecialDays() {
+        return specialDays;
+    }
+
+    public void setSpecialDays(List<DateTime> specialDays) {
+        this.specialDays = specialDays;
+    }
+
+    public DateTime getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(DateTime updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public Boolean getIsEnable() {
+        return isEnable;
+    }
+
+    public void setIsEnable(Boolean isEnable) {
+        this.isEnable = isEnable;
+    }
+
+    public DateTime getQyDate() {
+        return qyDate;
+    }
+
+    public void setQyDate(DateTime qyDate) {
+        this.qyDate = qyDate;
+    }
+}
@@ -288,12 +288,12 @@
   <hop> <from>&#x4e0a;&#x4e0b;&#x884c;&#x5b57;&#x5178;</from><to>&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x5b57;&#x5178;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x4e0a;&#x4e0b;&#x884c;&#x5b57;&#x5178; 2</from><to>&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x5b57;&#x5178; 2</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x4e0a;&#x4e0b;&#x884c;&#x5b57;&#x5178; 3</from><to>&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x5b57;&#x5178; 3</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x5339;&#x914d;&#x4e0a;&#x4e0b;&#x884c;&#x73ed;&#x6b21;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</from><to>&#x7c7b;&#x578b;&#x4fee;&#x6b63;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5339;&#x914d;&#x4e0a;&#x4e0b;&#x884c;&#x6b63;&#x5e38;&#x73ed;&#x6b21;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</from><to>&#x7c7b;&#x578b;&#x4fee;&#x6b63;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x6309;&#x7167;&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x8fc7;&#x6ee4;&#x6570;&#x636e;1</from><to>&#x6309;&#x7167;&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x8fc7;&#x6ee4;&#x6570;&#x636e;2</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x6309;&#x7167;&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x8fc7;&#x6ee4;&#x6570;&#x636e;1</from><to>&#x6b63;&#x5e38;&#x73ed;&#x6b21;&#x6570;&#x636e;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x6309;&#x7167;&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x8fc7;&#x6ee4;&#x6570;&#x636e;2</from><to>&#x51fa;&#x573a;&#x73ed;&#x6b21;&#x6570;&#x636e;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x6309;&#x7167;&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x8fc7;&#x6ee4;&#x6570;&#x636e;2</from><to>&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x6570;&#x636e;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x4e0a;&#x4e0b;&#x884c;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</from><to>&#x5339;&#x914d;&#x4e0a;&#x4e0b;&#x884c;&#x73ed;&#x6b21;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x4e0a;&#x4e0b;&#x884c;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</from><to>&#x5339;&#x914d;&#x4e0a;&#x4e0b;&#x884c;&#x6b63;&#x5e38;&#x73ed;&#x6b21;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x67e5;&#x627e;&#x7ec8;&#x70b9;&#x7ad9;&#x5173;&#x8054;</from><to>&#x4e0a;&#x4e0b;&#x884c;&#x5b57;&#x5178;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x67e5;&#x627e;&#x8d77;&#x70b9;&#x7ad9;&#x5173;&#x8054;&#x5e76;&#x786e;&#x5b9a;&#x4e0a;&#x4e0b;&#x884c;</from><to>&#x67e5;&#x627e;&#x7ec8;&#x70b9;&#x7ad9;&#x5173;&#x8054;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x6b63;&#x5e38;&#x73ed;&#x6b21;_&#x5904;&#x7406;&#x6570;&#x636e;</from><to>&#x67e5;&#x627e;&#x8d77;&#x70b9;&#x7ad9;&#x5173;&#x8054;&#x5e76;&#x786e;&#x5b9a;&#x4e0a;&#x4e0b;&#x884c;</to><enabled>Y</enabled> </hop>
@@ -311,15 +311,20 @@
   <hop> <from>&#x67e5;&#x627e;&#x505c;&#x8f66;&#x573a;2</from><to>&#x8fdb;&#x573a;&#x73ed;&#x6b21;_&#x786e;&#x5b9a;&#x8d77;&#x70b9;&#x7ad9;&#x540d;&#x5b57;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x8fdb;&#x573a;&#x73ed;&#x6b21;_&#x786e;&#x5b9a;&#x8d77;&#x70b9;&#x7ad9;&#x540d;&#x5b57;</from><to>&#x67e5;&#x627e;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ebf;&#x8def;&#x65b9;&#x5411;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x67e5;&#x627e;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ebf;&#x8def;&#x65b9;&#x5411;</from><to>&#x67e5;&#x627e;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#xff0c;&#x5e76;&#x4f5c;&#x4e3a;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x67e5;&#x627e;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#xff0c;&#x5e76;&#x4f5c;&#x4e3a;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;</from><to>&#x4e0a;&#x4e0b;&#x884c;&#x5b57;&#x5178; 3</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</from><to>&#x6dfb;&#x52a0;&#x53d1;&#x8f66;&#x987a;&#x5e8f;&#x53f7;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x5206;&#x7ec4;&#x5404;&#x4e2a;&#x8def;&#x724c;&#x7684;&#x7ad9;</from><to>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x5173;&#x8054;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x589e;&#x52a0;&#x65f6;&#x523b;&#x8868;&#x540d;&#x5b57;&#xff0c;&#x7ebf;&#x8def;&#x540d;&#x5b57;&#xff0c;&#x505c;&#x8f66;&#x573a;&#x540d;&#x5b57;</from><to>&#x8bb0;&#x5f55;&#x5173;&#x8054; &#x28;&#x7b1b;&#x5361;&#x5c14;&#x8f93;&#x51fa;&#x29;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x73ed;&#x6b21;&#x6570;&#x636e;&#x8303;&#x5f0f;&#x5316;</from><to>&#x8bb0;&#x5f55;&#x5173;&#x8054; &#x28;&#x7b1b;&#x5361;&#x5c14;&#x8f93;&#x51fa;&#x29;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x8bb0;&#x5f55;&#x5173;&#x8054; &#x28;&#x7b1b;&#x5361;&#x5c14;&#x8f93;&#x51fa;&#x29;</from><to>&#x5b57;&#x6bb5;&#x9009;&#x62e9;</to><enabled>Y</enabled> </hop>
   <hop> <from>&#x7c7b;&#x578b;&#x4fee;&#x6b63;</from><to>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ttinfo_detail</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x51fa;&#x573a;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</from><to>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ttinfo_detail 2</to><enabled>Y</enabled> </hop>
-  <hop> <from>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x8fdb;&#x573a;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</from><to>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ttinfo_detail 3</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x67e5;&#x627e;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#xff0c;&#x5e76;&#x4f5c;&#x4e3a;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;</from><to>&#x67e5;&#x627e;&#x8fdb;&#x573a;&#x8d77;&#x70b9;&#x7ad9;&#x5173;&#x8054;&#x786e;&#x5b9a;&#x4e0a;&#x4e0b;&#x884c;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x67e5;&#x627e;&#x8fdb;&#x573a;&#x8d77;&#x70b9;&#x7ad9;&#x5173;&#x8054;&#x786e;&#x5b9a;&#x4e0a;&#x4e0b;&#x884c;</from><to>&#x4e0a;&#x4e0b;&#x884c;&#x5b57;&#x5178; 3</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x51fa;&#x573a;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</from><to>&#x5339;&#x914d;&#x51fa;&#x573a;&#x73ed;&#x6b21;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5339;&#x914d;&#x51fa;&#x573a;&#x73ed;&#x6b21;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</from><to>&#x7c7b;&#x578b;&#x4fee;&#x6b63; 2</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x7c7b;&#x578b;&#x4fee;&#x6b63; 2</from><to>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ttinfo_detail 2</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x8fdb;&#x573a;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</from><to>&#x5339;&#x914d;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x5339;&#x914d;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</from><to>&#x7c7b;&#x578b;&#x4fee;&#x6b63; 3</to><enabled>Y</enabled> </hop>
+  <hop> <from>&#x7c7b;&#x578b;&#x4fee;&#x6b63; 3</from><to>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ttinfo_detail 3</to><enabled>Y</enabled> </hop>
   </order>
   <step>
     <name>&#x4e0a;&#x4e0b;&#x884c;&#x5b57;&#x5178;</name>
@@ -411,8 +416,8 @@
     </fields>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>550</xloc>
-      <yloc>775</yloc>
+      <xloc>553</xloc>
+      <yloc>859</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
@@ -432,7 +437,7 @@
     <optimizationLevel>9</optimizationLevel>
     <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
         <jsScript_name>Script 1</jsScript_name>
-        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x6dfb;&#x52a0;&#x7ad9;&#x70b9;&#x6807;&#x8bc6;&#xa;var cc_groups &#x3d; qdzgroups.split&#x28;&#x22;,&#x22;&#x29;&#x3b; &#x2f;&#x2f; &#x6240;&#x6709;&#x73ed;&#x6b21;&#x8d77;&#x70b9;&#x7ad9;&#x6570;&#x7ec4;&#xa;var zdzname &#x3d; cc_groups&#x5b;gno&#x5d;&#x3b; &#x2f;&#x2f; &#x51fa;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#x662f;&#x4e0b;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x59cb;&#x7ad9;&#xa;var endZdtype &#x3d; &#x27;B&#x27;&#x3b;</jsScript_script>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x6dfb;&#x52a0;&#x7ad9;&#x70b9;&#x6807;&#x8bc6;&#xa;var cc_groups &#x3d; qdzgroups.split&#x28;&#x22;,&#x22;&#x29;&#x3b; &#x2f;&#x2f; &#x6240;&#x6709;&#x73ed;&#x6b21;&#x8d77;&#x70b9;&#x7ad9;&#x6570;&#x7ec4;&#xa;var zdzname &#x3d; cc_groups&#x5b;gno&#x5d;&#x3b; &#x2f;&#x2f; &#x51fa;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#x662f;&#x4e0b;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x59cb;&#x7ad9;&#xa;var endZdtype &#x3d; &#x27;E&#x27;&#x3b;</jsScript_script>
       </jsScript>    </jsScripts>    <fields>      <field>        <name>zdzname</name>
         <rename>zdzname</rename>
         <type>String</type>
@@ -513,7 +518,7 @@
     </step>
   <step>
-    <name>&#x5339;&#x914d;&#x4e0a;&#x4e0b;&#x884c;&#x73ed;&#x6b21;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</name>
+    <name>&#x5339;&#x914d;&#x4e0a;&#x4e0b;&#x884c;&#x6b63;&#x5e38;&#x73ed;&#x6b21;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</name>
     <type>ScriptValueMod</type>
     <description/>
     <distribute>Y</distribute>
@@ -675,8 +680,8 @@
     </compare>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>868</xloc>
-      <yloc>404</yloc>
+      <xloc>860</xloc>
+      <yloc>401</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
@@ -946,8 +951,8 @@
     </lookup>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>340</xloc>
-      <yloc>890</yloc>
+      <xloc>342</xloc>
+      <yloc>1031</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
@@ -1046,7 +1051,7 @@
       </value>
       <value>
         <name>xl_dir</name>
-        <rename>sxx</rename>
+        <rename>sxx2</rename>
         <update>Y</update>
       </value>
       <value>
@@ -1067,8 +1072,8 @@
     </lookup>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>770</xloc>
-      <yloc>923</yloc>
+      <xloc>875</xloc>
+      <yloc>887</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
@@ -1469,14 +1474,26 @@
         <name2/>
       </key>
       <value>
-        <name>out_mileage</name>
-        <rename>out_mileage</rename>
+        <name>up_out_timer</name>
+        <rename>up_out_timer</rename>
         <default/>
         <type>Number</type>
       </value>
       <value>
-        <name>out_time</name>
-        <rename>out_time</rename>
+        <name>up_out_mileage</name>
+        <rename>up_out_mileage</rename>
+        <default/>
+        <type>Number</type>
+      </value>
+      <value>
+        <name>down_out_timer</name>
+        <rename>down_out_timer</rename>
+        <default/>
+        <type>Number</type>
+      </value>
+      <value>
+        <name>down_out_mileage</name>
+        <rename>down_out_mileage</rename>
         <default/>
         <type>Number</type>
       </value>
@@ -1517,22 +1534,34 @@
         <name2/>
       </key>
       <value>
-        <name>parade_mileage</name>
-        <rename>parade_mileage</rename>
+        <name>up_in_mileage</name>
+        <rename>up_in_mileage</rename>
         <default/>
         <type>Number</type>
       </value>
       <value>
-        <name>parade_time</name>
-        <rename>parade_time</rename>
+        <name>up_in_timer</name>
+        <rename>up_in_timer</rename>
+        <default/>
+        <type>Number</type>
+      </value>
+      <value>
+        <name>down_in_mileage</name>
+        <rename>down_in_mileage</rename>
+        <default/>
+        <type>Number</type>
+      </value>
+      <value>
+        <name>down_in_timer</name>
+        <rename>down_in_timer</rename>
         <default/>
         <type>Number</type>
       </value>
     </lookup>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>550</xloc>
-      <yloc>920</yloc>
+      <xloc>553</xloc>
+      <yloc>1004</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
@@ -1799,8 +1828,8 @@
         <name2/>
       </key>
       <value>
-        <name>station</name>
-        <rename>qdzid</rename>
+        <name>station_name</name>
+        <rename>zdzname_calcu</rename>
         <default/>
         <type>Integer</type>
       </value>
@@ -2115,8 +2144,8 @@
     </fields>
      <cluster_schema/>
  <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
-      <xloc>548</xloc>
-      <yloc>844</yloc>
+      <xloc>551</xloc>
+      <yloc>928</yloc>
       <draw>Y</draw>
       </GUI>
     </step>
@@ -2324,6 +2353,238 @@
       </GUI>
     </step>
+  <step>
+    <name>&#x67e5;&#x627e;&#x8fdb;&#x573a;&#x8d77;&#x70b9;&#x7ad9;&#x5173;&#x8054;&#x786e;&#x5b9a;&#x4e0a;&#x4e0b;&#x884c;</name>
+    <type>DBLookup</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <connection>bus_control_variable</connection>
+    <cache>N</cache>
+    <cache_load_all>N</cache_load_all>
+    <cache_size>0</cache_size>
+    <lookup>
+      <schema/>
+      <table>bsth_c_stationroute</table>
+      <orderby/>
+      <fail_on_multiple>N</fail_on_multiple>
+      <eat_row_on_failure>N</eat_row_on_failure>
+      <key>
+        <name>xlid</name>
+        <field>line</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>zdzname_calcu</name>
+        <field>station_name</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <key>
+        <name>startZdtype_calcu</name>
+        <field>station_mark</field>
+        <condition>&#x3d;</condition>
+        <name2/>
+      </key>
+      <value>
+        <name>directions</name>
+        <rename>sxx2</rename>
+        <default/>
+        <type>Integer</type>
+      </value>
+      <value>
+        <name>station</name>
+        <rename>qdzid</rename>
+        <default/>
+        <type>Integer</type>
+      </value>
+    </lookup>
+     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>551</xloc>
+      <yloc>782</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5339;&#x914d;&#x51fa;&#x573a;&#x73ed;&#x6b21;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</name>
+    <type>ScriptValueMod</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <compatible>N</compatible>
+    <optimizationLevel>9</optimizationLevel>
+    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
+        <jsScript_name>Script 1</jsScript_name>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var out_mileage&#x3b; &#x2f;&#x2f; &#x51fa;&#x573a;&#x8ba1;&#x5212;&#x91cc;&#x7a0b;&#xa;var out_time&#x3b; &#x2f;&#x2f; &#x51fa;&#x573a;&#x8ba1;&#x5212;&#x65f6;&#x95f4;&#xa;&#xa;if &#x28;sxx &#x3d;&#x3d; 0&#x29; &#x7b; &#x2f;&#x2f; &#x4e0a;&#x884c;&#xa;	out_mileage &#x3d; up_out_mileage&#x3b;&#xa;	out_time &#x3d; up_out_timer&#x3b;&#xa;&#x7d; else &#x7b; &#x2f;&#x2f; sxx &#x3d;&#x3d; 1 &#x4e0b;&#x884c;&#xa;	out_mileage &#x3d; down_out_mileage&#x3b;&#xa;	out_time &#x3d; down_out_timer&#x3b;&#xa;&#x7d;&#xa;&#xa;&#xa;&#xa;</jsScript_script>
+      </jsScript>    </jsScripts>    <fields>      <field>        <name>out_mileage</name>
+        <rename>out_mileage</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>out_time</name>
+        <rename>out_time</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>336</xloc>
+      <yloc>862</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x7c7b;&#x578b;&#x4fee;&#x6b63; 2</name>
+    <type>SelectValues</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <fields>        <select_unspecified>N</select_unspecified>
+      <meta>        <name>out_mileage</name>
+        <rename>out_mileage</rename>
+        <type>Number</type>
+        <length>-2</length>
+        <precision>-2</precision>
+        <conversion_mask/>
+        <date_format_lenient>false</date_format_lenient>
+        <date_format_locale/>
+        <date_format_timezone/>
+        <lenient_string_to_number>false</lenient_string_to_number>
+        <encoding/>
+        <decimal_symbol/>
+        <grouping_symbol/>
+        <currency_symbol/>
+        <storage_type/>
+      </meta>      <meta>        <name>out_time</name>
+        <rename>out_time</rename>
+        <type>Integer</type>
+        <length>-2</length>
+        <precision>-2</precision>
+        <conversion_mask/>
+        <date_format_lenient>false</date_format_lenient>
+        <date_format_locale/>
+        <date_format_timezone/>
+        <lenient_string_to_number>false</lenient_string_to_number>
+        <encoding/>
+        <decimal_symbol/>
+        <grouping_symbol/>
+        <currency_symbol/>
+        <storage_type/>
+      </meta>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>338</xloc>
+      <yloc>949</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x5339;&#x914d;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</name>
+    <type>ScriptValueMod</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <compatible>N</compatible>
+    <optimizationLevel>9</optimizationLevel>
+    <jsScripts>      <jsScript>        <jsScript_type>0</jsScript_type>
+        <jsScript_name>Script 1</jsScript_name>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;var parade_mileage&#x3b; &#x2f;&#x2f; &#x8fdb;&#x573a;&#x8ba1;&#x5212;&#x91cc;&#x7a0b;&#xa;var parade_time&#x3b; &#x2f;&#x2f; &#x8fdb;&#x573a;&#x8ba1;&#x5212;&#x65f6;&#x95f4;&#xa;&#xa;if &#x28;sxx2 &#x3d;&#x3d; 0&#x29; &#x7b; &#x2f;&#x2f; &#x4e0a;&#x884c;&#xa;	parade_mileage &#x3d; up_in_mileage&#x3b;&#xa;	parade_time &#x3d; up_in_timer&#x3b;&#xa;&#x7d; else &#x7b; &#x2f;&#x2f; sxx &#x3d;&#x3d; 1 &#x4e0b;&#x884c;&#xa;	parade_mileage &#x3d; down_in_mileage&#x3b;&#xa;	parade_time &#x3d; down_in_timer&#x3b;&#xa;&#x7d;&#xa;&#xa;&#xa;&#xa;</jsScript_script>
+      </jsScript>    </jsScripts>    <fields>      <field>        <name>parade_mileage</name>
+        <rename>parade_mileage</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>      <field>        <name>parade_time</name>
+        <rename>parade_time</rename>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>726</xloc>
+      <yloc>1005</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
+  <step>
+    <name>&#x7c7b;&#x578b;&#x4fee;&#x6b63; 3</name>
+    <type>SelectValues</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+         <partitioning>
+           <method>none</method>
+           <schema_name/>
+           </partitioning>
+    <fields>        <select_unspecified>N</select_unspecified>
+      <meta>        <name>parade_mileage</name>
+        <rename>parade_mileage</rename>
+        <type>Number</type>
+        <length>-2</length>
+        <precision>-2</precision>
+        <conversion_mask/>
+        <date_format_lenient>false</date_format_lenient>
+        <date_format_locale/>
+        <date_format_timezone/>
+        <lenient_string_to_number>false</lenient_string_to_number>
+        <encoding/>
+        <decimal_symbol/>
+        <grouping_symbol/>
+        <currency_symbol/>
+        <storage_type/>
+      </meta>      <meta>        <name>parade_time</name>
+        <rename>parade_time</rename>
+        <type>Integer</type>
+        <length>-2</length>
+        <precision>-2</precision>
+        <conversion_mask/>
+        <date_format_lenient>false</date_format_lenient>
+        <date_format_locale/>
+        <date_format_timezone/>
+        <lenient_string_to_number>false</lenient_string_to_number>
+        <encoding/>
+        <decimal_symbol/>
+        <grouping_symbol/>
+        <currency_symbol/>
+        <storage_type/>
+      </meta>    </fields>     <cluster_schema/>
+ <remotesteps>   <input>   </input>   <output>   </output> </remotesteps>    <GUI>
+      <xloc>875</xloc>
+      <yloc>1001</yloc>
+      <draw>Y</draw>
+      </GUI>
+    </step>
+
   <step_error_handling>
   </step_error_handling>
    <slave-step-copy-partition-distribution>
@@ -222,7 +222,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService_g&#39;, [&#39;$resource&#39;, f
     return {
         rest : $resource(
             '/eci/:id',
-            {order: 'createDate', direction: 'ASC', id: '@id_route'},
+            {order: 'xl.id,dbbmFormula', direction: 'ASC', id: '@id_route'},
             {
                 list: {
                     method: 'GET',
@@ -221,8 +221,6 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;TimeTableManageListCtrl&#39;, [&#39;TimeTableM
         var xlmc = self.pageInfo.infos[$index]["xl"]["name"];
         // 时刻表名称
         var ttinfoname = self.pageInfo.infos[$index]["name"];
-        // 停车场代码
-        var tcccode = self.pageInfo.infos[$index]["xl"]["carParkCode"];
         // large方式弹出模态对话框
         var modalInstance = $uibModal.open({
@@ -233,8 +231,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;TimeTableManageListCtrl&#39;, [&#39;TimeTableM
             resolve: {
                 // 可以传值给controller
                 r_xlmc : function() {return xlmc},
-                r_ttinfoname : function() {return ttinfoname;},
-                r_tcccode : function() {return tcccode;}
+                r_ttinfoname : function() {return ttinfoname;}
             },
             windowClass: 'center-modal',
             controller: "TimeTableDetailManageToolsCtrl",
@@ -253,12 +250,11 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;TimeTableManageListCtrl&#39;, [&#39;TimeTableM
 }]);
-angular.module('ScheduleApp').controller('TimeTableDetailManageToolsCtrl', ['$modalInstance', 'FileUploader', 'r_xlmc', 'r_ttinfoname', 'r_tcccode', function($modalInstance, FileUploader, r_xlmc, r_ttinfoname, r_tcccode) {
+angular.module('ScheduleApp').controller('TimeTableDetailManageToolsCtrl', ['$modalInstance', 'FileUploader', 'r_xlmc', 'r_ttinfoname', function($modalInstance, FileUploader, r_xlmc, r_ttinfoname) {
     var self = this;
     self.xlmc = r_xlmc;
     self.ttinfoname = r_ttinfoname;
-    self.tcccode = r_tcccode;
     // 关闭窗口
     self.close = function() {
@@ -273,7 +269,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;TimeTableDetailManageToolsCtrl&#39;, [&#39;$mo
     self.uploader = new FileUploader({
         url: "/tidc/dataImportExtend",
         filters: [], // 用于过滤文件，比如只允许导入excel,
-        formData: [{xlmc: self.xlmc, ttinfoname: self.ttinfoname, tcccode: self.tcccode}]
+        formData: [{xlmc: self.xlmc, ttinfoname: self.ttinfoname}]
     });
     self.uploader.onAfterAddingFile = function(fileItem)
     {