Merge branch 'minhang' into pudong

潘钊
2 parents 9370db4a a54badcc
Showing 57 changed files with 2057 additions and 1036 deletions
pom.xml
src/main/java/com/bsth/controller/realcontrol/summary/HoursController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/controller/schedule/BController.java
src/main/java/com/bsth/controller/schedule/PeopleCarPlanController.java
src/main/java/com/bsth/data/summary/entity/Hours_jsy.java
src/main/java/com/bsth/data/summary/repository/HoursRepository.java
src/main/java/com/bsth/data/summary/service/HoursService.java
src/main/java/com/bsth/data/summary/service/impl/HoursServiceImpl.java
src/main/java/com/bsth/entity/oil/Jdl.java
src/main/java/com/bsth/repository/oil/DlbRepository.java
src/main/java/com/bsth/repository/oil/JdlRepository.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/JdlServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/java/com/bsth/service/schedule/PeopleCarPlanService.java
src/main/java/com/bsth/service/schedule/datatools/CarConfigInfoDataToolsImpl.java
src/main/java/com/bsth/service/schedule/datatools/CarsDataToolsImpl.java
@@ -106,11 +106,11 @@
 			<artifactId>janino</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.poi</groupId>
-			<artifactId>poi</artifactId>
-			<version>3.13</version>
-		</dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.13</version>
+        </dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
-package com.bsth.controller.realcontrol.summary;
-
-import com.bsth.controller.BaseController;
-import com.bsth.data.summary.entity.Hours_jsy;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 汇总数据 -工时
- * Created by panzhao on 2017/7/27.
- */
-@RestController
-@RequestMapping("/summary/hours")
-public class HoursController extends BaseController<Hours_jsy, Long>{
-}
+package com.bsth.controller.realcontrol.summary;
+
+import com.bsth.controller.BaseController;
+import com.bsth.data.summary.entity.Hours_jsy;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 汇总数据 -工时
+ * Created by panzhao on 2017/7/27.
+ */
+@RestController
+@RequestMapping("/summary/hours")
+public class HoursController extends BaseController<Hours_jsy, Long>{
+}
@@ -297,6 +297,8 @@ public class ReportController {
 			m_.put("qSj", jsonObject.getString("qSj"));
 			m_.put("hJh", jsonObject.getString("hJh"));
 			m_.put("hSj", jsonObject.getString("hSj"));
+			m_.put("djgsj", jsonObject.getString("djgsj"));
+			m_.put("bcjgsj", jsonObject.getString("bcjgsj"));
 			lMap.add(m_);
 		}
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
@@ -6,11 +6,11 @@ import com.bsth.entity.schedule.BEntity;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.service.schedule.BService;
 import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsFile;
 import com.bsth.service.sys.SysUserService;
 import com.google.common.base.Splitter;
-import jxl.Sheet;
-import jxl.Workbook;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
@@ -154,20 +154,24 @@ public class BController&lt;T, ID extends Serializable&gt; {
     public Map<String, Object> uploadFile(MultipartFile file) {
         Map<String, Object> rtn = new HashMap<>();
         try {
-            File file1 = bService.uploadFile(file.getOriginalFilename(), file.getBytes());
+            DataToolsFile dataToolsFile = bService.uploadFile(file.getOriginalFilename(), file.getBytes());
             // excel文件名
-            String fileName = file1.getAbsolutePath();
+            String fileName = dataToolsFile.getFile().getAbsolutePath();
+            Workbook wb = dataToolsFile.getFileType().getWorkBook(dataToolsFile.getFile());
+
             // excel文件sheet
             List<String> sheetnames = new ArrayList<>();
-            Workbook book = Workbook.getWorkbook(file1);
-            for (Sheet sheet : book.getSheets()) {
-                sheetnames.add(sheet.getName());
+            for (int i = 0; i < wb.getNumberOfSheets(); i ++) {
+                sheetnames.add(wb.getSheetAt(i).getSheetName());
             }
+            wb.close();
+
             rtn.put("status", ResponseCode.SUCCESS);
             rtn.put("filename", fileName);
             rtn.put("sheetnames", StringUtils.join(sheetnames, ","));
         } catch (Exception exp) {
+            exp.printStackTrace();
             rtn.put("status", ResponseCode.ERROR);
             rtn.put("msg", exp.getMessage());
         }
@@ -202,9 +206,9 @@ public class BController&lt;T, ID extends Serializable&gt; {
         Map<String, Object> rtn = new HashMap<>();
         try {
-            File file1 = bService.uploadFile(file.getOriginalFilename(), file.getBytes());
+            DataToolsFile dataToolsFile = bService.uploadFile(file.getOriginalFilename(), file.getBytes());
             Map<String, Object> params = new HashMap<>();
-            bService.importData(file1, params);
+            bService.importData(dataToolsFile.getFile(), params);
             rtn.put("status", ResponseCode.SUCCESS);
             rtn.put("msg", "上传&导入文件成功");
@@ -220,16 +224,16 @@ public class BController&lt;T, ID extends Serializable&gt; {
     @RequestMapping(value = "/exportFile", method = RequestMethod.GET)
     public void exportFile(HttpServletResponse response,
                            @RequestParam Map<String, Object> params) throws Exception {
-        File file = bService.exportData(params);
+        DataToolsFile dataToolsFile = bService.exportData(params);
         // 流输出导出文件
         response.setHeader("content-type", "application/octet-stream");
-        response.setHeader("Content-Disposition", "attachment; filename=" + file.getName());
+        response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName());
         response.setContentType("application/octet-stream");
         OutputStream os = response.getOutputStream();
         BufferedOutputStream bos = new BufferedOutputStream(os);
-        InputStream is = new FileInputStream(file);
+        InputStream is = new FileInputStream(dataToolsFile.getFile());
         BufferedInputStream bis = new BufferedInputStream(is);
         int length = 0;
@@ -59,4 +59,15 @@ public class PeopleCarPlanController {
 		return peopleCarPlanService.commandState(map);
 	}
+	@RequestMapping(value="/commandByLineList", method = RequestMethod.GET)
+	public List<Map<String,Object>> commandByLineList(@RequestParam Map<String, Object> map){
+		return peopleCarPlanService.commandByLineList(map);
+	}
+	
+	@RequestMapping(value="/commandByJghList", method = RequestMethod.GET)
+	public List<Map<String,Object>> commandByJghList(@RequestParam Map<String, Object> map){
+		return peopleCarPlanService.commandByJghList(map);
+	}
+	
+	
 }
-package com.bsth.data.summary.entity;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import java.util.Date;
-
-/**
- * Created by panzhao on 2017/7/26.
- * table:
- * 驾驶员工时
- */
-@Entity
-@Table(name = "z_calc_hoursjsy")
-public class Hours_jsy {
-
-    @Id
-    private Long id;
-
-    /** 公司编码 */
-    private String companyId;
-
-    /** 分公司编码 */
-    private String subCompanyId;
-
-    /** 公司名称 */
-    @Transient
-    private String companyName;
-    /** 分公司名称 */
-    @Transient
-    private String subCompanyName;
-
-    /** 线路编码 */
-    private String lineCode;
-
-    /** 线路名称 */
-    private String lineName;
-
-    /** 驾驶员工号 */
-    private String jsy;
-
-    /** 驾驶员姓名 */
-    private String jsyName;
-
-    /** 车辆自编号 */
-    private String nbbm;
-
-    /** 路牌 */
-    private String lpName;
-
-    /** 日期 （班次日期） */
-    private String rq;
-
-    /** 计划工时（分钟） */
-    private Integer hoursJh;
-    @Transient
-    private String hoursJhStr;
-
-    /** 实际工时（分钟） */
-    private Integer hoursSj;
-    @Transient
-    private String hoursSjStr;
-
-    /** 来源 0： 从路单结算、 1：人工录入 */
-    private int source;
-
-    /** 备注 */
-    private String remarks;
-
-    private Date createDate;
-
-    public String getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(String companyId) {
-        this.companyId = companyId;
-    }
-
-    public String getSubCompanyId() {
-        return subCompanyId;
-    }
-
-    public void setSubCompanyId(String subCompanyId) {
-        this.subCompanyId = subCompanyId;
-    }
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public String getLineName() {
-        return lineName;
-    }
-
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
-    }
-
-    public String getJsy() {
-        return jsy;
-    }
-
-    public void setJsy(String jsy) {
-        this.jsy = jsy;
-    }
-
-    public String getJsyName() {
-        return jsyName;
-    }
-
-    public void setJsyName(String jsyName) {
-        this.jsyName = jsyName;
-    }
-
-    public String getNbbm() {
-        return nbbm;
-    }
-
-    public void setNbbm(String nbbm) {
-        this.nbbm = nbbm;
-    }
-
-    public String getLpName() {
-        return lpName;
-    }
-
-    public void setLpName(String lpName) {
-        this.lpName = lpName;
-    }
-
-    public String getRq() {
-        return rq;
-    }
-
-    public void setRq(String rq) {
-        this.rq = rq;
-    }
-
-
-    public int getSource() {
-        return source;
-    }
-
-    public void setSource(int source) {
-        this.source = source;
-    }
-
-    public String getRemarks() {
-        return remarks;
-    }
-
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Integer getHoursJh() {
-        return hoursJh;
-    }
-
-    public void setHoursJh(Integer hoursJh) {
-        this.hoursJh = hoursJh;
-    }
-
-    public Integer getHoursSj() {
-        return hoursSj;
-    }
-
-    public void setHoursSj(Integer hoursSj) {
-        this.hoursSj = hoursSj;
-    }
-
-    public String keys() {
-        return this.getLineCode() + "_" + this.getLpName() + "_" + this.getJsy() + "_" + this.getNbbm();
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getCompanyName() {
-        return companyName;
-    }
-
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
-    }
-
-    public String getSubCompanyName() {
-        return subCompanyName;
-    }
-
-    public void setSubCompanyName(String subCompanyName) {
-        this.subCompanyName = subCompanyName;
-    }
-
-    public String getHoursJhStr() {
-        return hoursJhStr;
-    }
-
-    public void setHoursJhStr(String hoursJhStr) {
-        this.hoursJhStr = hoursJhStr;
-    }
-
-    public String getHoursSjStr() {
-        return hoursSjStr;
-    }
-
-    public void setHoursSjStr(String hoursSjStr) {
-        this.hoursSjStr = hoursSjStr;
-    }
-}
+package com.bsth.data.summary.entity;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.Date;
+
+/**
+ * Created by panzhao on 2017/7/26.
+ * table:
+ * 驾驶员工时
+ */
+@Entity
+@Table(name = "z_calc_hoursjsy")
+public class Hours_jsy {
+
+    @Id
+    private Long id;
+
+    /** 公司编码 */
+    private String companyId;
+
+    /** 分公司编码 */
+    private String subCompanyId;
+
+    /** 公司名称 */
+    @Transient
+    private String companyName;
+    /** 分公司名称 */
+    @Transient
+    private String subCompanyName;
+
+    /** 线路编码 */
+    private String lineCode;
+
+    /** 线路名称 */
+    private String lineName;
+
+    /** 驾驶员工号 */
+    private String jsy;
+
+    /** 驾驶员姓名 */
+    private String jsyName;
+
+    /** 车辆自编号 */
+    private String nbbm;
+
+    /** 路牌 */
+    private String lpName;
+
+    /** 日期 （班次日期） */
+    private String rq;
+
+    /** 计划工时（分钟） */
+    private Integer hoursJh;
+    @Transient
+    private String hoursJhStr;
+
+    /** 实际工时（分钟） */
+    private Integer hoursSj;
+    @Transient
+    private String hoursSjStr;
+
+    /** 来源 0： 从路单结算、 1：人工录入 */
+    private int source;
+
+    /** 备注 */
+    private String remarks;
+
+    private Date createDate;
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getSubCompanyId() {
+        return subCompanyId;
+    }
+
+    public void setSubCompanyId(String subCompanyId) {
+        this.subCompanyId = subCompanyId;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public String getJsy() {
+        return jsy;
+    }
+
+    public void setJsy(String jsy) {
+        this.jsy = jsy;
+    }
+
+    public String getJsyName() {
+        return jsyName;
+    }
+
+    public void setJsyName(String jsyName) {
+        this.jsyName = jsyName;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getLpName() {
+        return lpName;
+    }
+
+    public void setLpName(String lpName) {
+        this.lpName = lpName;
+    }
+
+    public String getRq() {
+        return rq;
+    }
+
+    public void setRq(String rq) {
+        this.rq = rq;
+    }
+
+
+    public int getSource() {
+        return source;
+    }
+
+    public void setSource(int source) {
+        this.source = source;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getHoursJh() {
+        return hoursJh;
+    }
+
+    public void setHoursJh(Integer hoursJh) {
+        this.hoursJh = hoursJh;
+    }
+
+    public Integer getHoursSj() {
+        return hoursSj;
+    }
+
+    public void setHoursSj(Integer hoursSj) {
+        this.hoursSj = hoursSj;
+    }
+
+    public String keys() {
+        return this.getLineCode() + "_" + this.getLpName() + "_" + this.getJsy() + "_" + this.getNbbm();
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getSubCompanyName() {
+        return subCompanyName;
+    }
+
+    public void setSubCompanyName(String subCompanyName) {
+        this.subCompanyName = subCompanyName;
+    }
+
+    public String getHoursJhStr() {
+        return hoursJhStr;
+    }
+
+    public void setHoursJhStr(String hoursJhStr) {
+        this.hoursJhStr = hoursJhStr;
+    }
+
+    public String getHoursSjStr() {
+        return hoursSjStr;
+    }
+
+    public void setHoursSjStr(String hoursSjStr) {
+        this.hoursSjStr = hoursSjStr;
+    }
+}
-package com.bsth.data.summary.repository;
-
-import com.bsth.data.summary.entity.Hours_jsy;
-import com.bsth.repository.BaseRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * Created by panzhao on 2017/7/27.
- */
-@Repository
-public interface HoursRepository extends BaseRepository<Hours_jsy, Long> {
-}
+package com.bsth.data.summary.repository;
+
+import com.bsth.data.summary.entity.Hours_jsy;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by panzhao on 2017/7/27.
+ */
+@Repository
+public interface HoursRepository extends BaseRepository<Hours_jsy, Long> {
+}
-package com.bsth.data.summary.service;
-
-import com.bsth.data.summary.entity.Hours_jsy;
-import com.bsth.service.BaseService;
-
-/**
- * Created by panzhao on 2017/7/27.
- */
-public interface HoursService extends BaseService<Hours_jsy, Long>{
-}
+package com.bsth.data.summary.service;
+
+import com.bsth.data.summary.entity.Hours_jsy;
+import com.bsth.service.BaseService;
+
+/**
+ * Created by panzhao on 2017/7/27.
+ */
+public interface HoursService extends BaseService<Hours_jsy, Long>{
+}
-package com.bsth.data.summary.service.impl;
-
-import com.bsth.data.BasicData;
-import com.bsth.data.summary.entity.Hours_jsy;
-import com.bsth.data.summary.service.HoursService;
-import com.bsth.service.impl.BaseServiceImpl;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by panzhao on 2017/7/27.
- */
-@Service
-public class HoursServiceImpl extends BaseServiceImpl<Hours_jsy, Long> implements HoursService {
-
-    @Override
-    public Page<Hours_jsy> list(Map<String, Object> map, Pageable pageable) {
-        //排序
-        List<Sort.Order> orderList = new ArrayList<>();
-        orderList.add(new Sort.Order(Sort.Direction.ASC,"rq"));
-        orderList.add(new Sort.Order(Sort.Direction.ASC,"lineName"));
-        orderList.add(new Sort.Order(Sort.Direction.ASC,"jsy"));
-        orderList.add(new Sort.Order(Sort.Direction.ASC,"nbbm"));
-
-        Page<Hours_jsy> page = super.list(map, new PageRequest(pageable.getPageNumber(), pageable.getPageSize(), new Sort(orderList)));
-
-        //公司编码转名称
-        List<Hours_jsy> list = page.getContent();
-        for(Hours_jsy h : list){
-            h.setCompanyName(BasicData.businessCodeNameMap.get(h.getCompanyId()));
-            h.setSubCompanyName(BasicData.businessFgsCodeNameMap.get(h.getSubCompanyId()+"_"+h.getCompanyId()));
-
-            //时间字符串
-            h.setHoursJhStr(hoursToString(h.getHoursJh()));
-            h.setHoursSjStr(hoursToString(h.getHoursSj()));
-        }
-        return page;
-    }
-
-    private String hoursToString(Integer minute){
-        if(minute==0)
-            return "0";
-        int h = minute / 60;
-        String str =  (h<10?"0"+h:h) + "";
-
-        int m = minute % 60;
-        if(m != 0)
-            str += ("." + (m<10?"0"+m:m));
-        return str;
-    }
-}
+package com.bsth.data.summary.service.impl;
+
+import com.bsth.data.BasicData;
+import com.bsth.data.summary.entity.Hours_jsy;
+import com.bsth.data.summary.service.HoursService;
+import com.bsth.service.impl.BaseServiceImpl;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/7/27.
+ */
+@Service
+public class HoursServiceImpl extends BaseServiceImpl<Hours_jsy, Long> implements HoursService {
+
+    @Override
+    public Page<Hours_jsy> list(Map<String, Object> map, Pageable pageable) {
+        //排序
+        List<Sort.Order> orderList = new ArrayList<>();
+        orderList.add(new Sort.Order(Sort.Direction.ASC,"rq"));
+        orderList.add(new Sort.Order(Sort.Direction.ASC,"lineName"));
+        orderList.add(new Sort.Order(Sort.Direction.ASC,"jsy"));
+        orderList.add(new Sort.Order(Sort.Direction.ASC,"nbbm"));
+
+        Page<Hours_jsy> page = super.list(map, new PageRequest(pageable.getPageNumber(), pageable.getPageSize(), new Sort(orderList)));
+
+        //公司编码转名称
+        List<Hours_jsy> list = page.getContent();
+        for(Hours_jsy h : list){
+            h.setCompanyName(BasicData.businessCodeNameMap.get(h.getCompanyId()));
+            h.setSubCompanyName(BasicData.businessFgsCodeNameMap.get(h.getSubCompanyId()+"_"+h.getCompanyId()));
+
+            //时间字符串
+            h.setHoursJhStr(hoursToString(h.getHoursJh()));
+            h.setHoursSjStr(hoursToString(h.getHoursSj()));
+        }
+        return page;
+    }
+
+    private String hoursToString(Integer minute){
+        if(minute==0)
+            return "0";
+        int h = minute / 60;
+        String str =  (h<10?"0"+h:h) + "";
+
+        int m = minute % 60;
+        if(m != 0)
+            str += ("." + (m<10?"0"+m:m));
+        return str;
+    }
+}
@@ -22,6 +22,7 @@ public class Jdl {
 	private String fgsBm;
 	private String fgsName;
 	private String nbbm;
+	private String jsy;
 	private Double jdl = 0.0;
 	private String jdz;
 	private String remarks;
@@ -95,5 +96,13 @@ public class Jdl {
 	public void setCreaterDate(Date createrDate) {
 		this.createrDate = createrDate;
 	}
+	public String getJsy() {
+		return jsy;
+	}
+	public void setJsy(String jsy) {
+		this.jsy = jsy;
+	}
+	
+	
 }
@@ -93,5 +93,6 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 				" WHERE id = ?1", nativeQuery=true)
 	public void dlbUpdate(Integer id,double czcd,double jzcd,double hd, double sh,String shyy,int yhlx);
-	
+	@Query(value="SELECT * FROM bsth_c_dlb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 and xlbm=?4",nativeQuery=true)
+	List<Dlb> queryListDlb(String rq,String nbbm,String jgh,String xlbm);
 }
@@ -17,22 +17,25 @@ public interface JdlRepository extends BaseRepository&lt;Jdl, Integer&gt;{
 	@Transactional
     @Modifying
     @Query(value="INSERT INTO bsth_c_jdl("+
-    			 "gs_bm, gs_name, fgs_bm, fgs_name, rq, nbbm, jdl, jdz, remarks, creater_date)" +
+    			 "gs_bm, gs_name, fgs_bm, fgs_name, rq, nbbm, jdl, jdz, remarks, creater_date,jsy)" +
     			 " VALUES(" +
-    			 "?1,?2,?3,?4,str_to_date(?5,'%Y-%m-%d'),?6,?7,?8,?9,str_to_date(?10,'%Y-%m-%d %H:%i:%s'))", nativeQuery=true)
-	void insertData(String gsbm, String gsName, String fgsbm, String fgsName, String rq, String nbbm, String jdl, String jdz, String remarks, String createrDate);
+    			 "?1,?2,?3,?4,str_to_date(?5,'%Y-%m-%d'),?6,?7,?8,?9,str_to_date(?10,'%Y-%m-%d %H:%i:%s'),?11)", nativeQuery=true)
+	void insertData(String gsbm, String gsName, String fgsbm, String fgsName, String rq, String nbbm, String jdl, String jdz, String remarks, String createrDate,String jsy);
-	@Query(value="SELECT * FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm like %?4%",nativeQuery=true)
-	List<Jdl> query(String gsbm, String fgsbm, String rq, String nbbm);
+	@Query(value="SELECT * FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm like %?4% and jsy like %?5%" ,nativeQuery=true)
+	List<Jdl> query(String gsbm, String fgsbm, String rq, String nbbm,String jsy);
 	@Query(value="SELECT * FROM bsth_c_jdl where rq = ?",nativeQuery=true)
 	List<Jdl> JdlList( String rq);
-	@Query(value="SELECT jdl FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm = ?4 and jdz = ?5",nativeQuery=true)
-	List<Double> queryBySame(String gsbm, String fgsbm, String rq, String nbbm, String jdz);
+	@Query(value="SELECT jdl FROM bsth_c_jdl where gs_bm = ?1 and fgs_bm = ?2 and rq = ?3 and nbbm = ?4 and jsy = ?5 ",nativeQuery=true)
+	List<Double> queryBySame(String gsbm, String fgsbm, String rq, String nbbm, String jsy);
-	@Query(value="UPDATE bsth_c_jdl set jdl = ?1 where gs_bm = ?2 and fgs_bm = ?3 and rq = ?4 and nbbm = ?5 and jdz = ?6",nativeQuery=true)
-	void UpdateJdl(String jdl, String gsbm, String fgsbm, String rq, String nbbm, String jdz);
+	
+	@Transactional
+    @Modifying
+	@Query(value="UPDATE bsth_c_jdl set jdl = ?1 where gs_bm = ?2 and fgs_bm = ?3 and rq = ?4 and nbbm = ?5 and jsy = ?6",nativeQuery=true)
+	void UpdateJdl(String jdl, String gsbm, String fgsbm, String rq, String nbbm, String jsy);
 }
@@ -62,8 +62,8 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	List<Ylb> obtainYl_eq(String rq,String gsdm,String fgsdm,String xlbm,String nbbm,String px);
-	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 ",nativeQuery=true)
-	List<Ylb> queryListYlb(String rq,String nbbm,String jgh);
+	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 and xlbm=?4",nativeQuery=true)
+	List<Ylb> queryListYlb(String rq,String nbbm,String jgh,String xlbm);
 	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 and xlbm=?4 order by ?5 asc",nativeQuery=true)
 	List<Ylb> checkYlb(String rq,String nbbm,String jgh,String xlbm,String px);
@@ -97,8 +97,6 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	 * @param xlbm
 	 * @return
 	 */
-	@Transactional
-	@Modifying
 	@Query(value="select nbbm,sum(jzl*100) as jzl ,sum(zlc*100) as zlc from bsth_c_ylb where to_days(?1)=to_days(rq) and "
 			+ " ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
@@ -158,7 +158,8 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 						//手动导入没有驾驶员工号
 						for (int i = 0; i < jdlList.size(); i++) {
 							Jdl jdl=jdlList.get(i);
-							if(map.get("clZbh").toString().equals(jdl.getNbbm()) ){
+							if(map.get("clZbh").toString().equals(jdl.getNbbm()) 
+									&&map.get("jGh").toString().equals(jdl.getJsy())){
 								jzl+=jdl.getJdl();
 							}
 						}
@@ -295,10 +296,11 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 							t.setCzcd(0.0);
 						}
-						//手动导入没有驾驶员工号
+						//
 						for (int i = 0; i < jdlList.size(); i++) {
 							Jdl jdl=jdlList.get(i);
-							if(map.get("clZbh").toString().equals(jdl.getNbbm()) ){
+							if(map.get("clZbh").toString().equals(jdl.getNbbm()) 
+									&&map.get("jGh").toString().equals(jdl.getJsy())){
 								jzl+=jdl.getJdl();
 							}
 						}
@@ -314,10 +316,10 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 					}
 					t.setCdl(jzl);
-					if(type.equals("add")){
+//					if(type.equals("add")){
 						t.setHd(jzl);
 						t.setJzcd(t.getCzcd());
-					}
+//					}
 					t.setNbbm(map.get("clZbh").toString());
 					t.setJsy(map.get("jGh")==null?"":map.get("jGh").toString());
@@ -59,11 +59,11 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 						text += ",";
 						continue;
 					}
-						text += cell.getStringCellValue() + ",";
+						text += String.valueOf(cell) + ",";
 				}
 				String[] split = (text+";").split(",");
 				String str = "";
-				for(int j = 0; j < split.length && j < 5; j++){
+				for(int j = 0; j < split.length && j < 6; j++){
 					str += split[j];
 				}
 				if(str.trim().length() == 0)
@@ -73,23 +73,24 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 			for(int i = 0; i < textList.size(); i++){
 				String text = textList.get(i);
 				String[] split = text.split(",");
-				String rq = split[0];
-				String nbbm = split[1];
-				double jdl = Double.valueOf(split[2].trim().length()!=0?split[2]:"0");
-				String jdz = split[3];
-				String remarks = split[4];
+				String rq = split[0].trim();
+				String nbbm = split[1].trim();
+				String jsy= split[2].trim();
+				double jdl = Double.valueOf(split[3].trim().length()!=0?split[3]:"0");
+				String jdz = split[4].trim();
+				String remarks = split[5].trim();
 				if(rq.trim().length() == 0){
 					rq = sdf.format(new Date());
 				}
-				List<Double> jdl_ = repository.queryBySame(gsbm, fgsbm, rq, nbbm, jdz);
+				List<Double> jdl_ = repository.queryBySame(gsbm, fgsbm, rq, nbbm, jsy);
 				if(jdl_.size() == 0){
 					repository.insertData(gsbm, gsName, fgsbm, fgsName, rq, nbbm,
-							df.format(jdl), jdz, remarks, sd.format(new Date()));
+							df.format(jdl), jdz, remarks, sd.format(new Date()),jsy);
 				}else{
-					jdl += jdl_.get(0);
-					repository.UpdateJdl(df.format(jdl), gsbm, fgsbm, rq, nbbm, jdz);
+//					jdl += jdl_.get(0);
+					repository.UpdateJdl(df.format(jdl), gsbm, fgsbm, rq, nbbm, jsy);
 				}
 			}
 			wb.close();
@@ -111,8 +112,9 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 		String fgsbm = map.get("fgsbm").toString();
 		String rq = map.get("rq").toString();
 		String nbbm = map.get("nbbm").toString();
+		String jsy =map.get("jsy").toString();
 		Integer page = Integer.valueOf(map.containsKey("page")?map.get("page").toString():"0");
-		List<Jdl> query = repository.query(gsbm, fgsbm, rq, nbbm);
+		List<Jdl> query = repository.query(gsbm, fgsbm, rq, nbbm,jsy);
 		if(!map.containsKey("type")){
@@ -24,6 +24,7 @@ import com.bsth.data.utils.CustomStringUtils;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
+import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
@@ -37,6 +38,7 @@ import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.entity.sys.DutyEmployee;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.LineRepository;
+import com.bsth.repository.oil.DlbRepository;
 import com.bsth.repository.oil.YlbRepository;
 import com.bsth.repository.oil.YlxxbRepository;
 import com.bsth.repository.realcontrol.ChildTaskPlanRepository;
@@ -133,6 +135,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Autowired
     YlbRepository ylbRepository;
+    
+    @Autowired
+    DlbRepository dlbRepository;
     @Autowired
     ReportService reposrService;
@@ -903,13 +908,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 e.printStackTrace();
             }
         }
-
+        String xls="";
+        if(map.get("type").toString().equals("0")){
+        	xls="waybill_minhang.xls";
+        }else{
+        	xls="waybill_minhang_dl.xls";
+        }
         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_minhang.xls",
+        ee.excelReplace(list, new Object[]{scheduleRealInfos.get(0),map}, path + "mould/"+xls,
                 path + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls");
         return scheduleRealInfos;
     }
@@ -3573,27 +3583,42 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         ScheduleRealInfo s = scheduleRealInfoRepository.scheduleById(id);
         String xlbm = s.getXlBm();
         String fcrq = s.getScheduleDateStr();
-        List<Ylxxb> listYlxxb = ylxxbRepository.queryListYlxxb(s.getClZbh(), fcrq);
-        Double jzl = 0.0;
-        for (int t = 0; t < listYlxxb.size(); t++) {
-            Ylxxb y = listYlxxb.get(t);
-            jzl = Arith.add(jzl, y.getJzl());
-        }
-        List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh());
+        int type=0;
         Double ccyl = 0.0;
         Double jcyl = 0.0;
         Double yh = 0.0;
-        for (int i = 0; i < listYlb.size(); i++) {
-            Ylb y = listYlb.get(i);
-            ccyl=Arith.add(ccyl, y.getCzyl());
-            jcyl=Arith.add(jcyl, y.getJzyl());
-            yh =Arith.add(yh ,y.getYh());
+        Double jzl = 0.0;
+        List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
+        List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
+        if(listYlb.size()>0){
+        	 type=0;
+        	for (int i = 0; i < listYlb.size(); i++) {
+                Ylb y = listYlb.get(i);
+                ccyl=Arith.add(ccyl, y.getCzyl());
+                jcyl=Arith.add(jcyl, y.getJzyl());
+                yh =Arith.add(yh ,y.getYh());
+                jzl =Arith.add(jzl, y.getJzl());
+            }
+        }else{
+        	 type=1;
+        	for (int i = 0; i < listDlb.size(); i++) {
+				Dlb d=listDlb.get(i);
+				ccyl=Arith.add(ccyl, d.getCzcd());
+                jcyl=Arith.add(jcyl, d.getJzcd());
+                yh =Arith.add(yh ,d.getHd());
+                jzl =Arith.add(jzl, d.getCdl());
+			}
         }
+        
+      
+        
         map.put("jzl", jzl);
         map.put("yh", yh);
         map.put("ccyl", ccyl);
         map.put("jcyl", jcyl);
+        map.put("type", type);
+        
         map.put("xlName", s.getXlName());
         map.put("clZbh", s.getClZbh());
         map.put("plate", BasicData.nbbmCompanyPlateMap.get(s.getClZbh()));
@@ -3861,7 +3886,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         dataList2.add(tempMap);
-
+/*
         size = 0;
         tempMap = new HashMap<String, Object>();
         for (ScheduleRealInfo schedule : list3) {
@@ -3907,8 +3932,97 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 tempMap.put("remarks" + size, "");
             }
         }
+*/
+        
+        size = 0;
+        tempMap = new HashMap<String, Object>();
+        for (ScheduleRealInfo schedule : list3) {
+        	int x=size%3;
+        	if(x==0 && size>0){
+        		dataList3.add(tempMap);
+        		tempMap = new HashMap<String, Object>();
+        	}
+        	 tempMap.put("lpName" + x, schedule.getLpName());
+             tempMap.put("qdzName" + x, schedule.getQdzName());
+             tempMap.put("zdsj" + x, schedule.getZdsj());
+             String zdsjActual=schedule.getZdsjActual() != null ? schedule.getZdsjActual() : "";
+             tempMap.put("zdsjActual" + x, zdsjActual);
+             
+             String zdsjk="";
+             String zdsjm="";
+             if(!zdsjActual.equals("")){
+            	 String[] zdsj_s=schedule.getZdsj().split(":");
+            	 String[] zdsjActual_s=zdsjActual.split(":");
+            	 Long zdsj_=Long.parseLong(zdsj_s[0])*60+Long.parseLong(zdsj_s[1]);
+            	 Long zdsjActual_=Long.parseLong(zdsjActual_s[0])*60+Long.parseLong(zdsjActual_s[1]);
+            	 if((zdsj_-zdsjActual_)>0){
+            		 zdsjm =String.valueOf(zdsj_-zdsjActual_);
+            	 }else{
+            		 zdsjk =String.valueOf(zdsj_-zdsjActual_);
+            	 }
+             }
+             tempMap.put("zdsjk" + x, zdsjk);
+             tempMap.put("zdsjm" + x, zdsjm);
+             tempMap.put("fcsj" + x, schedule.getFcsj());
+             String fcsjActural=schedule.getFcsjActual() != null ? schedule.getFcsjActual() : "";
+             String bcType=schedule.getBcType()!=null?schedule.getBcType():"";
+             String fcsjActuralstr="";
+             if(bcType.equals("in")){
+            	 fcsjActuralstr=fcsjActural+"(进)";
+             }
+             if(bcType.equals("out")){
+            	 fcsjActuralstr=fcsjActural+"(出)";
+             }
+             tempMap.put("fcsjActual" + x, fcsjActuralstr);
+             String fcsjk="";
+             String fcsjm="";
+             if(!fcsjActural.equals("")){
+            	 String[] zdsj_s=schedule.getFcsj().split(":");
+            	 String[] fcsjActural_s=fcsjActural.split(":");
+            	 Long zdsj_=Long.parseLong(zdsj_s[0])*60+Long.parseLong(zdsj_s[1]);
+            	 Long fcsjActural_=Long.parseLong(fcsjActural_s[0])*60+Long.parseLong(fcsjActural_s[1]);
+            	 if((zdsj_-fcsjActural_)>0){
+            		 fcsjm =String.valueOf(zdsj_-fcsjActural_);
+            	 }else{
+            		 fcsjk =String.valueOf(zdsj_-fcsjActural_);
+            	 }
+             }
+             tempMap.put("fcsjk" + x, fcsjk);
+             tempMap.put("fcsjm" + x, fcsjm);
+             tempMap.put("remarks" + x, schedule.getRemarks() != null ? schedule.getRemarks() : "");
-        dataList3.add(tempMap);
+             size++;
+        }
+        if(tempMap.get("lpName0")!=null){
+        	if(tempMap.get("lpName1")==null){
+        		tempMap.put("lpName1" , "");
+                tempMap.put("qdzName1" , "");
+                tempMap.put("zdsj1" , "");
+                tempMap.put("zdsjActual1", "");
+                tempMap.put("zdsjk1", "");
+                tempMap.put("zdsjm1", "");
+                tempMap.put("fcsj1", "");
+                tempMap.put("fcsjActual1", "");
+                tempMap.put("fcsjk1", "");
+                tempMap.put("fcsjm1", "");
+                tempMap.put("remarks1", "");
+        	}
+        	if(tempMap.get("lpName2")==null){
+        		tempMap.put("lpName2", "");
+                tempMap.put("qdzName2", "");
+                tempMap.put("zdsj2", "");
+                tempMap.put("zdsjActual2", "");
+                tempMap.put("zdsjk2", "");
+                tempMap.put("zdsjm2", "");
+                tempMap.put("fcsj2", "");
+                tempMap.put("fcsjActual2", "");
+                tempMap.put("fcsjk2", "");
+                tempMap.put("fcsjm2", "");
+                tempMap.put("remarks2", "");
+        	}
+        	dataList3.add(tempMap);
+        }
+        
         if (type.equals("export")) {
             SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
@@ -4008,7 +4122,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
         list.add(listMap.iterator());
-        ee.excelReplace(list, new Object[]{map}, path + "mould/waybill_minhang.xls",
+        String xls="";
+        if(map.get("type").toString().equals("0")){
+        	xls="waybill_minhang.xls";
+        }else{
+        	xls="waybill_minhang_dl.xls";
+        }
+        ee.excelReplace(list, new Object[]{map}, path + "mould/"+xls,
                 path + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls");
 //        return scheduleRealInfos;
     }
@@ -2402,6 +2402,8 @@ public class ReportServiceImpl implements ReportService{
 							m.put("qSj", time);
 							m.put("hJh", listInfo.get(i+1).getFcsj());
 							m.put("hSj", listInfo.get(i+1).getFcsjActual());
+							m.put("djgsj", peak);
+							m.put("bcjgsj", (fscjNext-fcsjTime)/60000);
 							mapList.add(m);
 						}
 					}else{
@@ -2416,6 +2418,8 @@ public class ReportServiceImpl implements ReportService{
 							m.put("qSj", time);
 							m.put("hJh", listInfo.get(i+1).getFcsj());
 							m.put("hSj", listInfo.get(i+1).getFcsjActual());
+							m.put("djgsj", trough);
+							m.put("bcjgsj", (fscjNext-fcsjTime)/60000);
 							mapList.add(m);
 						}
 					}
@@ -2443,6 +2447,8 @@ public class ReportServiceImpl implements ReportService{
 							m.put("qSj", time);
 							m.put("hJh", listInfo.get(i+1).getFcsj());
 							m.put("hSj", listInfo.get(i+1).getFcsjActual());
+							m.put("djgsj", peak);
+							m.put("bcjgsj", (fscjNext-fcsjTime)/60000);
 							mapList.add(m);
 						}
 					}else{
@@ -2457,6 +2463,8 @@ public class ReportServiceImpl implements ReportService{
 							m.put("qSj", time);
 							m.put("hJh", listInfo.get(i+1).getFcsj());
 							m.put("hSj", listInfo.get(i+1).getFcsjActual());
+							m.put("djgsj", trough);
+							m.put("bcjgsj", (fscjNext-fcsjTime)/60000);
 							mapList.add(m);
 						}
 					}
@@ -20,4 +20,6 @@ public interface PeopleCarPlanService {
 	List<Map<String, Object>> firstAndLastBus_sum(Map<String, Object> map);
 	List<Map<String, Object>> commandState(Map<String, Object> map);
+	List<Map<String, Object>> commandByLineList(Map<String, Object> map);
+	List<Map<String, Object>> commandByJghList(Map<String, Object> map);
 }
 package com.bsth.service.schedule.datatools;
 import com.bsth.service.schedule.exception.ScheduleException;
-import com.bsth.service.schedule.utils.DataToolsProperties;
-import com.bsth.service.schedule.utils.DataToolsService;
-import jxl.Cell;
-import jxl.Sheet;
-import jxl.Workbook;
+import com.bsth.service.schedule.utils.*;
 import jxl.write.Label;
 import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,26 +37,45 @@ public class CarConfigInfoDataToolsImpl implements DataToolsService {
     private DataToolsProperties dataToolsProperties;
     @Override
-    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+    public DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException {
         try {
-            // 对上传的excel文件做处理，将第一个sheet名字设定为工作表1
-            File file = dataToolsService.uploadFile(filename, filedata);
-            Workbook workbook = Workbook.getWorkbook(file);
-            Sheet sheet = workbook.getSheet(0);
+            // 对上传的excel文件做处理
+            // 将第一个sheet保存成一个xls文件
+            DataToolsFile dataToolsFile = dataToolsService.uploadFile(filename, filedata);
+            File file = dataToolsFile.getFile();
+
+            // poi api
+            Workbook poi_workbook = dataToolsFile.getFileType().getWorkBook(file);
+            Sheet poi_sheet = poi_workbook.getSheetAt(0); // 第一个sheet
+            int rowNum = poi_sheet.getLastRowNum(); // 获取总共多少行
+            if (rowNum < 0) {
+                throw new RuntimeException("表格内容为空！");
+            }
+            int colNum = poi_sheet.getRow(0).getLastCellNum(); // 获取总共多少列，以第一行为主
+            // jxl api
             File fileCal = new File(file.getAbsolutePath() + "_sheetChange.xls");
-            WritableWorkbook writableWorkbook = Workbook.createWorkbook(fileCal);
+            WritableWorkbook writableWorkbook = jxl.Workbook.createWorkbook(fileCal);
             WritableSheet writableSheet = writableWorkbook.createSheet("工作表1", 0);
-            for (int i = 0; i < sheet.getRows(); i++) {
-                Cell[] cells = sheet.getRow(i);
-                for (int j = 0; j < cells.length; j++) {
-                    writableSheet.addCell(new Label(j, i, cells[j].getContents()));
+
+            for (int i = 0; i <= rowNum; i++) {
+                for (int j = 0; j <= colNum; j++) {
+                    // poi读
+                    String cellContent = PoiUtils.getStringValueFromCell(poi_sheet.getRow(i).getCell(j));
+                    // jxl写
+                    writableSheet.addCell(new Label(j, i, cellContent));
                 }
+
             }
             writableWorkbook.write();
             writableWorkbook.close();
+            poi_workbook.close();
+
+            DataToolsFile dataToolsFile1 = new DataToolsFile();
+            dataToolsFile1.setFile(fileCal);
+            dataToolsFile1.setFileType(DataToolsFileType.XLS);
-            return fileCal;
+            return dataToolsFile1;
         } catch (Exception exp) {
             throw new ScheduleException(exp);
@@ -96,7 +113,7 @@ public class CarConfigInfoDataToolsImpl implements DataToolsService {
     }
     @Override
-    public File exportData(Map<String, Object> params) throws ScheduleException {
+    public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException {
         try {
             LOGGER.info("//---------------- 导出车辆配置信息 start... ----------------//");
             // 创建ktr转换所需参数
@@ -110,7 +127,7 @@ public class CarConfigInfoDataToolsImpl implements DataToolsService {
             ktrParms.putAll(params);
-            File file = dataToolsService.exportData(ktrParms);
+            DataToolsFile file = dataToolsService.exportData(ktrParms);
             LOGGER.info("//---------------- 导出车辆配置信息 success... ----------------//");
 package com.bsth.service.schedule.datatools;
 import com.bsth.service.schedule.exception.ScheduleException;
-import com.bsth.service.schedule.utils.DataToolsProperties;
-import com.bsth.service.schedule.utils.DataToolsService;
-import jxl.Cell;
-import jxl.Sheet;
-import jxl.Workbook;
+import com.bsth.service.schedule.utils.*;
 import jxl.write.Label;
 import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
@@ -39,26 +35,45 @@ public class CarsDataToolsImpl implements DataToolsService {
     private DataToolsProperties dataToolsProperties;
     @Override
-    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+    public DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException {
         try {
-            // 对上传的excel文件做处理，将第一个sheet名字设定为工作表1
-            File file = dataToolsService.uploadFile(filename, filedata);
-            Workbook workbook = Workbook.getWorkbook(file);
-            Sheet sheet = workbook.getSheet(0);
+            // 对上传的excel文件做处理
+            // 将第一个sheet保存成一个xls文件
+            DataToolsFile dataToolsFile = dataToolsService.uploadFile(filename, filedata);
+            File file = dataToolsFile.getFile();
+
+            // poi api
+            org.apache.poi.ss.usermodel.Workbook poi_workbook = dataToolsFile.getFileType().getWorkBook(file);
+            org.apache.poi.ss.usermodel.Sheet poi_sheet = poi_workbook.getSheetAt(0); // 第一个sheet
+            int rowNum = poi_sheet.getLastRowNum(); // 获取总共多少行
+            if (rowNum < 0) {
+                throw new RuntimeException("表格内容为空！");
+            }
+            int colNum = poi_sheet.getRow(0).getLastCellNum(); // 获取总共多少列，以第一行为主
+            // jxl api
             File fileCal = new File(file.getAbsolutePath() + "_sheetChange.xls");
-            WritableWorkbook writableWorkbook = Workbook.createWorkbook(fileCal);
+            WritableWorkbook writableWorkbook = jxl.Workbook.createWorkbook(fileCal);
             WritableSheet writableSheet = writableWorkbook.createSheet("工作表1", 0);
-            for (int i = 0; i < sheet.getRows(); i++) {
-                Cell[] cells = sheet.getRow(i);
-                for (int j = 0; j < cells.length; j++) {
-                    writableSheet.addCell(new Label(j, i, cells[j].getContents()));
+
+            for (int i = 0; i <= rowNum; i++) {
+                for (int j = 0; j <= colNum; j++) {
+                    // poi读
+                    String cellContent = PoiUtils.getStringValueFromCell(poi_sheet.getRow(i).getCell(j));
+                    // jxl写
+                    writableSheet.addCell(new Label(j, i, cellContent));
                 }
+
             }
             writableWorkbook.write();
             writableWorkbook.close();
+            poi_workbook.close();
+
+            DataToolsFile dataToolsFile1 = new DataToolsFile();
+            dataToolsFile1.setFile(fileCal);
+            dataToolsFile1.setFileType(DataToolsFileType.XLS);
-            return fileCal;
+            return dataToolsFile1;
         } catch (Exception exp) {
             throw new ScheduleException(exp);
@@ -94,7 +109,7 @@ public class CarsDataToolsImpl implements DataToolsService {
     }
     @Override
-    public File exportData(Map<String, Object> params) throws ScheduleException {
+    public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException {
         try {
             LOGGER.info("//---------------- 导出车辆基础信息 start... ----------------//");
             // 创建ktr转换所需参数
@@ -106,7 +121,7 @@ public class CarsDataToolsImpl implements DataToolsService {
             ktrParms.put("transpath", ktrFile.getAbsolutePath());
             ktrParms.put("filename", "车辆基础信息_download-");
-            File file = dataToolsService.exportData(ktrParms);
+            DataToolsFile file = dataToolsService.exportData(ktrParms);
             LOGGER.info("//---------------- 导出车辆基础信息 success... ----------------//");
 package com.bsth.service.schedule.datatools;
 import com.bsth.service.schedule.exception.ScheduleException;
-import com.bsth.service.schedule.utils.DataToolsProperties;
-import com.bsth.service.schedule.utils.DataToolsService;
-import jxl.Cell;
-import jxl.Sheet;
-import jxl.Workbook;
+import com.bsth.service.schedule.utils.*;
 import jxl.write.Label;
 import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
@@ -39,26 +35,45 @@ public class EmployeeConfigInfoDataToolsImpl implements DataToolsService {
     private DataToolsProperties dataToolsProperties;
     @Override
-    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+    public DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException {
         try {
-            // 对上传的excel文件做处理，将第一个sheet名字设定为工作表1
-            File file = dataToolsService.uploadFile(filename, filedata);
-            Workbook workbook = Workbook.getWorkbook(file);
-            Sheet sheet = workbook.getSheet(0);
+            // 对上传的excel文件做处理
+            // 将第一个sheet保存成一个xls文件
+            DataToolsFile dataToolsFile = dataToolsService.uploadFile(filename, filedata);
+            File file = dataToolsFile.getFile();
+
+            // poi api
+            org.apache.poi.ss.usermodel.Workbook poi_workbook = dataToolsFile.getFileType().getWorkBook(file);
+            org.apache.poi.ss.usermodel.Sheet poi_sheet = poi_workbook.getSheetAt(0); // 第一个sheet
+            int rowNum = poi_sheet.getLastRowNum(); // 获取总共多少行
+            if (rowNum < 0) {
+                throw new RuntimeException("表格内容为空！");
+            }
+            int colNum = poi_sheet.getRow(0).getLastCellNum(); // 获取总共多少列，以第一行为主
+            // jxl api
             File fileCal = new File(file.getAbsolutePath() + "_sheetChange.xls");
-            WritableWorkbook writableWorkbook = Workbook.createWorkbook(fileCal);
+            WritableWorkbook writableWorkbook = jxl.Workbook.createWorkbook(fileCal);
             WritableSheet writableSheet = writableWorkbook.createSheet("工作表1", 0);
-            for (int i = 0; i < sheet.getRows(); i++) {
-                Cell[] cells = sheet.getRow(i);
-                for (int j = 0; j < cells.length; j++) {
-                    writableSheet.addCell(new Label(j, i, cells[j].getContents()));
+
+            for (int i = 0; i <= rowNum; i++) {
+                for (int j = 0; j <= colNum; j++) {
+                    // poi读
+                    String cellContent = PoiUtils.getStringValueFromCell(poi_sheet.getRow(i).getCell(j));
+                    // jxl写
+                    writableSheet.addCell(new Label(j, i, cellContent));
                 }
+
             }
             writableWorkbook.write();
             writableWorkbook.close();
+            poi_workbook.close();
+
+            DataToolsFile dataToolsFile1 = new DataToolsFile();
+            dataToolsFile1.setFile(fileCal);
+            dataToolsFile1.setFileType(DataToolsFileType.XLS);
-            return fileCal;
+            return dataToolsFile1;
         } catch (Exception exp) {
             throw new ScheduleException(exp);
@@ -96,7 +111,7 @@ public class EmployeeConfigInfoDataToolsImpl implements DataToolsService {
     }
     @Override
-    public File exportData(Map<String, Object> params) throws ScheduleException {
+    public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException {
         try {
             LOGGER.info("//---------------- 导出人员配置信息 start... ----------------//");
             // 创建ktr转换所需参数
@@ -110,7 +125,7 @@ public class EmployeeConfigInfoDataToolsImpl implements DataToolsService {
             ktrParms.putAll(params);
-            File file = dataToolsService.exportData(ktrParms);
+            DataToolsFile file = dataToolsService.exportData(ktrParms);
             LOGGER.info("//---------------- 导出人员配置信息 success... ----------------//");
 package com.bsth.service.schedule.datatools;
 import com.bsth.service.schedule.exception.ScheduleException;
-import com.bsth.service.schedule.utils.DataToolsProperties;
-import com.bsth.service.schedule.utils.DataToolsService;
-import jxl.Cell;
-import jxl.Sheet;
-import jxl.Workbook;
+import com.bsth.service.schedule.utils.*;
 import jxl.write.Label;
 import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
@@ -39,26 +35,45 @@ public class EmployeeDataToolsImpl implements DataToolsService {
     private DataToolsProperties dataToolsProperties;
     @Override
-    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+    public DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException {
         try {
-            // 对上传的excel文件做处理，将第一个sheet名字设定为工作表1
-            File file = dataToolsService.uploadFile(filename, filedata);
-            Workbook workbook = Workbook.getWorkbook(file);
-            Sheet sheet = workbook.getSheet(0);
+            // 对上传的excel文件做处理
+            // 将第一个sheet保存成一个xls文件
+            DataToolsFile dataToolsFile = dataToolsService.uploadFile(filename, filedata);
+            File file = dataToolsFile.getFile();
+
+            // poi api
+            org.apache.poi.ss.usermodel.Workbook poi_workbook = dataToolsFile.getFileType().getWorkBook(file);
+            org.apache.poi.ss.usermodel.Sheet poi_sheet = poi_workbook.getSheetAt(0); // 第一个sheet
+            int rowNum = poi_sheet.getLastRowNum(); // 获取总共多少行
+            if (rowNum < 0) {
+                throw new RuntimeException("表格内容为空！");
+            }
+            int colNum = poi_sheet.getRow(0).getLastCellNum(); // 获取总共多少列，以第一行为主
+            // jxl api
             File fileCal = new File(file.getAbsolutePath() + "_sheetChange.xls");
-            WritableWorkbook writableWorkbook = Workbook.createWorkbook(fileCal);
+            WritableWorkbook writableWorkbook = jxl.Workbook.createWorkbook(fileCal);
             WritableSheet writableSheet = writableWorkbook.createSheet("工作表1", 0);
-            for (int i = 0; i < sheet.getRows(); i++) {
-                Cell[] cells = sheet.getRow(i);
-                for (int j = 0; j < cells.length; j++) {
-                    writableSheet.addCell(new Label(j, i, cells[j].getContents()));
+
+            for (int i = 0; i <= rowNum; i++) {
+                for (int j = 0; j <= colNum; j++) {
+                    // poi读
+                    String cellContent = PoiUtils.getStringValueFromCell(poi_sheet.getRow(i).getCell(j));
+                    // jxl写
+                    writableSheet.addCell(new Label(j, i, cellContent));
                 }
+
             }
             writableWorkbook.write();
             writableWorkbook.close();
+            poi_workbook.close();
+
+            DataToolsFile dataToolsFile1 = new DataToolsFile();
+            dataToolsFile1.setFile(fileCal);
+            dataToolsFile1.setFileType(DataToolsFileType.XLS);
-            return fileCal;
+            return dataToolsFile1;
         } catch (Exception exp) {
             throw new ScheduleException(exp);
@@ -94,7 +109,7 @@ public class EmployeeDataToolsImpl implements DataToolsService {
     }
     @Override
-    public File exportData(Map<String, Object> params) throws ScheduleException {
+    public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException {
         try {
             LOGGER.info("//---------------- 导出人员基础信息 start... ----------------//");
             // 创建ktr转换所需参数
@@ -106,7 +121,7 @@ public class EmployeeDataToolsImpl implements DataToolsService {
             ktrParms.put("transpath", ktrFile.getAbsolutePath());
             ktrParms.put("filename", "人员基础信息_download-");
-            File file = dataToolsService.exportData(ktrParms);
+            DataToolsFile file = dataToolsService.exportData(ktrParms);
             LOGGER.info("//---------------- 导出人员基础信息 success... ----------------//");
 package com.bsth.service.schedule.datatools;
 import com.bsth.service.schedule.exception.ScheduleException;
-import com.bsth.service.schedule.utils.DataToolsProperties;
-import com.bsth.service.schedule.utils.DataToolsService;
-import jxl.Cell;
-import jxl.Sheet;
-import jxl.Workbook;
+import com.bsth.service.schedule.utils.*;
 import jxl.write.Label;
 import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
@@ -39,26 +35,45 @@ public class GuideboardInfoDataToolsImpl implements DataToolsService {
     private DataToolsProperties dataToolsProperties;
     @Override
-    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+    public DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException {
         try {
-            // 对上传的excel文件做处理，将第一个sheet名字设定为工作表1
-            File file = dataToolsService.uploadFile(filename, filedata);
-            Workbook workbook = Workbook.getWorkbook(file);
-            Sheet sheet = workbook.getSheet(0);
+            // 对上传的excel文件做处理
+            // 将第一个sheet保存成一个xls文件
+            DataToolsFile dataToolsFile = dataToolsService.uploadFile(filename, filedata);
+            File file = dataToolsFile.getFile();
+
+            // poi api
+            org.apache.poi.ss.usermodel.Workbook poi_workbook = dataToolsFile.getFileType().getWorkBook(file);
+            org.apache.poi.ss.usermodel.Sheet poi_sheet = poi_workbook.getSheetAt(0); // 第一个sheet
+            int rowNum = poi_sheet.getLastRowNum(); // 获取总共多少行
+            if (rowNum < 0) {
+                throw new RuntimeException("表格内容为空！");
+            }
+            int colNum = poi_sheet.getRow(0).getLastCellNum(); // 获取总共多少列，以第一行为主
+            // jxl api
             File fileCal = new File(file.getAbsolutePath() + "_sheetChange.xls");
-            WritableWorkbook writableWorkbook = Workbook.createWorkbook(fileCal);
+            WritableWorkbook writableWorkbook = jxl.Workbook.createWorkbook(fileCal);
             WritableSheet writableSheet = writableWorkbook.createSheet("工作表1", 0);
-            for (int i = 0; i < sheet.getRows(); i++) {
-                Cell[] cells = sheet.getRow(i);
-                for (int j = 0; j < cells.length; j++) {
-                    writableSheet.addCell(new Label(j, i, cells[j].getContents()));
+
+            for (int i = 0; i <= rowNum; i++) {
+                for (int j = 0; j <= colNum; j++) {
+                    // poi读
+                    String cellContent = PoiUtils.getStringValueFromCell(poi_sheet.getRow(i).getCell(j));
+                    // jxl写
+                    writableSheet.addCell(new Label(j, i, cellContent));
                 }
+
             }
             writableWorkbook.write();
             writableWorkbook.close();
+            poi_workbook.close();
+
+            DataToolsFile dataToolsFile1 = new DataToolsFile();
+            dataToolsFile1.setFile(fileCal);
+            dataToolsFile1.setFileType(DataToolsFileType.XLS);
-            return fileCal;
+            return dataToolsFile1;
         } catch (Exception exp) {
             throw new ScheduleException(exp);
@@ -96,7 +111,7 @@ public class GuideboardInfoDataToolsImpl implements DataToolsService {
     }
     @Override
-    public File exportData(Map<String, Object> params) throws ScheduleException {
+    public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException {
         try {
             LOGGER.info("//---------------- 导出路牌信息 start... ----------------//");
             // 创建ktr转换所需参数
@@ -110,7 +125,7 @@ public class GuideboardInfoDataToolsImpl implements DataToolsService {
             ktrParms.putAll(params);
-            File file = dataToolsService.exportData(ktrParms);
+            DataToolsFile file = dataToolsService.exportData(ktrParms);
             LOGGER.info("//---------------- 导出路牌信息 success... ----------------//");
 package com.bsth.service.schedule.datatools;
 import com.bsth.service.schedule.exception.ScheduleException;
-import com.bsth.service.schedule.utils.DataToolsProperties;
-import com.bsth.service.schedule.utils.DataToolsService;
-import jxl.Cell;
-import jxl.Sheet;
-import jxl.Workbook;
+import com.bsth.service.schedule.utils.*;
 import jxl.write.Label;
 import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
@@ -39,26 +35,45 @@ public class ScheduleRule1FlatDataToolsImpl implements DataToolsService {
     private DataToolsProperties dataToolsProperties;
     @Override
-    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+    public DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException {
         try {
-            // 对上传的excel文件做处理，将第一个sheet名字设定为工作表1
-            File file = dataToolsService.uploadFile(filename, filedata);
-            Workbook workbook = Workbook.getWorkbook(file);
-            Sheet sheet = workbook.getSheet(0);
+            // 对上传的excel文件做处理
+            // 将第一个sheet保存成一个xls文件
+            DataToolsFile dataToolsFile = dataToolsService.uploadFile(filename, filedata);
+            File file = dataToolsFile.getFile();
+
+            // poi api
+            org.apache.poi.ss.usermodel.Workbook poi_workbook = dataToolsFile.getFileType().getWorkBook(file);
+            org.apache.poi.ss.usermodel.Sheet poi_sheet = poi_workbook.getSheetAt(0); // 第一个sheet
+            int rowNum = poi_sheet.getLastRowNum(); // 获取总共多少行
+            if (rowNum < 0) {
+                throw new RuntimeException("表格内容为空！");
+            }
+            int colNum = poi_sheet.getRow(0).getLastCellNum(); // 获取总共多少列，以第一行为主
+            // jxl api
             File fileCal = new File(file.getAbsolutePath() + "_sheetChange.xls");
-            WritableWorkbook writableWorkbook = Workbook.createWorkbook(fileCal);
+            WritableWorkbook writableWorkbook = jxl.Workbook.createWorkbook(fileCal);
             WritableSheet writableSheet = writableWorkbook.createSheet("工作表1", 0);
-            for (int i = 0; i < sheet.getRows(); i++) {
-                Cell[] cells = sheet.getRow(i);
-                for (int j = 0; j < cells.length; j++) {
-                    writableSheet.addCell(new Label(j, i, cells[j].getContents()));
+
+            for (int i = 0; i <= rowNum; i++) {
+                for (int j = 0; j <= colNum; j++) {
+                    // poi读
+                    String cellContent = PoiUtils.getStringValueFromCell(poi_sheet.getRow(i).getCell(j));
+                    // jxl写
+                    writableSheet.addCell(new Label(j, i, cellContent));
                 }
+
             }
             writableWorkbook.write();
             writableWorkbook.close();
+            poi_workbook.close();
+
+            DataToolsFile dataToolsFile1 = new DataToolsFile();
+            dataToolsFile1.setFile(fileCal);
+            dataToolsFile1.setFileType(DataToolsFileType.XLS);
-            return fileCal;
+            return dataToolsFile1;
         } catch (Exception exp) {
             throw new ScheduleException(exp);
@@ -96,7 +111,7 @@ public class ScheduleRule1FlatDataToolsImpl implements DataToolsService {
     }
     @Override
-    public File exportData(Map<String, Object> params) throws ScheduleException {
+    public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException {
         try {
             LOGGER.info("//---------------- 导出排版规则信息 start... ----------------//");
             // 创建ktr转换所需参数
@@ -110,7 +125,7 @@ public class ScheduleRule1FlatDataToolsImpl implements DataToolsService {
             ktrParms.putAll(params);
-            File file = dataToolsService.exportData(ktrParms);
+            DataToolsFile file = dataToolsService.exportData(ktrParms);
             LOGGER.info("//---------------- 导出排版规则信息 success... ----------------//");
 package com.bsth.service.schedule.datatools;
 import com.bsth.service.schedule.exception.ScheduleException;
-import com.bsth.service.schedule.utils.DataToolsProperties;
-import com.bsth.service.schedule.utils.DataToolsService;
-import jxl.Cell;
+import com.bsth.service.schedule.utils.*;
 import jxl.Sheet;
 import jxl.Workbook;
 import jxl.write.Label;
 import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Row;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,10 +39,10 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
     private DataToolsProperties dataToolsProperties;
     @Override
-    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+    public DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException {
         try {
             // 对上传的excel文件做处理，将第一个sheet名字设定为工作表1
-            File file = dataToolsService.uploadFile(filename, filedata);
+            DataToolsFile file = dataToolsService.uploadFile(filename, filedata);
 //            Workbook workbook = Workbook.getWorkbook(file);
 //            Sheet sheet = workbook.getSheet(0);
 //
@@ -73,7 +72,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
         try {
             LOGGER.info("//---------------- 导入时刻表明细 start... ----------------//");
-            String filename = file.getAbsolutePath(); // xls文件名
+            String filename = file.getAbsolutePath(); // xls xlsx 文件名
             String sheetname = String.valueOf(params.get("sheetname")); // sheet名字
             Long ttid = Long.valueOf(String.valueOf(params.get("ttid"))); // 时刻表id
             Long xlid = Long.valueOf(String.valueOf(params.get("xlid"))); // 线路id
@@ -89,27 +88,45 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
             // 1、修改已经上传的excel文件，在每个起点站后标示数字，表示第几个班次
             // 2、由于格式问题，需要把内容都转换成字符串
             List<String> colList = new ArrayList<>();
-            Workbook workbook = Workbook.getWorkbook(new File(filename));
-            Sheet sheet = workbook.getSheet(sheetname);
-            Cell[] cells = sheet.getRow(0);
-            for (int i = 0; i < cells.length; i++) {
+
+            // poi api，并读取第一行数据，组合成站点列表，逗号分隔
+            org.apache.poi.ss.usermodel.Workbook poi_workbook;
+            org.apache.poi.ss.usermodel.Sheet poi_sheet;
+            if (DataToolsFileType.XLS.isThisType(file)) {
+                poi_workbook = DataToolsFileType.XLS.getWorkBook(file);
+            } else if (DataToolsFileType.XLSX.isThisType(file)) {
+                poi_workbook = DataToolsFileType.XLSX.getWorkBook(file);
+            } else {
+                throw new Exception("不是xls xlsx文件!");
+            }
+            poi_sheet = poi_workbook.getSheet(sheetname);
+            int rownums = poi_sheet.getLastRowNum() + 1;
+            int colnums = poi_sheet.getRow(0).getLastCellNum();
+            Row firstrow = poi_sheet.getRow(0);
+            for (int i = 0; i < colnums; i++) {
+                org.apache.poi.ss.usermodel.Cell cell = firstrow.getCell(i);
                 if (i == 0) {
-                    colList.add(cells[i].getContents().trim());
+                    colList.add(PoiUtils.getStringValueFromCell(cell).trim());
                 } else {
-                    colList.add(cells[i].getContents() + i);
+                    colList.add(PoiUtils.getStringValueFromCell(cell) + i);
                 }
             }
+            // jxl api
             File fileCal = new File(filename + "_stringType.xls");
-            WritableWorkbook writableWorkbook = Workbook.createWorkbook(fileCal, workbook);
-            WritableSheet sheet1 = writableWorkbook.getSheet(sheetname);
-            for (int i = 0; i < sheet1.getColumns(); i++) { // 第一行数据
+            WritableWorkbook writableWorkbook = Workbook.createWorkbook(fileCal);
+            WritableSheet sheet1 = writableWorkbook.createSheet(sheetname, 0);
+            for (int i = 0; i < colnums; i++) { // 第一行数据
                 sheet1.addCell(new Label(i, 0, colList.get(i)));
             }
-            for (int i = 1; i < sheet1.getRows(); i++) { // 第二行开始
-                Cell[] cells1 = sheet.getRow(i);
-                for (int j = 0; j < cells1.length; j++) {
-                    sheet1.addCell(new Label(j, i, cells1[j].getContents()));
+            for (int i = 1; i < rownums; i++) { // 第二行开始
+                for (int j = 0; j < colnums; j++) {
+                    // poi读
+                    String cellContent = PoiUtils.getStringValueFromCell(
+                            poi_sheet.getRow(i).getCell(j)
+                    );
+                    // jxl写
+                    sheet1.addCell(new Label(j, i, cellContent));
                 }
             }
             writableWorkbook.write();
@@ -169,7 +186,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
     }
     @Override
-    public File exportData(Map<String, Object> params) throws ScheduleException {
+    public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException {
         try {
             LOGGER.info("//---------------- 导出时刻表明细 start... ----------------//");
@@ -188,7 +205,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
             ktrParms.put("injectktrfile", ktrFile2.getAbsolutePath()); // 注入元数据的ktr文件
             ktrParms.put("ttinfoid", String.valueOf(params.get("ttinfoid")));
-            File file = dataToolsService.exportData(ktrParms);
+            DataToolsFile file = dataToolsService.exportData(ktrParms);
             LOGGER.info("//---------------- 导出时刻表明细 success... ----------------//");
@@ -4,6 +4,7 @@ import com.bsth.entity.search.CustomerSpecs;
 import com.bsth.repository.BaseRepository;
 import com.bsth.service.schedule.BService;
 import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsFile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -111,7 +112,7 @@ public class BServiceImpl&lt;T, ID extends Serializable&gt; implements BService&lt;T, ID&gt;
     }
     @Override
-    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+    public DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException {
         throw new ScheduleException("子类自己复写此方法！");
     }
@@ -121,7 +122,7 @@ public class BServiceImpl&lt;T, ID extends Serializable&gt; implements BService&lt;T, ID&gt;
     }
     @Override
-    public File exportData(Map<String, Object> params) throws ScheduleException {
+    public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException {
         throw new ScheduleException("子类自己复写此方法！");
     }
 }
@@ -5,6 +5,7 @@ import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.bsth.service.schedule.CarConfigInfoService;
 import com.bsth.service.schedule.ScheduleRule1FlatService;
 import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsFile;
 import com.bsth.service.schedule.utils.DataToolsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -30,7 +31,7 @@ public class CarConfigInfoServiceImpl extends BServiceImpl&lt;CarConfigInfo, Long&gt; 
     private DataToolsService dataToolsService;
     @Override
-    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+    public DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException {
         return dataToolsService.uploadFile(filename, filedata);
     }
@@ -40,7 +41,7 @@ public class CarConfigInfoServiceImpl extends BServiceImpl&lt;CarConfigInfo, Long&gt; 
     }
     @Override
-    public File exportData(Map<String, Object> params) throws ScheduleException {
+    public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException {
         return dataToolsService.exportData(params);
     }
@@ -3,6 +3,7 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.Cars;
 import com.bsth.service.schedule.CarsService;
 import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsFile;
 import com.bsth.service.schedule.utils.DataToolsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -29,12 +30,12 @@ public class CarsServiceImpl extends BServiceImpl&lt;Cars, Integer&gt; implements Cars
     }
     @Override
-    public File exportData(Map<String, Object> params) throws ScheduleException {
+    public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException {
         return dataToolsService.exportData(params);
     }
     @Override
-    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+    public DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException {
         return dataToolsService.uploadFile(filename, filedata);
     }
@@ -5,6 +5,7 @@ import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.bsth.service.schedule.EmployeeConfigInfoService;
 import com.bsth.service.schedule.ScheduleRule1FlatService;
 import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsFile;
 import com.bsth.service.schedule.utils.DataToolsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -36,7 +37,7 @@ public class EmployeeConfigInfoServiceImpl extends BServiceImpl&lt;EmployeeConfigIn
     private JdbcTemplate jdbcTemplate;
     @Override
-    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+    public DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException {
         return dataToolsService.uploadFile(filename, filedata);
     }
@@ -46,7 +47,7 @@ public class EmployeeConfigInfoServiceImpl extends BServiceImpl&lt;EmployeeConfigIn
     }
     @Override
-    public File exportData(Map<String, Object> params) throws ScheduleException {
+    public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException {
         return dataToolsService.exportData(params);
     }
@@ -3,6 +3,7 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.Personnel;
 import com.bsth.service.schedule.EmployeeService;
 import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsFile;
 import com.bsth.service.schedule.utils.DataToolsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -24,7 +25,7 @@ public class EmployeeServiceImpl extends BServiceImpl&lt;Personnel, Integer&gt; implem
     private DataToolsService dataToolsService;
     @Override
-    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+    public DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException {
         return dataToolsService.uploadFile(filename, filedata);
     }
@@ -34,7 +35,7 @@ public class EmployeeServiceImpl extends BServiceImpl&lt;Personnel, Integer&gt; implem
     }
     @Override
-    public File exportData(Map<String, Object> params) throws ScheduleException {
+    public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException {
         return dataToolsService.exportData(params);
     }
@@ -5,6 +5,7 @@ import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.service.schedule.GuideboardInfoService;
 import com.bsth.service.schedule.TTInfoDetailService;
 import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsFile;
 import com.bsth.service.schedule.utils.DataToolsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -128,7 +129,7 @@ public class GuideboardInfoServiceImpl extends BServiceImpl&lt;GuideboardInfo, Long
     }
     @Override
-    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+    public DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException {
         return dataToolsService.uploadFile(filename, filedata);
     }
@@ -138,7 +139,7 @@ public class GuideboardInfoServiceImpl extends BServiceImpl&lt;GuideboardInfo, Long
     }
     @Override
-    public File exportData(Map<String, Object> params) throws ScheduleException {
+    public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException {
         return dataToolsService.exportData(params);
     }
@@ -22,6 +22,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
+import com.bsth.data.BasicData;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
@@ -1687,7 +1688,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		return resList;
 	}
-	@Override
+	/*@Override
 	public List<Map<String, Object>> commandState(Map<String, Object> map) {
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
@@ -1869,15 +1870,15 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		return resList;
 	}
-
-	/*@Override
+*/
+	@Override
 	public List<Map<String, Object>> commandState(Map<String, Object> map) {
 		// TODO Auto-generated method stub
 		String company = map.get("company").toString();
 		String subCompany = map.get("subCompany").toString();
-		String line = map.get("line").toString();
+		String line = map.get("line").toString().trim();
 		String date = map.get("date").toString();
-		String code = map.get("code").toString();
+//		String code = map.get("code").toString();
 		String type = map.get("type").toString();
 		String sql_="select * from bsth_c_s_sp_info_real "
@@ -1889,7 +1890,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		}
-		String sql="SELECT r.id,r.schedule_date_str,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,"
+		String sql="SELECT r.id,r.schedule_date_str,r.xl_name,r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,"
 				+ " r.fcsj,d. TIMESTAMP,d.reply46,d.reply47,d.reply46time,d.reply47time,"
 				+ " r.gs_name,r.fgs_name,CONCAT(r.xl_bm,'_',r.id) as line_sch FROM ("+sql_+") "
 				+ " AS r LEFT JOIN bsth_v_directive_60 AS d ON r.id = d.sch AND d.is_dispatch = 1"
@@ -1903,6 +1904,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				map.put("id", rs.getString("id"));
 				map.put("date", rs.getString("schedule_date_str"));
 				map.put("line", rs.getString("xl_name"));
+				map.put("xlbm", rs.getString("xl_bm"));
 				map.put("clZbh", rs.getString("cl_zbh"));
 				map.put("jGh", rs.getString("j_gh"));
 				map.put("jName", rs.getString("j_name"));
@@ -1910,15 +1912,356 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				map.put("timestamp", rs.getString("timestamp"));
 				map.put("reply46", rs.getString("reply46"));
 				map.put("reply47", rs.getString("reply47"));
-				map.put("reply46time", rs.getString("reply46time"));
-				map.put("reply47time", rs.getString("reply47time"));
+				map.put("reply46time", rs.getObject("reply46time"));
+				map.put("reply47time", rs.getObject("reply47time"));
 				map.put("company", rs.getObject("gs_name"));
 				map.put("subCompany", rs.getObject("fgs_name"));
 				map.put("lineSch", rs.getString("line_sch"));
 				return map;
 			}
 		});
-		return null;
-	}*/
+		List<Map<String, Object>> list_=new ArrayList<Map<String,Object>>();
+		int jhs = 0,sjs=0,wqr=0;
+		Map<String, Object> m_;
+		for (int i = 0; i < list.size(); i++) {
+			
+			Map<String, Object> m=list.get(i);
+			if(i==0){
+				jhs ++ ;
+				if(m.get("reply46time")==null)
+					wqr++;
+				
+				if(!(m.get("reply46time")==null))
+					sjs++;
+			}else{
+				if(m.get("line").toString().equals(list.get(i-1).get("line").toString())){
+					if(!(m.get("lineSch").toString().equals(list.get(i-1).get("lineSch").toString()))){
+						jhs ++ ;
+						if(m.get("reply47time")==null)
+							wqr++;
+						
+						if(!(m.get("reply46time")==null))
+							sjs++;
+					}
+					if(i==list.size()-1){
+						m_=new HashMap<String, Object>();
+						m_.put("company", list.get(i).get("company"));
+						m_.put("subCompany", list.get(i).get("subCompany"));
+						m_.put("date", date);
+						m_.put("line", list.get(i).get("line"));
+						m_.put("xlbm", list.get(i).get("xlbm"));
+	//						m_.put("clZbh", list.get(i).get("clZbh"));
+	//						m_.put("jsy", list.get(i).get("jGh")+"/"+ list.get(i-1).get("jName"));
+						m_.put("jhf", jhs);
+						m_.put("sjf", sjs);
+						m_.put("wqr", wqr);
+						list_.add(m_);
+					}
+				}else{
+					m_=new HashMap<String, Object>();
+					m_.put("company", list.get(i-1).get("company"));
+					m_.put("subCompany", list.get(i-1).get("subCompany"));
+					m_.put("date", date);
+					m_.put("line", list.get(i-1).get("line"));
+					m_.put("xlbm", list.get(i-1).get("xlbm"));
+//					m_.put("clZbh", list.get(i-1).get("clZbh"));
+//					m_.put("jsy", list.get(i-1).get("jGh")+"/"+ list.get(i).get("jName"));
+					m_.put("jhf", jhs);
+					m_.put("sjf", sjs);
+					m_.put("wqr", wqr);
+					list_.add(m_);
+					
+					jhs =0;sjs=0;wqr=0;
+					
+					jhs ++ ;
+					if(m.get("reply46time")==null)
+						wqr++;
+					
+					if(!(m.get("reply46time")==null))
+						sjs++;
+					
+					if(i==list.size()-1){
+						m_=new HashMap<String, Object>();
+						m_.put("company", list.get(i).get("company"));
+						m_.put("subCompany", list.get(i).get("subCompany"));
+						m_.put("date", date);
+						m_.put("line", list.get(i).get("line"));
+						m_.put("xlbm", list.get(i).get("xlbm"));
+//						m_.put("clZbh", list.get(i).get("clZbh"));
+//						m_.put("jsy", list.get(i).get("jGh")+"/"+ list.get(i).get("jName"));
+						m_.put("jhf", jhs);
+						m_.put("sjf", sjs);
+						m_.put("wqr", wqr);
+						list_.add(m_);
+					}
+				}
+			}
+		}
+		
+		if(type.equals("export")){
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+					sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String,Object> m = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+			try {
+				listI.add(list_.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould/commandState.xls",
+						path+"export/指令状态分析" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		return list_;
+	}
+
+	@Override
+	public List<Map<String, Object>> commandByLineList(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		
+		String line = map.get("line").toString().trim();
+		String date = map.get("date").toString();
+//		String code = map.get("code").toString();
+		String type = map.get("type").toString();
+		
+		String sql_="select * from bsth_c_s_sp_info_real "
+				+ " WHERE schedule_date_str = '"+date+"'  and xl_bm = '"+line+"'";
+						
+		
+		String sql="SELECT r.id,r.schedule_date_str,r.xl_name,r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,"
+				+ " r.fcsj,d. TIMESTAMP,d.reply46,d.reply47,d.reply46time,d.reply47time,"
+				+ " r.gs_name,r.fgs_name,CONCAT(r.j_gh,'_',r.id) as gh_sch FROM ("+sql_+") "
+				+ " AS r LEFT JOIN bsth_v_directive_60 AS d ON r.id = d.sch AND d.is_dispatch = 1"
+				+ " order by r.j_gh,r.cl_zbh,r.id,d.timestamp desc ";
+		
+		
+		List<Map<String, Object>> list = jdbcTemplate.query(sql,
+				new RowMapper<Map<String, Object>>(){
+			@Override
+			public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
+				Map<String, Object> map = new HashMap<String, Object>();
+				map.put("id", rs.getString("id"));
+				map.put("date", rs.getString("schedule_date_str"));
+				map.put("line", rs.getString("xl_name"));
+				map.put("xlbm", rs.getString("xl_bm"));
+				map.put("clZbh", rs.getString("cl_zbh"));
+				map.put("jGh", rs.getString("j_gh"));
+				map.put("jName", rs.getString("j_name"));
+				map.put("fcsj", rs.getString("fcsj"));
+				map.put("timestamp", rs.getString("timestamp"));
+				map.put("reply46", rs.getString("reply46"));
+				map.put("reply47", rs.getString("reply47"));
+				map.put("reply46time", rs.getObject("reply46time"));
+				map.put("reply47time", rs.getObject("reply47time"));
+				map.put("company", rs.getObject("gs_name"));
+				map.put("subCompany", rs.getObject("fgs_name"));
+				map.put("ghSch", rs.getString("gh_sch"));
+				return map;
+			}
+		});
+		
+		List<Map<String, Object>> list_=new ArrayList<Map<String,Object>>();
+		int jhs = 0,sjs=0,wqr=0;
+		Map<String, Object> m_;
+		for (int i = 0; i < list.size(); i++) {
+			
+			Map<String, Object> m=list.get(i);
+			if(i==0){
+				jhs ++ ;
+				if(m.get("reply46time")==null)
+					wqr++;
+				
+				if(!(m.get("reply46time")==null))
+					sjs++;
+			}else{
+				if(m.get("jGh").toString().equals(list.get(i-1).get("jGh").toString())
+						&& m.get("clZbh").toString().equals(list.get(i-1).get("clZbh").toString())){
+					if(!(m.get("ghSch").toString().equals(list.get(i-1).get("ghSch").toString()))){
+						jhs ++ ;
+						if(m.get("reply47time")==null)
+							wqr++;
+						
+						if(!(m.get("reply46time")==null))
+							sjs++;
+					}
+					if(i==list.size()-1){
+						m_=new HashMap<String, Object>();
+						m_.put("company", list.get(i).get("company"));
+						m_.put("subCompany", list.get(i).get("subCompany"));
+						m_.put("date", date);
+						m_.put("line", list.get(i).get("line"));
+						m_.put("xlbm", list.get(i).get("xlbm"));
+						m_.put("clZbh", list.get(i).get("clZbh"));
+						m_.put("jGh", list.get(i).get("jGh"));
+						m_.put("jsy", list.get(i).get("jGh")+"/"+ list.get(i).get("jName"));
+						m_.put("jhf", jhs);
+						m_.put("sjf", sjs);
+						m_.put("wqr", wqr);
+						list_.add(m_);
+					}
+				}else{
+					m_=new HashMap<String, Object>();
+					m_.put("company", list.get(i-1).get("company"));
+					m_.put("subCompany", list.get(i-1).get("subCompany"));
+					m_.put("date", date);
+					m_.put("line", list.get(i-1).get("line"));
+					m_.put("xlbm", list.get(i-1).get("xlbm"));
+					m_.put("clZbh", list.get(i-1).get("clZbh"));
+					m_.put("jGh", list.get(i).get("jGh"));
+					m_.put("jsy", list.get(i-1).get("jGh")+"/"+ list.get(i-1).get("jName"));
+					m_.put("jhf", jhs);
+					m_.put("sjf", sjs);
+					m_.put("wqr", wqr);
+					list_.add(m_);
+					
+					jhs =0;sjs=0;wqr=0;
+					
+					jhs ++ ;
+					if(m.get("reply46time")==null)
+						wqr++;
+					
+					if(!(m.get("reply46time")==null))
+						sjs++;
+					
+					if(i==list.size()-1){
+						m_=new HashMap<String, Object>();
+						m_.put("company", list.get(i).get("company"));
+						m_.put("subCompany", list.get(i).get("subCompany"));
+						m_.put("date", date);
+						m_.put("line", list.get(i).get("line"));
+						m_.put("xlbm", list.get(i).get("xlbm"));
+						m_.put("clZbh", list.get(i).get("clZbh"));
+						m_.put("jGh", list.get(i).get("jGh"));
+						m_.put("jsy", list.get(i).get("jGh")+"/"+ list.get(i).get("jName"));
+						m_.put("jhf", jhs);
+						m_.put("sjf", sjs);
+						m_.put("wqr", wqr);
+						list_.add(m_);
+					}
+				}
+			}
+		}
+		
+		
+		if(type.equals("export")){
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+					sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String,Object> m = new HashMap<String, Object>();
+			m.put("xlmc", BasicData.lineId2CodeMap.get(line));
+			ReportUtils ee = new ReportUtils();
+			try {
+				listI.add(list_.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould/commandState1.xls",
+						path+"export/线路指令状态分析" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		return list_;
+		
+	}
+
+	@Override
+	public List<Map<String, Object>> commandByJghList(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+
+		String line = map.get("line").toString().trim();
+		String date = map.get("date").toString();
+		String jgh = map.get("jgh").toString();
+//		String code = map.get("code").toString();
+		String type = map.get("type").toString();
+		
+		String sql_="select * from bsth_c_s_sp_info_real "
+				+ " WHERE schedule_date_str = '"+date+"'  and j_gh = '"+jgh+"'";
+		
+		if(!line.equals("")){
+			sql_ +=" and xl_bm = '"+line+"'";
+		}
+						
+		
+		String sql="SELECT r.id,r.schedule_date_str,r.fcsj,r.xl_name,r.xl_bm,r.cl_zbh,r.j_gh,r.j_name,"
+				+ " r.fcsj,d. TIMESTAMP,d.reply46,d.reply47,d.reply46time,d.reply47time,"
+				+ " r.gs_name,r.fgs_name  FROM ("+sql_+") "
+				+ " AS r LEFT JOIN bsth_v_directive_60 AS d ON r.id = d.sch AND d.is_dispatch = 1"
+				+ " order by r.fcsj,r.cl_zbh  desc ";
+		
+		
+		List<Map<String, Object>> list = jdbcTemplate.query(sql,
+				new RowMapper<Map<String, Object>>(){
+			@Override
+			public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
+				Map<String, Object> map = new HashMap<String, Object>();
+				map.put("id", rs.getString("id"));
+				map.put("date", rs.getString("schedule_date_str"));
+				map.put("fcsj", rs.getString("fcsj"));
+				map.put("line", rs.getString("xl_name"));
+				map.put("xlbm", rs.getString("xl_bm"));
+				map.put("clZbh", rs.getString("cl_zbh"));
+				map.put("jGh", rs.getString("j_gh"));
+				map.put("jName", rs.getString("j_name"));
+				map.put("fcsj", rs.getString("fcsj"));
+				map.put("timestamp", rs.getString("timestamp"));
+				map.put("reply46", rs.getString("reply46"));
+				map.put("reply47", rs.getString("reply47"));
+				map.put("reply46time", rs.getObject("reply46time"));
+				map.put("reply47time", rs.getObject("reply47time"));
+				map.put("company", rs.getObject("gs_name"));
+				map.put("subCompany", rs.getObject("fgs_name"));
+				return map;
+			}
+		});
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		List<Map<String, Object>> list_=new ArrayList<Map<String,Object>>();
+		Map<String, Object> m_;
+		for (int i = 0; i < list.size(); i++) {
+			Map<String, Object> m=list.get(i);
+			m_=new HashMap<String, Object>();
+			m_.put("company", m.get("company"));
+			m_.put("subCompany",m.get("subCompany"));
+			m_.put("date", date);
+			m_.put("line",m.get("line"));
+			m_.put("clZbh", m.get("clZbh"));
+			m_.put("jsy", m.get("jGh")+"/"+ m.get("jName"));
+			m_.put("jfsj", m.get("fcsj"));
+			if(m.get("timestamp") != null){
+				m_.put("time", sdf.format(new Date(Long.valueOf(m.get("timestamp").toString()))));
+			} else 
+				m_.put("time", "/");
+			
+			if(m.get("reply46time") != null)
+				m_.put("time46", sdf.format(new Date(Long.valueOf(m.get("reply46time").toString()))));
+			else 
+				m_.put("time46", "/");
+			
+			if(m.get("reply47time") != null)
+				m_.put("time47", sdf.format(new Date(Long.valueOf(m.get("reply47time").toString()))));
+			else 
+				m_.put("time47", "/");
+			list_.add(m_);
+		}
+		
+		if(type.equals("export")){
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+					sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String,Object> m = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+			try {
+				listI.add(list_.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould/commandState2.xls",
+						path+"export/指令状态明细" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		return list_;
+	}
 }
@@ -3,6 +3,7 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.bsth.service.schedule.ScheduleRule1FlatService;
 import com.bsth.service.schedule.exception.ScheduleException;
+import com.bsth.service.schedule.utils.DataToolsFile;
 import com.bsth.service.schedule.utils.DataToolsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -21,7 +22,7 @@ public class ScheduleRule1FlatServiceImpl extends BServiceImpl&lt;ScheduleRule1Flat
     private DataToolsService dataToolsService;
     @Override
-    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+    public DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException {
         return dataToolsService.uploadFile(filename, filedata);
     }
@@ -31,7 +32,7 @@ public class ScheduleRule1FlatServiceImpl extends BServiceImpl&lt;ScheduleRule1Flat
     }
     @Override
-    public File exportData(Map<String, Object> params) throws ScheduleException {
+    public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException {
         return dataToolsService.exportData(params);
     }
 }
@@ -23,30 +23,29 @@ import com.bsth.service.schedule.GuideboardInfoService;
 import com.bsth.service.schedule.TTInfoDetailService;
 import com.bsth.service.schedule.datatools.TTInfoDetailForEdit;
 import com.bsth.service.schedule.exception.ScheduleException;
-import com.bsth.service.schedule.utils.DataToolsProperties;
+import com.bsth.service.schedule.utils.DataToolsFile;
+import com.bsth.service.schedule.utils.DataToolsFileType;
 import com.bsth.service.schedule.utils.DataToolsService;
-import jxl.Cell;
-import jxl.Sheet;
-import jxl.Workbook;
-import jxl.write.Label;
-import jxl.write.WritableSheet;
-import jxl.write.WritableWorkbook;
+import com.bsth.service.schedule.utils.PoiUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -122,7 +121,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
     }
     @Override
-    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+    public DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException {
         return dataToolsService.uploadFile(filename, filedata);
     }
@@ -134,7 +133,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
     }
     @Override
-    public File exportData(Map<String, Object> params) throws ScheduleException {
+    public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException {
         return dataToolsService.exportData(params);
     }
@@ -152,17 +151,30 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
     @Override
     public void validateExcelSheet(String filename, String sheetname, Integer lineid, String linename) throws ScheduleException {
         try {
-            Workbook book = Workbook.getWorkbook(new File(filename));
-            Sheet sheet = book.getSheet(sheetname);
-            if (sheet.getRows() == 0 || sheet.getColumns() == 0) { // 工作区是否为空
+            File file = new File(filename);
+            Workbook workbook;
+
+            if (DataToolsFileType.XLS.isThisType(file)) {
+                workbook = DataToolsFileType.XLS.getWorkBook(file);
+            } else if (DataToolsFileType.XLSX.isThisType(file)) {
+                workbook = DataToolsFileType.XLSX.getWorkBook(file);
+            } else {
+                throw new Exception("不是xls xlsx文件！");
+            }
+
+            Sheet sheet = workbook.getSheet(sheetname);
+            int rowNums = sheet.getLastRowNum() + 1; // 基于0 base的，长度加1
+            int colNums = sheet.getRow(0).getLastCellNum(); // 不需要加1，就是长度
+
+            if (rowNums == 0 || colNums == 0) { // 工作区是否为空
                 throw new Exception(String.format("%s 工作区没有数据！", sheetname));
             } else {
-                if (sheet.getRows() <= 1 || sheet.getColumns() <= 1) {
+                if (rowNums <= 1 || rowNums <= 1) {
                     throw new Exception(String.format("工作区至少包含2行2列的数据"));
                 } else {
-                    Cell[] cells = sheet.getRow(0); // 获取第一行数据列
-                    for (int i = 0; i < cells.length; i++) {
-                        String cell_con = StringUtils.trimToEmpty(cells[i].getContents()); // trimToEmpty
+                    Row firstRow = sheet.getRow(0); // 获取第一行数据列
+                    for (int i = 0; i < colNums; i++) {
+                        String cell_con = StringUtils.trimToEmpty(PoiUtils.getStringValueFromCell(firstRow.getCell(i))); // trimToEmpty
                         if (StringUtils.isEmpty(cell_con)) {
                             throw new Exception(String.format("第1行，第%d列数据不能为空", i + 1));
@@ -203,9 +215,9 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                     // 验证路牌内容
                     Map<String, Integer> gbindexmap = new HashMap<>(); // 记录每个路牌在第几行
-                    for (int i = 1; i < sheet.getRows(); i++) { // 从第2行开始验证数据
-                        Cell bcell = sheet.getRow(i)[0]; // 获取第1列
-                        String bcell_con = StringUtils.trimToEmpty(bcell.getContents()); // trimToEmpty
+                    for (int i = 1; i < rowNums; i++) { // 从第2行开始验证数据
+                        Cell cell = sheet.getRow(i).getCell(0); // 获取第1列
+                        String bcell_con = StringUtils.trimToEmpty(PoiUtils.getStringValueFromCell(cell)); // trimToEmpty
                         if (StringUtils.isEmpty(bcell_con)) {
                             throw new Exception(String.format("第%d行，第1列路牌无数据", i + 1));
                         } else if (gbindexmap.get(bcell_con.trim()) != null) {
@@ -236,10 +248,10 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                     Pattern p2 = Pattern.compile(rex2);
                     Pattern p3 = Pattern.compile(rex3);
-                    for (int i = 1; i < sheet.getRows(); i++) { // 从第2行开始验证数据
-                        Cell[] bcells = sheet.getRow(i);
-                        for (int j = 1; j < bcells.length; j++) { // 从第2列开始
-                            String bcell_con = StringUtils.trimToEmpty(bcells[j].getContents()); // trimToEmpty
+                    for (int i = 1; i < rowNums; i++) { // 从第2行开始验证数据
+                        Row row = sheet.getRow(i);
+                        for (int j = 1; j < colNums; j++) { // 从第2列开始
+                            String bcell_con = StringUtils.trimToEmpty(PoiUtils.getStringValueFromCell(row.getCell(j))); // trimToEmpty
                             if (StringUtils.isNotEmpty(bcell_con)) {
                                 Matcher m1 = p1.matcher(bcell_con.trim());
                                 Matcher m2 = p2.matcher(bcell_con.trim());
@@ -253,6 +265,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                 }
             }
+
         } catch (Exception exp) {
             exp.printStackTrace();
             throw new ScheduleException(exp.getMessage());
@@ -315,13 +328,13 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
     }
     /**
-     * @description : (TODO) 时刻表明细模型数据保存.
+     * @description (TODO) 时刻表明细模型数据保存.
      * 
-     * @param : [map]
+     * @param  map
      * 
      * @return : 返回保存操作后的状态.
      * 
-     * @exception : 处理所有抛出来的异常.
+     * @exception 处理所有抛出来的异常.
      * */
     @Transactional
    	public Map<String, Object> skbDetailMxSave(Map<String, Object> map) {
@@ -347,11 +360,11 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
     /**
      * @description : (TODO) json班次数据转list班次.
      * 
-     * @param : [jsonStr--班次json字符串]
+     * @param  jsonStr 班次json字符串]
      * 
-     * @return :返回一个list分装的班次数据.
+     * @return 返回一个list分装的班次数据.
      * 
-     * @status : OK.
+     * @status OK.
      * */
    	public List<TTInfoDetail> jsonArrayToListEntity(String jsonStr) throws Exception {
    		// 1、创建list分装的时刻表明细实体对象数据.
@@ -369,9 +382,9 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
    	/**
    	 * @description : (TODO) 班次map对象转实体对象.
    	 * 
-   	 * @param : [obj-班次map对象].
+   	 * @param obj 班次map对象.
    	 * 
-   	 * @return : 返回一个班次实体对象.
+   	 * @return 返回一个班次实体对象.
    	 * 
    	 * @exception 异常暂先抛出去.
    	 * */
@@ -427,7 +440,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
    	/**
    	 * @description : (TODO) int转boolean类型.
    	 * 
-   	 * @param : [value--int类型的数值]
+   	 * @param value--int类型的数值]
    	 * 
    	 * @return : 返回一个布尔类型值.
    	 * */
@@ -441,9 +454,9 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
    	} 
    	/**
-   	 * @description : (TODO) 获取路牌.
+   	 * @description (TODO) 获取路牌.
    	 * 
-   	 * @param [xl--线路,name--路牌名称,code--路牌编码,lpType--路牌类型]
+   	 * @param xl --线路,name--路牌名称,code--路牌编码,lpType--路牌类型]
    	 * 
    	 * @return 返回路牌.
    	 * */
@@ -479,11 +492,11 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
    	/**
    	 * @description : (TODO) 线路方向转代码.
    	 * 
-   	 * @param : [str--方向字符串]
+   	 * @param str--方向字符串]
    	 * 
    	 * @return 返回方向代码.
    	 * 
-   	 * @exception : 异常暂先抛出.
+   	 * @exception 异常暂先抛出.
    	 * */
    	public String dirToCod(String str) throws Exception {
    		String c = "";
+package com.bsth.service.schedule.utils;
+
+import java.io.File;
+
+/**
+ * 数据工具文件（操作后的）。
+ */
+public class DataToolsFile {
+    /** 文件类型 */
+    private DataToolsFileType fileType;
+    /** 具体文件 */
+    private File file;
+
+    public DataToolsFileType getFileType() {
+        return fileType;
+    }
+
+    public void setFileType(DataToolsFileType fileType) {
+        this.fileType = fileType;
+    }
+
+    public File getFile() {
+        return file;
+    }
+
+    public void setFile(File file) {
+        this.file = file;
+    }
+}
+package com.bsth.service.schedule.utils;
+
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.tika.Tika;
+
+import java.io.File;
+import java.io.FileInputStream;
+
+/**
+ * 数据工具文件类型。
+ */
+public enum DataToolsFileType {
+    XLS { // excel xls 文件
+        @Override
+        public boolean isThisType(byte[] fileData) {
+            Tika tika = new Tika();
+            String type = tika.detect(fileData);
+
+            // application/x-tika-msoffice
+            if ("application/vnd.ms-excel".equals(type) ||
+                    "application/x-tika-msoffice".equals(type)) {
+                // .xls 2007的格式
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        @Override
+        public boolean isThisType(File file) {
+            try {
+                Tika tika = new Tika();
+                String type = tika.detect(file);
+
+                // application/x-tika-msoffice
+                if ("application/vnd.ms-excel".equals(type) ||
+                        "application/x-tika-msoffice".equals(type)) {
+                    // .xls 2007的格式
+                    return true;
+                } else {
+                    return false;
+                }
+
+            } catch (Exception exp) {
+                throw new RuntimeException(exp);
+            }
+
+        }
+
+        @Override
+        public String getNewFileName(String... fileNames) {
+            StringBuilder stringBuilder = new StringBuilder();
+            for (String fn: fileNames) {
+                stringBuilder.append(fn);
+            }
+            stringBuilder.append(".xls");
+            return stringBuilder.toString();
+        }
+
+        @Override
+        public Workbook getWorkBook(File file) {
+            try {
+                return new HSSFWorkbook(new FileInputStream(file));
+            } catch (Exception exp) {
+                throw new RuntimeException(exp);
+            }
+        }
+    },
+    XLSX { // excel xlsx 文件
+        @Override
+        public boolean isThisType(byte[] fileData) {
+            Tika tika = new Tika();
+            String type = tika.detect(fileData);
+
+            // application/x-tika-ooxml
+            if ("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet".equals(type) ||
+                    "application/x-tika-ooxml".equals(type)) {
+                // .xlsx 2007之后的格式
+                return true;
+            } else {
+                return false;
+            }
+
+        }
+
+        @Override
+        public boolean isThisType(File file) {
+            try {
+                Tika tika = new Tika();
+                String type = tika.detect(file);
+
+                // application/x-tika-ooxml
+                if ("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet".equals(type) ||
+                        "application/x-tika-ooxml".equals(type)) {
+                    // .xlsx 2007之后的格式
+                    return true;
+                } else {
+                    return false;
+                }
+
+            } catch (Exception exp) {
+                throw new RuntimeException(exp);
+            }
+        }
+
+        @Override
+        public String getNewFileName(String... fileNames) {
+            StringBuilder stringBuilder = new StringBuilder();
+            for (String fn: fileNames) {
+                stringBuilder.append(fn);
+            }
+            stringBuilder.append(".xlsx");
+            return stringBuilder.toString();
+        }
+
+        @Override
+        public Workbook getWorkBook(File file) {
+            try {
+                return new XSSFWorkbook(file);
+            } catch (Exception exp) {
+                throw new RuntimeException(exp);
+            }
+
+        }
+    };
+
+    /**
+     * 判定是否是此文件类型。
+     * @param fileData
+     * @return
+     */
+    public abstract boolean isThisType(byte[] fileData);
+
+    /**
+     * 判定文件类型。
+     * @param file
+     * @return
+     */
+    public abstract boolean isThisType(File file);
+
+    /**
+     * 生成对应的文件名
+     * @param fileNames 文件名组成部份
+     * @return
+     */
+    public abstract String getNewFileName(String ... fileNames);
+
+    /**
+     * 获取Excel工作本对象。
+     * @param file 文件
+     * @return
+     */
+    public abstract Workbook getWorkBook(File file);
+}
@@ -11,9 +11,9 @@ import java.util.Map;
 public interface DataToolsService {
     //----------------- 数据服务操作 --------------//
     // 上传文件
-    File uploadFile(String filename, byte[] filedata) throws ScheduleException;
+    DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException;
     // 导入数据
     void importData(File file, Map<String, Object> params) throws ScheduleException;
     // 导出数据
-    File exportData(Map<String, Object> params) throws ScheduleException;
+    DataToolsFile exportData(Map<String, Object> params) throws ScheduleException;
 }
@@ -2,7 +2,6 @@ package com.bsth.service.schedule.utils;
 import com.bsth.service.schedule.exception.ScheduleException;
 import com.google.common.io.Files;
-import org.apache.tika.Tika;
 import org.joda.time.DateTime;
 import org.pentaho.di.core.KettleEnvironment;
 import org.pentaho.di.core.logging.KettleLogStore;
@@ -91,33 +90,46 @@ public class DataToolsServiceImpl implements DataToolsService {
     }
     @Override
-    public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
+    public DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException {
         // 上传文件
         try {
             initKettle();
             LOGGER.info("start uploadFile...originalFilename={}", filename);
-            File newFile = new File(dataToolsProperties.getFileuploadDir() + File.separator +
-                    filename + "-upload-" + new DateTime().toString("yyyyMMddHHmmss") + ".xls");
-            // TODO：判定是否excel数据
-            Tika tika = new Tika();
-            String type = tika.detect(filedata);
-            // application/x-tika-msoffice
-            LOGGER.info("文件格式={}", type);
-            if ("application/vnd.ms-excel".equals(type) || "application/x-tika-msoffice".equals(type)) {
-                // .xls 2007的格式
-                Files.write(filedata, newFile);
-            } else if ("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet".equals(type)) {
-                // .xlsx 2007之后的格式
-                throw new Exception("暂时不支持.xlsx格式文件！");
+
+            DataToolsFile dataToolsFile = new DataToolsFile();
+
+            // 判定文件类型（目前只支持xls，xlsx文件）
+            if (DataToolsFileType.XLS.isThisType(filedata)) {
+                // xls文件
+                dataToolsFile.setFileType(DataToolsFileType.XLS);
+                dataToolsFile.setFile(new File(DataToolsFileType.XLS.getNewFileName(
+                        dataToolsProperties.getFileuploadDir(),
+                        File.separator,
+                        filename,
+                        "-upload-",
+                        new DateTime().toString("yyyyMMddHHmmss")
+                )));
+                Files.write(filedata, dataToolsFile.getFile());
+            } else if (DataToolsFileType.XLSX.isThisType(filedata)) {
+                // xlsx文件
+                dataToolsFile.setFileType(DataToolsFileType.XLSX);
+                dataToolsFile.setFile(new File(DataToolsFileType.XLSX.getNewFileName(
+                        dataToolsProperties.getFileuploadDir(),
+                        File.separator,
+                        filename,
+                        "-upload-",
+                        new DateTime().toString("yyyyMMddHHmmss")
+                )));
+                Files.write(filedata, dataToolsFile.getFile());
             } else {
                 // 非excel文件
-                throw new Exception("非.xls格式文件！");
+                throw new Exception("非.xls .xlsx 格式文件！");
             }
-            LOGGER.info("uploadFile success...newFilename={}", newFile.getAbsolutePath());
+            LOGGER.info("uploadFile success...newFilename={}", dataToolsFile.getFile().getAbsolutePath());
-            return newFile;
+            return dataToolsFile;
         } catch (Exception exp) {
             LOGGER.info("uploadFile failed...stackTrace...");
@@ -194,7 +206,7 @@ public class DataToolsServiceImpl implements DataToolsService {
     }
     @Override
-    public File exportData(Map<String, Object> params) throws ScheduleException {
+    public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException {
         // 导出数据
         String transLogId = "";
         String transMetaLogId = "";
@@ -251,7 +263,12 @@ public class DataToolsServiceImpl implements DataToolsService {
             LOGGER.info(stringBuffer.toString());
             LOGGER.info("exportData success...");
-            return new File(filepath + ".xls");
+            // 导出目前是xls格式
+            DataToolsFile dataToolsFile = new DataToolsFile();
+            dataToolsFile.setFileType(DataToolsFileType.XLS);
+            dataToolsFile.setFile(new File(filepath + ".xls"));
+
+            return dataToolsFile;
         } catch (Exception exp) {
             LOGGER.info("exportData failed...statckTrace...");
+package com.bsth.service.schedule.utils;
+
+import org.apache.poi.hssf.usermodel.HSSFDateUtil;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * POI操作的until方法。
+ */
+public class PoiUtils {
+    /**
+     * 使用poi读取cell中的值
+     * @param cell
+     * @return
+     */
+    public static String getStringValueFromCell(Cell cell) {
+        SimpleDateFormat sFormat = new SimpleDateFormat("MM/dd/yyyy");
+        DecimalFormat decimalFormat = new DecimalFormat("#.#");
+        String cellValue = "";
+        if(cell == null) {
+            return cellValue;
+        }
+        else if(cell.getCellType() == Cell.CELL_TYPE_STRING) {
+            cellValue = cell.getStringCellValue();
+        }
+
+        else if(cell.getCellType() == XSSFCell.CELL_TYPE_NUMERIC) {
+            if(HSSFDateUtil.isCellDateFormatted(cell)) {
+                double d = cell.getNumericCellValue();
+                Date date = HSSFDateUtil.getJavaDate(d);
+                cellValue = sFormat.format(date);
+            }
+            else {
+                cellValue = decimalFormat.format((cell.getNumericCellValue()));
+            }
+        }
+        else if(cell.getCellType() == Cell.CELL_TYPE_BLANK) {
+            cellValue = "";
+        }
+        else if(cell.getCellType() == Cell.CELL_TYPE_BOOLEAN) {
+            cellValue = String.valueOf(cell.getBooleanCellValue());
+        }
+        else if(cell.getCellType() == Cell.CELL_TYPE_ERROR) {
+            cellValue = "";
+        }
+        else if(cell.getCellType() == Cell.CELL_TYPE_FORMULA) {
+            cellValue = cell.getCellFormula().toString();
+        }
+        return cellValue;
+    }
+}
@@ -828,7 +828,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; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x53f3;&#x4fa7;&#x591a;&#x4f59;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x28;&#x5c;d&#x2b;&#x24;&#x29;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;&#xa;&#x2f;&#x2f; sendtime&#x5904;&#x7406;&#xff0c;hhmm&#xff0c;hh&#x3a;mm&#xff0c;hh,mm&#xa;var sendtime_calcu&#x3b;&#xa;if &#x28;sendtime.length &#x3d;&#x3d; 5&#x29; &#x7b; &#x2f;&#x2f; &#x6700;&#x957f;&#x683c;&#x5f0f;&#xff0c;&#x5305;&#x62ec;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x7edf;&#x4e00;&#x628a;&#x5206;&#x9694;&#x7b26;&#x66ff;&#x6362;&#x6210;&#x5192;&#x53f7;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;3, 2&#x29;&#x3b;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 4&#x29; &#x7b;&#xa;	if &#x28;sendtime.indexOf&#x28;&#x22;&#x3a;&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5192;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x65e0;&#x9700;&#x4fee;&#x6539;&#xa;		sendtime_calcu &#x3d; sendtime&#x3b;&#xa;	&#x7d; else if &#x28;sendtime.indexOf&#x28;&#x22;,&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x9017;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d; else &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 3&#x29; &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;1, 2&#x29;&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x505c;&#x9a76;&#xa;var ists &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x53f3;&#x4fa7;&#x591a;&#x4f59;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x28;&#x5c;d&#x2b;&#x24;&#x29;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;&#xa;&#x2f;&#x2f; sendtime&#x5904;&#x7406;&#xff0c;hhmm&#xff0c;hh&#x3a;mm&#xff0c;hh,mm&#xa;var sendtime_calcu&#x3b;&#xa;if &#x28;sendtime.length &#x3d;&#x3d; 5&#x29; &#x7b; &#x2f;&#x2f; &#x6700;&#x957f;&#x683c;&#x5f0f;&#xff0c;&#x5305;&#x62ec;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x7edf;&#x4e00;&#x628a;&#x5206;&#x9694;&#x7b26;&#x66ff;&#x6362;&#x6210;&#x5192;&#x53f7;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;3, 2&#x29;&#x3b;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 4&#x29; &#x7b;&#xa;	if &#x28;sendtime.indexOf&#x28;&#x22;&#x3a;&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5192;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x65e0;&#x9700;&#x4fee;&#x6539;&#xa;		sendtime_calcu &#x3d; sendtime&#x3b;&#xa;	&#x7d; else if &#x28;sendtime.indexOf&#x28;&#x22;,&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x9017;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d; else &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 3&#x29; &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;1, 2&#x29;&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x5168;&#x90e8;&#x4fee;&#x6b63;&#x5b8c;&#x6bd5;&#x540e;&#xff0c;&#x5982;&#x679c;&#x957f;&#x5ea6;&#x4e0d;&#x662f;5&#xff0c;&#x524d;&#x9762;&#x8865;0&#xa;if &#x28;sendtime_calcu.length &#x21;&#x3d; 5&#x29; &#x7b;&#xa;	sendtime_calcu &#x3d; &#x22;0&#x22; &#x2b; sendtime_calcu&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x505c;&#x9a76;&#xa;var ists &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
       </jsScript>    </jsScripts>    <fields>      <field>        <name>qdzname</name>
         <rename>qdzname</rename>
         <type>String</type>
@@ -828,7 +828,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; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x53f3;&#x4fa7;&#x591a;&#x4f59;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x28;&#x5c;d&#x2b;&#x24;&#x29;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;&#xa;&#x2f;&#x2f; sendtime&#x5904;&#x7406;&#xff0c;hhmm&#xff0c;hh&#x3a;mm&#xff0c;hh,mm&#xa;var sendtime_calcu&#x3b;&#xa;if &#x28;sendtime.length &#x3d;&#x3d; 5&#x29; &#x7b; &#x2f;&#x2f; &#x6700;&#x957f;&#x683c;&#x5f0f;&#xff0c;&#x5305;&#x62ec;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x7edf;&#x4e00;&#x628a;&#x5206;&#x9694;&#x7b26;&#x66ff;&#x6362;&#x6210;&#x5192;&#x53f7;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;3, 2&#x29;&#x3b;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 4&#x29; &#x7b;&#xa;	if &#x28;sendtime.indexOf&#x28;&#x22;&#x3a;&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5192;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x65e0;&#x9700;&#x4fee;&#x6539;&#xa;		sendtime_calcu &#x3d; sendtime&#x3b;&#xa;	&#x7d; else if &#x28;sendtime.indexOf&#x28;&#x22;,&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x9017;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d; else &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 3&#x29; &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;1, 2&#x29;&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x505c;&#x9a76;&#xa;var ists &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
+        <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x53f3;&#x4fa7;&#x591a;&#x4f59;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x28;&#x5c;d&#x2b;&#x24;&#x29;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;&#xa;&#x2f;&#x2f; sendtime&#x5904;&#x7406;&#xff0c;hhmm&#xff0c;hh&#x3a;mm&#xff0c;hh,mm&#xa;var sendtime_calcu&#x3b;&#xa;if &#x28;sendtime.length &#x3d;&#x3d; 5&#x29; &#x7b; &#x2f;&#x2f; &#x6700;&#x957f;&#x683c;&#x5f0f;&#xff0c;&#x5305;&#x62ec;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x7edf;&#x4e00;&#x628a;&#x5206;&#x9694;&#x7b26;&#x66ff;&#x6362;&#x6210;&#x5192;&#x53f7;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;3, 2&#x29;&#x3b;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 4&#x29; &#x7b;&#xa;	if &#x28;sendtime.indexOf&#x28;&#x22;&#x3a;&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x5192;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x65e0;&#x9700;&#x4fee;&#x6539;&#xa;		sendtime_calcu &#x3d; sendtime&#x3b;&#xa;	&#x7d; else if &#x28;sendtime.indexOf&#x28;&#x22;,&#x22;&#x29; &#x3e; 0&#x29; &#x7b; &#x2f;&#x2f; &#x9017;&#x53f7;&#x5206;&#x9694;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d; else &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;		sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;	&#x7d;&#xa;&#x7d; else if &#x28;sendtime.length &#x3d;&#x3d; 3&#x29; &#x7b; &#x2f;&#x2f; &#x65e0;&#x5206;&#x9694;&#x7b26;&#xff0c;&#x6539;&#x6210;&#x5192;&#x53f7;&#x5206;&#x9694;&#xa;	sendtime_calcu &#x3d; sendtime.substr&#x28;0, 1&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;1, 2&#x29;&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x5168;&#x90e8;&#x4fee;&#x6b63;&#x5b8c;&#x6bd5;&#x540e;&#xff0c;&#x5982;&#x679c;&#x957f;&#x5ea6;&#x4e0d;&#x662f;5&#xff0c;&#x524d;&#x9762;&#x8865;0&#xa;if &#x28;sendtime_calcu.length &#x21;&#x3d; 5&#x29; &#x7b;&#xa;	sendtime_calcu &#x3d; &#x22;0&#x22; &#x2b; sendtime_calcu&#x3b;&#xa;&#x7d;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x505c;&#x9a76;&#xa;var ists &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
       </jsScript>    </jsScripts>    <fields>      <field>        <name>qdzname</name>
         <rename>qdzname</rename>
         <type>String</type>
@@ -54,7 +54,9 @@
                             <td>内部编码:</td>
                             <td>
                                 <select class="form-control" name="nbbm" id="nbbm" style="width: 120px;"></select>
-                            </td>
+                            </td>
+                            <td>驾驶员:</td>
+                            <td><input type="text" style="width: 80px" name="jsy" id="jsy"/></td>
                             <td width="20%">
                                 <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right:0px">
                                     <i class="fa fa-search"></i> 搜索
@@ -70,7 +72,8 @@
                         <tr role="row" class="heading">
                             <th>#</th>
                             <th>日期</th>
-                            <th colspan="2">内部编码</th>
+                            <th colspan="2">内部编码</th>
+                            <th colspan="2">驾驶员</th>
                             <th colspan="2">充电量</th>
                             <th colspan="2">充电站</th>
                             <th colspan="2">备注</th>
@@ -378,7 +381,8 @@
 			{{i + 1}}
         </td>
         <td>{{obj.rq}}</td>
-        <td colspan="2">{{obj.nbbm}}</td>
+        <td colspan="2">{{obj.nbbm}}</td>
+        <td colspan="2">{{obj.jsy}}</td>
         <td colspan="2">{{obj.jdl}}</td>
 		<td colspan="2">{{obj.jdz}}</td>
 		<td>{{obj.remarks}}</td>
@@ -419,7 +419,6 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         })
         //获取加存信息
         $("#obtain").on('click', function () {
-            console.log("获取加存");
             if ($("#rq").val() != "") {
                 var params =getParamsList();
@@ -35,16 +35,17 @@
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="subCompany" style="width: 180px;"></select>
 					</div>
+					<div style="margin-top: 10px" ></div>
 					<div style="display: inline-block; margin-left: 15px;">
 						<span class="item-label" style="width: 80px;">线路: </span>
 						<select class="form-control" name="line" id="line" style="width: 180px;"></select>
 					</div>
-					<div style="margin-top: 10px" />
+					
 					<div style="display: inline-block;margin-left: 15px;">
-						<span class="item-label" style="width: 80px;">时间: </span>
+						<span class="item-label" style="width: 80px;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;时间: </span>
 						<input class="form-control" type="text" id="date" style="width: 180px;"/>
 					</div>
-					<div style="display: inline-block;margin-left: 8px">
+					<div style="display:none;margin-left: 8px">
 						<span class="item-label" style="width: 140px;">内部编码: </span>
 						<select class="form-control" name="code" id="code" style="width: 180px;"></select>
 					</div>
@@ -63,8 +64,6 @@
 								<th>公司</th>
 								<th>分公司</th>
 								<th>线路</th>
-								<th>车辆</th>
-								<th>人员</th>
 								<th>应发</th>
 								<th>实发</th>
 								<th>未确认</th>
@@ -76,7 +75,7 @@
 					</table>
 					<div id="box">&nbsp;</div>
 					<div id="works_hidden" class="hidden">
-						<span class="item-label" style="width: 80px;margin-left: 20px;">明细: </span>
+						<!-- <span class="item-label" style="width: 80px;margin-left: 20px;">明细: </span>
 						<span class="item-label" style="width: 80px;margin-left: 60px;">日期    </span>
 						<span class="item-label" style="width: 80px;" id="date1"></span>
 						<span class="item-label" style="width: 80px;margin-left: 60px;">公司    </span>
@@ -89,19 +88,21 @@
 						<span class="item-label" style="width: 80px;" id="clZbh1"></span>
 						<span class="item-label" style="width: 80px;margin-left: 60px;">人员    </span>
 						<span class="item-label" style="width: 80px;" id="jsy1"></span>
-						<span class="item-label" style="width: 80px;margin-left: 60px;"></span>
+						<span class="item-label" style="width: 80px;margin-left: 60px;"></span> -->
 						<input class="btn btn-default" type="button" id="export1" value="导出当前明细"/>
 					</div>
 					<table class="table table-bordered table-hover table-checkable" id="works">
 						<thead>
 							<tr class="hidden">
+								<th>公司</th>
+								<th>分公司</th>
 								<th>日期</th>
 								<th>线路</th>
 								<th>车辆</th>
-								<th>计划发车时间</th>
-								<th>发送时间</th>
-								<th>收到时间</th>
-								<th>确认时间</th>
+								<th>人员</th>
+								<th>应发</th>
+								<th>实发</th>
+								<th>未确认</th>
 							</tr>
 						</thead>
 						<tbody>
@@ -183,6 +184,7 @@
 		var tempData = {};
 		$.get('/report/lineList',function(xlList){
 			var data = [];
+			data.push({id: " ", text: "全部线路"});
 			$.get('/user/companyData', function(result){
 				for(var i = 0; i < result.length; i++){
 					var companyCode = result[i].companyCode;
@@ -265,6 +267,7 @@
 		var company = $("#company").val();
 		var subCompany = $("#subCompany").val();
 		function jsDoQuery(pagination){
+			$("#export").removeAttr("disabled");
 			if($("#date").val() == null || $("#date").val().trim().length == 0){
 				layer.msg("请选择时间！");
 				return;
@@ -287,29 +290,61 @@
 			$get('/pcpc/commandState', params, function(result){
 				// 把数据填充到模版中
 				var tbodyHtml = template('list_commandState',{list:result});
-				list = result;
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
-				if(result.length == 0){
-					$('#export').attr('disabled', "true");
-				} else {
-					$("#export").removeAttr("disabled");
-				}
-
-				$("#works_hidden").removeClass("hidden");
-				$("#works .hidden").removeClass("hidden");
-				$("#works_hidden").addClass("hidden");
-				$("#works").addClass("hidden");
+				$('.btn-command').on('click', openCommandByLine);
 			});		
 		}
+
+		var xlbm="";
+		function openCommandByLine(){
+			var id = $(this).data('id');
+			date = $("#date").val();
+			xlbm=id;
+			var params = {};
+			params['line'] = id;
+			params['date'] = date;
+			params['type'] = "query";
+			$("#works .hidden").removeClass("hidden");
+			$("#works_hidden").removeClass("hidden");
+			$get('/pcpc/commandByLineList',params,function(result){
+				var commandByLine = template('list_workList',{list:result});
+				$('#works tbody').html(commandByLine);
+				
+				$('.btn-command-line').on('click', openCommand);
+				$("html,body").animate({scrollTop:$("#works").offset().top},1000);
+			});
+		}
+		
+		function openCommand(){
+			var id = $(this).data('id');
+			date = $("#date").val();
+			var params = {};
+			params['jgh'] = id;
+			params['date'] = date;
+			params['line'] =xlbm;
+			$.get('/pages/forms/statement/commandStateByLine.html', function (content) {
+				layer.open({
+					type: 1,
+					area: ['800px', '600px'],
+					content: content,
+					title: '指令状态分析',
+					shift: 5,
+					scrollbar: false,
+					success: function () {
+						$('#commandByLineList').trigger('init', params);
+					}
+				});
+			});
+		}
+		
 		$("#export").on("click",function(){
 			var params = {};
 			params['line'] = line;
 			params['date'] = date;
-			params['code'] = code;
 			params['type'] = "export";
 			params['company'] = company; 
 			params['subCompany'] = subCompany;
@@ -318,45 +353,16 @@
 			});
 		});
-		var jsy = "";
-		$("#forms tbody").on("click","a",function(){
-			jsy = $(this).html();
-			$.each(list, function(i, g){
-				if(jsy == g.jsy){
-					$("#date1").html(g.date);
-					$("#line1").html(g.line);
-					$("#clZbh1").html(g.clZbh);
-					$("#jsy1").html(g.jsy);
-					$("#company2").html(g.company);
-					$("subCompany2").html(g.subCompany);
-					$("#works_hidden").removeClass("hidden");
-					$("#works").removeClass("hidden");
-					// 把数据填充到模版中
-					var tbodyHtml = template('list_workList',{list:g.workList});
-					// 把渲染好的模版html文本追加到表格中
-					$('#works tbody').html(tbodyHtml);
-				}
-			});
-
-			$("html,body").animate({scrollTop:$("#box").offset().top},1000);
-
-		});
-
 		$("#export1").on("click",function(){
 			var params = {};
-			params['jsy'] = jsy;
-			params['line'] = line;
+			params['line'] = xlbm;
 			params['date'] = date;
-			params['code'] = code;
-			params['type'] = "export1";
-			params['company'] = company; 
-			params['subCompany'] = subCompany;
-			$get('/pcpc/commandState', params, function(result){
-				window.open("/downloadFile/download?fileName=指令状态明细"+moment(date).format("YYYYMMDD"));
+			params['type'] = "export";
+			$get('/pcpc/commandByLineList', params, function(result){
+				window.open("/downloadFile/download?fileName=线路指令状态分析"+moment(date).format("YYYYMMDD"));
 			});
 		});
-
 	});
@@ -367,9 +373,10 @@
 			<td>{{obj.date}}</td>
 			<td>{{obj.company}}</td>
 			<td>{{obj.subCompany}}</td>
-			<td>{{obj.line}}</td>
-			<td>{{obj.clZbh}}</td>
-			<td><a id="jsy">{{obj.jsy}}</a></td>
+			<td>
+				<button type="button" class="btn btn-sm blue btn-command" 
+			data-id="{{obj.xlbm}}">{{obj.line}}</button>
+	
 			<td>{{obj.jhf}}</td>
 			<td>{{obj.sjf}}</td>
 			<td>{{obj.wqr}}</td>
@@ -377,7 +384,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="9"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
@@ -385,18 +392,23 @@
 <script type="text/html" id="list_workList">
 	{{each list as obj i}}
 		<tr>
-			<td>{{obj.date}}</td>
-			<td>{{obj.line}}</td>
-			<td>{{obj.clZbh}}</td>
-			<td>{{obj.fcsj}}</td>
-			<td>{{obj.time}}</td>
-			<td>{{obj.time46}}</td>
-			<td>{{obj.time47}}</td>
+		<td>{{obj.company}}</td>
+		<td>{{obj.subCompany}}</td>
+		<td>{{obj.date}}</td>
+		<td>{{obj.line}}</td>
+		<td>{{obj.clZbh}}</td>
+		<td>
+			<button type="button" class="btn btn-sm blue btn-command-line" 
+			data-id="{{obj.jGh}}">{{obj.jsy}}</button>
+        </td>
+		<td>{{obj.jhf}}</td>
+		<td>{{obj.sjf}}</td>
+		<td>{{obj.wqr}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="9"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
 \ No newline at end of file
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px; }
+	 
+	 .table > tbody + tbody {
+	   border-top: 1px solid; }
+</style>
+
+<div class="page-head">
+	<div class="page-title" style="margin-left: 20px">
+		<button id="exportList">数据导出</button>
+	</div>
+</div>
+
+<div class="row" id="commandByLineList">
+	<div class="col-md-12">
+		<div class="portlet light porttlet-fit bordered">
+			<div class="portlet-body">
+				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 600px">
+					<table class="table table-bordered table-hover table-checkable" id="forms_1">
+						<thead>
+							<tr>
+								<td>公司</td>
+								<td>分公司</td>
+								<td>日期</td>
+								<td>线路</td>
+								<td>车辆</td>
+								<td>人员</td>
+								<td>计划发车时间</td>
+								<td>发送时间</td>
+								<td>收到时间</td>
+								<td>确认时间</td>
+							</tr>
+						</thead>
+						
+						<tbody>
+							
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
+			$('.menu-toggler.sidebar-toggler').click();
+		var params_;
+		 $("#commandByLineList").on('init', function (e, params) {
+			params['type']='export';
+			params_=params;
+			console.log(params.date);
+			 $get('/pcpc/commandByJghList',params,function(result){
+					var commandByLine = template('commandByLine',{list:result});
+					$('#forms_1 tbody').html(commandByLine);
+				});
+		 })
+		 $("#exportList").on('click',function(){
+			 $get('/pcpc/commandByLineList', params_, function(result){
+				 window.open("/downloadFile/download?fileName=指令状态明细"+moment(params_.date).format("YYYYMMDD"));
+				});
+		}); 
+		
+
+	});
+</script>
+<script type="text/html" id="commandByLine">
+	{{each list as obj i}}
+		<tr>
+		<td>{{obj.company}}</td>
+		<td>{{obj.subCompany}}</td>
+		<td>{{obj.date}}</td>
+		<td>{{obj.line}}</td>
+		<td>{{obj.clZbh}}</td>
+		<td>{{obj.jsy}}</td>
+		<td>{{obj.jfsj}}</td>
+		<td>{{obj.time}}</td>
+		<td>{{obj.time46}}</td>
+		<td>{{obj.time47}}</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="10"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
 \ No newline at end of file
@@ -417,11 +417,20 @@
           <td colspan="14">路别:{{xlName}}   路牌:{{lpName}}   车号:{{clZbh}}({{plate}})   出场时间:{{fcsjActual}}   到达站名:{{zdzName}}   当班调派:{{dbdp}}   日期:{{scheduleDate}}</td>
       </tr>
       <tr>
+		{{if type==0}}  
           <td colspan="2">出场存油 {{ccyl}}升</td>
           <td colspan="2">加注量 {{jzl}}升</td>
           <td colspan="2">进场存油 {{jcyl}}升</td>
           <td colspan="4">加注机油 &nbsp;升</td>
           <td colspan="4">本日耗油 {{yh}}升</td>
+		{{/if}}
+        {{if type==1}}  
+          <td colspan="2">出场存电 {{ccyl}}%</td>
+          <td colspan="2">充电量 {{jzl}}度</td>
+          <td colspan="2">进场存电 {{jcyl}}%</td>
+          <td colspan="4">加注机油 &nbsp;升</td>
+          <td colspan="4">本日耗电 {{yh}}度</td>
+		{{/if}}
       </tr>
       <tr>
           <td rowspan="2">调度章</td>
@@ -52,7 +52,7 @@
 			<div class="portlet-body">
 				<div class="row"  class="col-md-12">
 					<div class="col-md-5">
-						<div  id="left_table" style="margin-top: 10px;overflow:auto;height: 860px">
+						<div  id="left_table" style="margin-top: 10px;overflow:auto;">
 							<input class="btn btn-default hidden" type="button" id="export" value="导出"/>
 							<table class="table table-bordered table-hover table-checkable pre-scrollable" id="info_inter">
 								<thead>
@@ -61,7 +61,7 @@
 										<th>线路</th>
 										<th>等级</th>
 										<th>班次数</th>
-										<th>发生次数</th>
+										<th>次数</th>
 										<th>发生率</th>
 									</tr>
 								</thead>
@@ -77,16 +77,21 @@
 							<table class="table table-bordered table-hover table-checkable" id="forms">
 								<thead class="hidden">
 									<tr >
-										<th rowspan="2">分公司</th>
-										<th rowspan="2">线路</th>
-										<th rowspan="2">大间隔等级</th>
-										<th colspan="4">发生大间隔班次</th>
+										<th rowspan="3">分公司</th>
+										<th rowspan="3">线路</th>
+										<th rowspan="3">等级</th>
+										<th colspan="6">发生大间隔班次</th>
 									</tr>
 									<tr>
-										<th>计发</th>
-										<th>实发</th>
-										<th>计发</th>
-										<th>实发</th>
+										<th rowspan="2">计发</th>
+										<th rowspan="2">实发</th>
+										<th rowspan="2">计发</th>
+										<th rowspan="2">实发</th>
+										<th colspan="2">间隔时间(分)</th>
+									</tr>
+									<tr>
+										<th>班次</th>
+										<th>大间隔</th>
 									</tr>
 								</thead>
 								<tbody>
@@ -208,7 +213,7 @@
 				layer.msg("请选择时间！");
 				return;
 			}
-// 			$("#left_table").height($(window).height()-100);
+			$("#left_table").height($(window).height()-200);
 			line = $("#line").val();
 			date = $("#date").val();
 			gsbm =$("#gsdm").val();
@@ -296,13 +301,15 @@
 <script type="text/html" id="list_inter_info_xx">
 	{{each list as obj i}}
 		<tr>
-			<td width="20%">{{obj.fgsname}}</td>
-			<td width="20%">{{obj.xlName}}</td>
-			<td width="10%">{{obj.djgde}}</td>
-			<td width="10%">{{obj.qJh}}</td>
-			<td width="10%">{{obj.qSj}}</td>
-			<td width="10%">{{obj.hJh}}</td>
-			<td width="10%">{{obj.hSj}}</td>
+			<td width="14%">{{obj.fgsname}}</td>
+			<td width="16%">{{obj.xlName}}</td>
+			<td width="8%">{{obj.djgde}}</td>
+			<td width="8%">{{obj.qJh}}</td>
+			<td width="8%">{{obj.qSj}}</td>
+			<td width="8%">{{obj.hJh}}</td>
+			<td width="8%">{{obj.hSj}}</td>
+			<td width="10%">{{obj.bcjgsj}}</td>
+			<td width="10%">{{obj.djgsj}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -242,7 +242,6 @@
 		}
 		function openSheetList(){
 			var id = $(this).data('id');
-			console.log(id);
 			$.get('/pages/report/sheet/list.html', function (content) {
 				layer.open({
 					type: 1,
-<!DOCTYPE html>
-<html lang="zh-cn">
-
-<head>
-    <meta charset="UTF-8">
-    <link rel="stylesheet" href="/assets/plugins/uk3.0/uikit.min.css"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" />
-    <!-- flatpickr -->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css">
-    <style>
-        html,body{
-            height: 100%;
-        }
-        .ct_page{
-            padding: 25px 15px;
-            height: 100%;
-            height: calc(100% - 50px);
-        }
-
-        .ct_cont{
-            height: calc(100% - 41px);
-        }
-
-        .ct_cont>div>div.uk-card{
-            height: 99%;
-        }
-
-        .loading{
-            height: 100%;
-            text-align: center;
-        }
-        .loading .uk-spinner{
-            margin-top: 200px;
-        }
-        .loading circle{
-            stroke: red;
-        }
-
-        .ps-container > .ps-scrollbar-x-rail, .ps-container > .ps-scrollbar-y-rail{
-            opacity: 0.6 !important;
-            padding: 0 !important;
-        }
-
-        .ct_table_wrap.day th:nth-of-type(1),.ct_table_wrap.day td:nth-of-type(1){
-            width: 10%;
-        }
-        .ct_table_wrap.day th:nth-of-type(2),.ct_table_wrap.day td:nth-of-type(2){
-            width: 10%;
-        }
-        .ct_table_wrap.day th:nth-of-type(3),.ct_table_wrap.day td:nth-of-type(3){
-            width: 10%;
-        }
-        .ct_table_wrap.day th:nth-of-type(4),.ct_table_wrap.day td:nth-of-type(4){
-            width: 10%;
-        }
-        .ct_table_wrap.day th:nth-of-type(5),.ct_table_wrap.day td:nth-of-type(5){
-            width: 5%;
-        }
-        .ct_table_wrap.day th:nth-of-type(6),.ct_table_wrap.day td:nth-of-type(6){
-            width: 15%;
-        }
-        .ct_table_wrap.day th:nth-of-type(7),.ct_table_wrap.day td:nth-of-type(7){
-            width: 10%;
-        }
-        .ct_table_wrap.day th:nth-of-type(8),.ct_table_wrap.day td:nth-of-type(8){
-            width: 10%;
-        }
-        .ct_table_wrap.day th:nth-of-type(9),.ct_table_wrap.day td:nth-of-type(9){
-            width: 10%;
-        }
-        .ct_table_wrap.day th:nth-of-type(10),.ct_table_wrap.day td:nth-of-type(10){
-            width: 10%;
-        }
-
-        .ct_search_form_wrap{
-            border-bottom: 1px solid #e5e5e5;
-            padding: 10px 0 25px 10px;
-        }
-        .ct_search_form_wrap .ct_field{
-            display: inline-block;
-            margin: 0 5px;
-        }
-
-        .ct_search_form_wrap .ct_field label{
-            font-size: 14px;
-        }
-
-        .ct_search_form_wrap .ct_field input{
-            width: 110px;
-        }
-
-        .ct_search_form_wrap .ct_field select{
-            width: auto;
-            min-width: 100px;
-        }
-
-        .ct_search_form_wrap .uk-button{
-            padding: 0 14px;
-        }
-
-        .ct_search_form_wrap .uk-button i{
-            vertical-align: middle;
-            margin-top: -2px;
-            margin-right: 7px;
-        }
-
-        .ct_table_wrap{
-            font-size: 14px;
-            height: calc(100% - 77px);
-        }
-
-        .t_body_wrap{
-            height: calc(100% - 41px);
-            overflow: auto;
-            position: relative;
-        }
-    </style>
-</head>
-
-<body>
-<div class="loading">
-    <div uk-spinner></div>
-</div>
-<div class="ct_page" style="display: none;">
-    <h2 class="uk-heading-line uk-heading-bullet"><span>工时统计</span></h2>
-    <div class="ct_cont" >
-        <div class="ct_search_form_wrap">
-            <form>
-                <div class="ct_field">
-                    <label>公司：
-                        <select class="uk-select" name="companyId_eq">
-                        </select>
-                    </label>
-                </div>
-                <div class="ct_field">
-                    <label>分公司：
-                        <select class="uk-select" name="subCompanyId_eq">
-                        </select>
-                    </label>
-                </div>
-                <div class="ct_field">
-                    <label>线路：
-                        <select class="uk-select" name="lineCode_eq">
-                            <option value="81101">航头4路</option>
-                        </select>
-                    </label>
-                </div>
-                <div class="ct_field">
-                    <label>日期：
-                        <input class="uk-input" name="rq_eq" >
-                    </label>
-                </div>
-                <div class="ct_field">
-                    <label>驾驶员：
-                        <input class="uk-input" name="jsy_eq" placeholder="工号">
-                    </label>
-                </div>
-                <div class="ct_field">
-                    <label>车辆：
-                        <input class="uk-input" name="nbbm_eq" >
-                    </label>
-                </div>
-                <div class="ct_field">
-                    <button class="uk-button uk-button-primary search"><i uk-icon="icon: search"></i>搜索</button>
-                    <span id="add_hours_icon" uk-icon="icon: plus" style="vertical-align: bottom;margin-left: 5px;" title="录入工休和非营运工时" uk-tooltip></span>
-                </div>
-            </form>
-        </div>
-        <div class="ct_table_wrap day">
-            <table class="uk-table uk-table-small" style="margin-bottom: 0;">
-                <thead>
-                <tr>
-                    <th>日期</th>
-                    <th>公司</th>
-                    <th>分公司</th>
-                    <th>线路</th>
-                    <th>路牌</th>
-                    <th>驾驶员</th>
-                    <th>车辆</th>
-                    <th>计划工时 &nbsp;<i uk-icon="icon: question; ratio:.7" title="格式：小时.分钟" uk-tooltip></i ></th>
-                    <th>实际工时</th>
-                    <th>备注</th>
-                </tr>
-                </thead>
-            </table>
-            <div class="t_body_wrap">
-                <table class="uk-table uk-table-divider uk-table-hover uk-table-small ct_jsy_day_table">
-                    <tbody>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
-</div>
-
-<!--<div id="hours_add_modal" uk-modal>
-    <div class="uk-modal-dialog uk-modal-body">
-        <button class="uk-modal-close-default" type="button" uk-close></button>
-        <h2 class="uk-modal-title">Default</h2>
-        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-    </div>
-</div>-->
-
-<script id="hours_jsy_day_list_temp" type="text/html">
-    {{each list as obj i}}
-        <tr>
-            <td>{{obj.rq}}</td>
-            <td>{{obj.companyName}}</td>
-            <td>{{obj.subCompanyName}}</td>
-            <td>{{obj.lineName}}</td>
-            <td>{{obj.lpName}}</td>
-            <td>{{obj.jsy}}/{{obj.jsyName}}</td>
-            <td>{{obj.nbbm}}</td>
-            <td>{{obj.hoursJhStr}}</td>
-            <td>{{obj.hoursSjStr}}</td>
-            <td>{{obj.remarks}}</td>
-        </tr>
-    {{/each}}
-</script>
-
-<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
-<script src="/assets/plugins/uk3.0/uikit.min.js"></script>
-<script src="/assets/plugins/uk3.0/uikit-icons.min.js"></script>
-<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" ></script>
-<!-- EventProxy  -->
-<script src="/assets/js/eventproxy.js"></script>
-<!-- art-template 模版引擎 -->
-<script src="/assets/plugins/template.js"></script>
-<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
-<!-- jquery.serializejson JSON序列化插件 -->
-<script src="/assets/plugins/jquery.serializejson.js"  merge="plugins"></script>
-<!-- flatpickr -->
-<script src="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.js" ></script>
-<script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" ></script>
-<script>
-
-    var f = $('form', '');
-    var page=0, pageSize=120;
-
-    var ep = EventProxy.create('query_comps', 'query_lines', function () {
-        $('[name=companyId_eq]', f).trigger('change');//公司change
-        query();
-
-        $('.loading').remove();
-        $('.ct_page').show();
-    });
-
-    //点击搜索
-    $('button.search', f).on('click', query);
-
-    function query() {
-        var data = f.serializeJSON();
-        data.page = page;
-        data.size = pageSize;
-
-        $.get('/summary/hours', data, function (rs) {
-            //console.log('data', rs);
-            var htmlStr = template('hours_jsy_day_list_temp', {list: rs.content});
-            $('.ct_jsy_day_table tbody').html(htmlStr);
-
-            $('.t_body_wrap').perfectScrollbar('update');
-        });
-    }
-
-    //日期选择器
-    $('[name=rq_eq]', f).val('2017-07-25');
-    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-07-25', minDate: '2017-07-01'});
-
-    var comps;
-    //构建公司级联下拉框
-    $.get('/user/companyData', function (rs) {
-        comps = rs;
-        var opts = '';
-        for(var i=0,obj;obj=comps[i++];){
-            opts += '<option value="'+obj.companyCode+'">'+obj.companyName+'</option>';
-        }
-        $('[name=companyId_eq]', f).html(opts);
-        ep.emit('query_comps');
-    });
-
-    var lineMapps;
-    //加载线路信息
-    $.get('/line/all', {'destroy_eq': 0}, function (rs) {
-        rs.sort(function (a, b) {
-            return a.name.localeCompare(b.name);
-        });
-        lineMapps={};
-        var k;
-        $.each(rs, function () {
-            k = this.company+'_'+this.brancheCompany;
-            if(!lineMapps[k])
-                lineMapps[k]=[];
-            lineMapps[k].push(this);
-        });
-
-        ep.emit('query_lines');
-    });
-
-    $('[name=companyId_eq]', f).on('change', function () {
-        var code = $(this).val(), subs=[];
-        $.each(comps, function () {
-            if(this.companyCode==code)
-                subs=this.children;
-        });
-
-        var opts='';
-        $.each(subs, function () {
-            opts += '<option value="'+this.code+'">'+this.name+'</option>';
-        });
-        $('[name=subCompanyId_eq]', f).html(opts).trigger('change');
-    });
-
-    $('[name=subCompanyId_eq]', f).on('change', function () {
-        var k = $('[name=companyId_eq]', f).val() + '_' + $(this).val();
-        var array = lineMapps[k];
-        var opts = '';
-        if(array){
-            $.each(array, function () {
-                opts += '<option value="'+this.lineCode+'">'+this.name+'</option>';
-            });
-        }
-        $('[name=lineCode_eq]', f).html(opts);
-    });
-
-    //
-    //滚动条
-    $('.t_body_wrap').perfectScrollbar({suppressScrollX: true});
-
-    $(document).on('submit', 'form', function () {
-        return false;
-    });
-
-    $('#add_hours_icon').on('click', function () {
-        UIkit.notification('暂不开放！', 'danger');
-    });
-</script>
-</body>
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <link rel="stylesheet" href="/assets/plugins/uk3.0/uikit.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" />
+    <!-- flatpickr -->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css">
+    <style>
+        html,body{
+            height: 100%;
+        }
+        .ct_page{
+            padding: 25px 15px;
+            height: 100%;
+            height: calc(100% - 50px);
+        }
+
+        .ct_cont{
+            height: calc(100% - 41px);
+        }
+
+        .ct_cont>div>div.uk-card{
+            height: 99%;
+        }
+
+        .loading{
+            height: 100%;
+            text-align: center;
+        }
+        .loading .uk-spinner{
+            margin-top: 200px;
+        }
+        .loading circle{
+            stroke: red;
+        }
+
+        .ps-container > .ps-scrollbar-x-rail, .ps-container > .ps-scrollbar-y-rail{
+            opacity: 0.6 !important;
+            padding: 0 !important;
+        }
+
+        .ct_table_wrap.day th:nth-of-type(1),.ct_table_wrap.day td:nth-of-type(1){
+            width: 10%;
+        }
+        .ct_table_wrap.day th:nth-of-type(2),.ct_table_wrap.day td:nth-of-type(2){
+            width: 10%;
+        }
+        .ct_table_wrap.day th:nth-of-type(3),.ct_table_wrap.day td:nth-of-type(3){
+            width: 10%;
+        }
+        .ct_table_wrap.day th:nth-of-type(4),.ct_table_wrap.day td:nth-of-type(4){
+            width: 10%;
+        }
+        .ct_table_wrap.day th:nth-of-type(5),.ct_table_wrap.day td:nth-of-type(5){
+            width: 5%;
+        }
+        .ct_table_wrap.day th:nth-of-type(6),.ct_table_wrap.day td:nth-of-type(6){
+            width: 15%;
+        }
+        .ct_table_wrap.day th:nth-of-type(7),.ct_table_wrap.day td:nth-of-type(7){
+            width: 10%;
+        }
+        .ct_table_wrap.day th:nth-of-type(8),.ct_table_wrap.day td:nth-of-type(8){
+            width: 10%;
+        }
+        .ct_table_wrap.day th:nth-of-type(9),.ct_table_wrap.day td:nth-of-type(9){
+            width: 10%;
+        }
+        .ct_table_wrap.day th:nth-of-type(10),.ct_table_wrap.day td:nth-of-type(10){
+            width: 10%;
+        }
+
+        .ct_search_form_wrap{
+            border-bottom: 1px solid #e5e5e5;
+            padding: 10px 0 25px 10px;
+        }
+        .ct_search_form_wrap .ct_field{
+            display: inline-block;
+            margin: 0 5px;
+        }
+
+        .ct_search_form_wrap .ct_field label{
+            font-size: 14px;
+        }
+
+        .ct_search_form_wrap .ct_field input{
+            width: 110px;
+        }
+
+        .ct_search_form_wrap .ct_field select{
+            width: auto;
+            min-width: 100px;
+        }
+
+        .ct_search_form_wrap .uk-button{
+            padding: 0 14px;
+        }
+
+        .ct_search_form_wrap .uk-button i{
+            vertical-align: middle;
+            margin-top: -2px;
+            margin-right: 7px;
+        }
+
+        .ct_table_wrap{
+            font-size: 14px;
+            height: calc(100% - 77px);
+        }
+
+        .t_body_wrap{
+            height: calc(100% - 41px);
+            overflow: auto;
+            position: relative;
+        }
+    </style>
+</head>
+
+<body>
+<div class="loading">
+    <div uk-spinner></div>
+</div>
+<div class="ct_page" style="display: none;">
+    <h2 class="uk-heading-line uk-heading-bullet"><span>工时统计</span></h2>
+    <div class="ct_cont" >
+        <div class="ct_search_form_wrap">
+            <form>
+                <div class="ct_field">
+                    <label>公司：
+                        <select class="uk-select" name="companyId_eq">
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>分公司：
+                        <select class="uk-select" name="subCompanyId_eq">
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>线路：
+                        <select class="uk-select" name="lineCode_eq">
+                            <option value="81101">航头4路</option>
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>日期：
+                        <input class="uk-input" name="rq_eq" >
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>驾驶员：
+                        <input class="uk-input" name="jsy_eq" placeholder="工号">
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>车辆：
+                        <input class="uk-input" name="nbbm_eq" >
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <button class="uk-button uk-button-primary search"><i uk-icon="icon: search"></i>搜索</button>
+                    <span id="add_hours_icon" uk-icon="icon: plus" style="vertical-align: bottom;margin-left: 5px;" title="录入工休和非营运工时" uk-tooltip></span>
+                </div>
+            </form>
+        </div>
+        <div class="ct_table_wrap day">
+            <table class="uk-table uk-table-small" style="margin-bottom: 0;">
+                <thead>
+                <tr>
+                    <th>日期</th>
+                    <th>公司</th>
+                    <th>分公司</th>
+                    <th>线路</th>
+                    <th>路牌</th>
+                    <th>驾驶员</th>
+                    <th>车辆</th>
+                    <th>计划工时 &nbsp;<i uk-icon="icon: question; ratio:.7" title="格式：小时.分钟" uk-tooltip></i ></th>
+                    <th>实际工时</th>
+                    <th>备注</th>
+                </tr>
+                </thead>
+            </table>
+            <div class="t_body_wrap">
+                <table class="uk-table uk-table-divider uk-table-hover uk-table-small ct_jsy_day_table">
+                    <tbody>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!--<div id="hours_add_modal" uk-modal>
+    <div class="uk-modal-dialog uk-modal-body">
+        <button class="uk-modal-close-default" type="button" uk-close></button>
+        <h2 class="uk-modal-title">Default</h2>
+        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+    </div>
+</div>-->
+
+<script id="hours_jsy_day_list_temp" type="text/html">
+    {{each list as obj i}}
+        <tr>
+            <td>{{obj.rq}}</td>
+            <td>{{obj.companyName}}</td>
+            <td>{{obj.subCompanyName}}</td>
+            <td>{{obj.lineName}}</td>
+            <td>{{obj.lpName}}</td>
+            <td>{{obj.jsy}}/{{obj.jsyName}}</td>
+            <td>{{obj.nbbm}}</td>
+            <td>{{obj.hoursJhStr}}</td>
+            <td>{{obj.hoursSjStr}}</td>
+            <td>{{obj.remarks}}</td>
+        </tr>
+    {{/each}}
+</script>
+
+<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
+<script src="/assets/plugins/uk3.0/uikit.min.js"></script>
+<script src="/assets/plugins/uk3.0/uikit-icons.min.js"></script>
+<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" ></script>
+<!-- EventProxy  -->
+<script src="/assets/js/eventproxy.js"></script>
+<!-- art-template 模版引擎 -->
+<script src="/assets/plugins/template.js"></script>
+<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
+<!-- jquery.serializejson JSON序列化插件 -->
+<script src="/assets/plugins/jquery.serializejson.js"  merge="plugins"></script>
+<!-- flatpickr -->
+<script src="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.js" ></script>
+<script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" ></script>
+<script>
+
+    var f = $('form', '');
+    var page=0, pageSize=120;
+
+    var ep = EventProxy.create('query_comps', 'query_lines', function () {
+        $('[name=companyId_eq]', f).trigger('change');//公司change
+        query();
+
+        $('.loading').remove();
+        $('.ct_page').show();
+    });
+
+    //点击搜索
+    $('button.search', f).on('click', query);
+
+    function query() {
+        var data = f.serializeJSON();
+        data.page = page;
+        data.size = pageSize;
+
+        $.get('/summary/hours', data, function (rs) {
+            //console.log('data', rs);
+            var htmlStr = template('hours_jsy_day_list_temp', {list: rs.content});
+            $('.ct_jsy_day_table tbody').html(htmlStr);
+
+            $('.t_body_wrap').perfectScrollbar('update');
+        });
+    }
+
+    //日期选择器
+    $('[name=rq_eq]', f).val('2017-07-25');
+    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-07-25', minDate: '2017-07-01'});
+
+    var comps;
+    //构建公司级联下拉框
+    $.get('/user/companyData', function (rs) {
+        comps = rs;
+        var opts = '';
+        for(var i=0,obj;obj=comps[i++];){
+            opts += '<option value="'+obj.companyCode+'">'+obj.companyName+'</option>';
+        }
+        $('[name=companyId_eq]', f).html(opts);
+        ep.emit('query_comps');
+    });
+
+    var lineMapps;
+    //加载线路信息
+    $.get('/line/all', {'destroy_eq': 0}, function (rs) {
+        rs.sort(function (a, b) {
+            return a.name.localeCompare(b.name);
+        });
+        lineMapps={};
+        var k;
+        $.each(rs, function () {
+            k = this.company+'_'+this.brancheCompany;
+            if(!lineMapps[k])
+                lineMapps[k]=[];
+            lineMapps[k].push(this);
+        });
+
+        ep.emit('query_lines');
+    });
+
+    $('[name=companyId_eq]', f).on('change', function () {
+        var code = $(this).val(), subs=[];
+        $.each(comps, function () {
+            if(this.companyCode==code)
+                subs=this.children;
+        });
+
+        var opts='';
+        $.each(subs, function () {
+            opts += '<option value="'+this.code+'">'+this.name+'</option>';
+        });
+        $('[name=subCompanyId_eq]', f).html(opts).trigger('change');
+    });
+
+    $('[name=subCompanyId_eq]', f).on('change', function () {
+        var k = $('[name=companyId_eq]', f).val() + '_' + $(this).val();
+        var array = lineMapps[k];
+        var opts = '';
+        if(array){
+            $.each(array, function () {
+                opts += '<option value="'+this.lineCode+'">'+this.name+'</option>';
+            });
+        }
+        $('[name=lineCode_eq]', f).html(opts);
+    });
+
+    //
+    //滚动条
+    $('.t_body_wrap').perfectScrollbar({suppressScrollX: true});
+
+    $(document).on('submit', 'form', function () {
+        return false;
+    });
+
+    $('#add_hours_icon').on('click', function () {
+        UIkit.notification('暂不开放！', 'danger');
+    });
+</script>
+</body>
 </html>
 \ No newline at end of file
-<!-- 工时统计 -->
+<!-- 工时统计 -->
 <iframe src="/pages/summary/work_hours/list.html?origin=real_control_iframe" frameborder="0" style="height: 100%;width: 100%;"></iframe>
 \ No newline at end of file