线路查询添加撤销线路，使用(撤销)作为标识区分。加油加电修正修改时间没有保存的问题。

娄高锋
1 parent a8eecb3f
Showing 12 changed files with 473 additions and 432 deletions
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/entity/oil/Cwjy.java
src/main/java/com/bsth/entity/oil/Ylxxb.java
src/main/java/com/bsth/repository/LineRepository.java
src/main/java/com/bsth/repository/oil/CwjyRepository.java
src/main/java/com/bsth/repository/oil/JdlRepository.java
src/main/java/com/bsth/repository/oil/JqlRepository.java
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.java
src/main/java/com/bsth/service/oil/impl/JdlServiceImpl.java
src/main/java/com/bsth/service/oil/impl/JqlServiceImpl.java
src/main/java/com/bsth/service/report/ReportService.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
@@ -290,6 +290,11 @@ public class ReportController {
 		return service.lineList();
 	}
  
+	@RequestMapping(value="/lineListNotDestroy",method = RequestMethod.GET)
+	public List<Map<String,Object>> lineListNotDestroy(){
+		return service.lineListNotDestroy();
+	}
+	
 	@RequestMapping(value="/carList",method = RequestMethod.GET)
 	public List<Map<String,String>> carList(@RequestParam Map<String, Object> map){
 		return service.carList(map);
-package com.bsth.entity.oil;
-
-import java.util.Date;
-
-import javax.persistence.*;
-
-import com.bsth.data.BasicData;
-
-@Entity
-@Table(name = "bsth_c_cwjy")
-public class Cwjy {
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Integer id;
-	
-	private String gsdm;
-	
-	private String fgsdm;
-	
-	private String nbbm;
-	
-	private String xgr;
-	
-	private Date createDate;
-	
-	private String line;
-	
-	@Transient
-	private String linename;
-
-	@Transient
-	private String gsname;
-	
-	@Transient
-	private String fgsname;
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getGsdm() {
-		return gsdm;
-	}
-
-	public void setGsdm(String gsdm) {
-		this.gsdm = gsdm;
-	}
-
-	public String getFgsdm() {
-		return fgsdm;
-	}
-
-	public void setFgsdm(String fgsdm) {
-		this.fgsdm = fgsdm;
-	}
-
-	public String getNbbm() {
-		return nbbm;
-	}
-
-	public void setNbbm(String nbbm) {
-		this.nbbm = nbbm;
-	}
-
-	public String getXgr() {
-		return xgr;
-	}
-
-	public void setXgr(String xgr) {
-		this.xgr = xgr;
-	}
-
-	public Date getCreateDate() {
-		return createDate;
-	}
-
-	public void setCreateDate(Date createDate) {
-		this.createDate = createDate;
-	}
-
-	public String getGsname() {
-		return BasicData.businessCodeNameMap.get(this.gsdm);
-	}
-
-	public void setGsname(String gsname) {
-		this.gsname = gsname;
-	}
-
-	public String getFgsname() {
-		return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.gsdm);
-	}
-
-	public void setFgsname(String fgsname) {
-		this.fgsname = fgsname;
-	}
-
-	public String getLine() {
-		return line;
-	}
-
-	public void setLine(String line) {
-		this.line = line;
-	}
-
-	public String getLinename() {
-		return BasicData.lineCode2NameMap.get(this.line);
-	}
-
-	public void setLinename(String linename) {
-		this.linename = linename;
-	}
-	
-	
-	
-	
-}
+package com.bsth.entity.oil;
+
+import java.util.Date;
+
+import javax.persistence.*;
+
+import com.bsth.data.BasicData;
+
+@Entity
+@Table(name = "bsth_c_cwjy")
+public class Cwjy {
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+	
+	private String gsdm;
+	
+	private String fgsdm;
+	
+	private String nbbm;
+	
+	private String xgr;
+	
+	private Date createDate;
+	
+	private String line;
+	
+	@Transient
+	private String linename;
+
+	@Transient
+	private String gsname;
+	
+	@Transient
+	private String fgsname;
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getGsdm() {
+		return gsdm;
+	}
+
+	public void setGsdm(String gsdm) {
+		this.gsdm = gsdm;
+	}
+
+	public String getFgsdm() {
+		return fgsdm;
+	}
+
+	public void setFgsdm(String fgsdm) {
+		this.fgsdm = fgsdm;
+	}
+
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public String getXgr() {
+		return xgr;
+	}
+
+	public void setXgr(String xgr) {
+		this.xgr = xgr;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	public String getGsname() {
+		return BasicData.businessCodeNameMap!=null?BasicData.businessCodeNameMap.get(this.gsdm):gsname;
+	}
+
+	public void setGsname(String gsname) {
+		this.gsname = gsname;
+	}
+
+	public String getFgsname() {
+		return BasicData.businessFgsCodeNameMap!=null?BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.gsdm):fgsdm;
+	}
+
+	public void setFgsname(String fgsname) {
+		this.fgsname = fgsname;
+	}
+
+	public String getLine() {
+		return line;
+	}
+
+	public void setLine(String line) {
+		this.line = line;
+	}
+
+	public String getLinename() {
+		return BasicData.lineCode2NameMap!=null?BasicData.lineCode2NameMap.get(this.line):linename;
+	}
+
+	public void setLinename(String linename) {
+		this.linename = linename;
+	}
+	
+	
+	
+	
+}
-package com.bsth.entity.oil;
-
-import java.util.Date;
-
-import javax.persistence.*;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
-import com.bsth.data.BasicData;
-
-@Entity
-@Table(name = "bsth_c_ylxxb")
-public class Ylxxb {
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Integer id;
-	@DateTimeFormat(pattern="yyyy-MM-dd")
-	private Date yyrq;
-	private Date jlrq;
-	private String nbbm;
-	private String jsy;
-	private Double jzl;
-	private String stationid;
-	private Date createtime;
-	private String gsdm;
-	private String fgsdm;
-	private String yp;
-	private String jyggh;
-	private Double yj;
-	private String bz;
-	private Date xgrq;
-	private String xgr;
-	private String fromgsdm;
-	private Integer nylx;
-	@Transient
-	private String ldgh;
-	//0为接口数据，1为手工输入,2为改变车号，3为改变驾驶员
-	private Integer jylx=0;
-	@Transient
-	private String gsname;
-	@Transient
-	private String fgsname;
-	@Transient
-	private String linename;
-	@Transient
-	private Double zjzl;
-	
-	
-	public Integer getId() {
-		return id;
-	}
-	public void setId(Integer id) {
-		this.id = id;
-	}
-	public Date getYyrq() {
-		return yyrq;
-	}
-	public void setYyrq(Date yyrq) {
-		this.yyrq = yyrq;
-	}
-	public Date getJlrq() {
-		return jlrq;
-	}
-	public void setJlrq(Date jlrq) {
-		this.jlrq = jlrq;
-	}
-	public String getNbbm() {
-		return nbbm;
-	}
-	public void setNbbm(String nbbm) {
-		this.nbbm = nbbm;
-	}
-	public String getJsy() {
-		return jsy;
-	}
-	public void setJsy(String jsy) {
-		this.jsy = jsy;
-	}
-	public Double getJzl() {
-		return jzl;
-	}
-	public void setJzl(Double jzl) {
-		this.jzl = jzl;
-	}
-	public String getStationid() {
-		return stationid;
-	}
-	public void setStationid(String stationid) {
-		this.stationid = stationid;
-	}
-	public Date getCreatetime() {
-		return createtime;
-	}
-	public void setCreatetime(Date createtime) {
-		this.createtime = createtime;
-	}
-	public String getGsdm() {
-		return gsdm;
-	}
-	public void setGsdm(String gsdm) {
-		this.gsdm = gsdm;
-	}
-	
-	
-	public String getFgsdm() {
-		return fgsdm;
-	}
-	public void setFgsdm(String fgsdm) {
-		this.fgsdm = fgsdm;
-	}
-	public String getYp() {
-		return yp;
-	}
-	public void setYp(String yp) {
-		this.yp = yp;
-	}
-	public String getJyggh() {
-		return jyggh;
-	}
-	public void setJyggh(String jyggh) {
-		this.jyggh = jyggh;
-	}
-	public Double getYj() {
-		return yj;
-	}
-	public void setYj(Double yj) {
-		this.yj = yj;
-	}
-	public String getBz() {
-		return bz;
-	}
-	public void setBz(String bz) {
-		this.bz = bz;
-	}
-	public Date getXgrq() {
-		return xgrq;
-	}
-	public void setXgrq(Date xgrq) {
-		this.xgrq = xgrq;
-	}
-	public String getXgr() {
-		return xgr;
-	}
-	public void setXgr(String xgr) {
-		this.xgr = xgr;
-	}
-	public String getFromgsdm() {
-		return fromgsdm;
-	}
-	public void setFromgsdm(String fromgsdm) {
-		this.fromgsdm = fromgsdm;
-	}
-	public int getNylx() {
-		return nylx;
-	}
-	public void setNylx(int nylx) {
-		this.nylx = nylx;
-	}
-	public String getLdgh() {
-		return ldgh;
-	}
-	public void setLdgh(String ldgh) {
-		this.ldgh = ldgh;
-	}
-	public int getJylx() {
-		return jylx;
-	}
-	public void setJylx(int jylx) {
-		this.jylx = jylx;
-	}
-	
-	public String getGsname() {
-		return BasicData.businessCodeNameMap.get(this.gsdm);
-	}
-
-	public void setGsname(String gsname) {
-		this.gsname = gsname;
-	}
-	
-	public String getFgsname() {
-		return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.gsdm);
-	}
-
-	public void setFgsname(String fgsname) {
-		this.fgsname = fgsname;
-	}
-	public Double getZjzl() {
-		return zjzl;
-	}
-	public void setZjzl(Double zjzl) {
-		this.zjzl = zjzl;
-	}
-	public String getLinename() {
-		return linename;
-	}
-	public void setLinename(String linename) {
-		this.linename = linename;
-	}
-	
-	
-	
-}
+package com.bsth.entity.oil;
+
+import java.util.Date;
+
+import javax.persistence.*;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.bsth.data.BasicData;
+
+@Entity
+@Table(name = "bsth_c_ylxxb")
+public class Ylxxb {
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	private Date yyrq;
+	private Date jlrq;
+	private String nbbm;
+	private String jsy;
+	private Double jzl;
+	private String stationid;
+	private Date createtime;
+	private String gsdm;
+	private String fgsdm;
+	private String yp;
+	private String jyggh;
+	private Double yj;
+	private String bz;
+	private Date xgrq;
+	private String xgr;
+	private String fromgsdm;
+	private Integer nylx;
+	private Date updatetime;
+	@Transient
+	private String ldgh;
+	//0为接口数据，1为手工输入,2为改变车号，3为改变驾驶员
+	private Integer jylx=0;
+	@Transient
+	private String gsname;
+	@Transient
+	private String fgsname;
+	@Transient
+	private String linename;
+	@Transient
+	private Double zjzl;
+	
+	
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public Date getYyrq() {
+		return yyrq;
+	}
+	public void setYyrq(Date yyrq) {
+		this.yyrq = yyrq;
+	}
+	public Date getJlrq() {
+		return jlrq;
+	}
+	public void setJlrq(Date jlrq) {
+		this.jlrq = jlrq;
+	}
+	public String getNbbm() {
+		return nbbm;
+	}
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+	public String getJsy() {
+		return jsy;
+	}
+	public void setJsy(String jsy) {
+		this.jsy = jsy;
+	}
+	public Double getJzl() {
+		return jzl;
+	}
+	public void setJzl(Double jzl) {
+		this.jzl = jzl;
+	}
+	public String getStationid() {
+		return stationid;
+	}
+	public void setStationid(String stationid) {
+		this.stationid = stationid;
+	}
+	public Date getCreatetime() {
+		return createtime;
+	}
+	public void setCreatetime(Date createtime) {
+		this.createtime = createtime;
+	}
+	public String getGsdm() {
+		return gsdm;
+	}
+	public void setGsdm(String gsdm) {
+		this.gsdm = gsdm;
+	}
+	
+	
+	public String getFgsdm() {
+		return fgsdm;
+	}
+	public void setFgsdm(String fgsdm) {
+		this.fgsdm = fgsdm;
+	}
+	public String getYp() {
+		return yp;
+	}
+	public void setYp(String yp) {
+		this.yp = yp;
+	}
+	public String getJyggh() {
+		return jyggh;
+	}
+	public void setJyggh(String jyggh) {
+		this.jyggh = jyggh;
+	}
+	public Double getYj() {
+		return yj;
+	}
+	public void setYj(Double yj) {
+		this.yj = yj;
+	}
+	public String getBz() {
+		return bz;
+	}
+	public void setBz(String bz) {
+		this.bz = bz;
+	}
+	public Date getXgrq() {
+		return xgrq;
+	}
+	public void setXgrq(Date xgrq) {
+		this.xgrq = xgrq;
+	}
+	public String getXgr() {
+		return xgr;
+	}
+	public void setXgr(String xgr) {
+		this.xgr = xgr;
+	}
+	public String getFromgsdm() {
+		return fromgsdm;
+	}
+	public void setFromgsdm(String fromgsdm) {
+		this.fromgsdm = fromgsdm;
+	}
+	public int getNylx() {
+		return nylx;
+	}
+	public void setNylx(int nylx) {
+		this.nylx = nylx;
+	}
+	public String getLdgh() {
+		return ldgh;
+	}
+	public void setLdgh(String ldgh) {
+		this.ldgh = ldgh;
+	}
+	public int getJylx() {
+		return jylx;
+	}
+	public void setJylx(int jylx) {
+		this.jylx = jylx;
+	}
+	
+	public String getGsname() {
+		return BasicData.businessCodeNameMap!=null?BasicData.businessCodeNameMap.get(this.gsdm):gsname;
+	}
+
+	public void setGsname(String gsname) {
+		this.gsname = gsname;
+	}
+	
+	public String getFgsname() {
+		return BasicData.businessFgsCodeNameMap!=null?BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.gsdm):fgsname;
+	}
+
+	public void setFgsname(String fgsname) {
+		this.fgsname = fgsname;
+	}
+	public Double getZjzl() {
+		return zjzl;
+	}
+	public void setZjzl(Double zjzl) {
+		this.zjzl = zjzl;
+	}
+	public String getLinename() {
+		return linename;
+	}
+	public void setLinename(String linename) {
+		this.linename = linename;
+	}
+	public Date getUpdatetime() {
+		return updatetime;
+	}
+	public void setUpdatetime(Date updatetime) {
+		this.updatetime = updatetime;
+	}
+	
+	
+	
+}
-package com.bsth.repository;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.bsth.entity.Line;
-
-/**
- * 
- * @Interface: LineRepository(线路Repository数据持久层接口)
- * 
- * @Extends : BaseRepository
- * 
- * @Description: TODO(线路Repository数据持久层接口)
- * 
- * @Author bsth@lq
- * 
- * @Date 2016年4月28日 上午9:21:17
- *
- * @Version 公交调度系统BS版 0.1
- * 
- */
-@Repository
-public interface LineRepository extends BaseRepository<Line, Integer> {
-
-	/**
-	 * 获取线路编码
-	 * 
-	 * @return int <lineCode：线路编码>
-	 */
-	@Query(value = "  SELECT IFNULL(num,0) as maxId from (SELECT MAX(id) as num FROM bsth_c_line) k ", nativeQuery = true)
-	public long selectMaxIdToLineCode();
-
-	@Query(value = "  SELECT l FROM Line l where l.name like ?1")
-	List<Line> findLine(String line);
-	
-	@Query(value = "  SELECT l FROM Line l where l.lineCode = ?1")
-	List<Line> findLineByCode(String lineCode);
-
-	public Line findByLineCode(String string);
-
-	@Query(value = "  SELECT l FROM Line l where l.company like ?1 and l.brancheCompany like ?2 and l.lineCode like ?3")
-	public List<Line> findLineBygsBm(String gsBm, String fgsBm, String line);
-
-	@Query("SELECT L FROM Line L where L.destroy=0 and L.remove !=1")
-	List<Line> findAllService();
-	
-	@Query("SELECT L FROM Line L")
-	List<Line> findAll();
-
-	@Modifying
-	@Query(value = "UPDATE Line l set l.name=?1 , l.company=?2, l.brancheCompany=?3, "
-			+ "l.level=?4, l.nature=?5, l.startStationName=?6, l.endStationName=?7, l.startStationFirstTime=?8, "
-			+ "l.startStationEndTime=?9, l.endStationFirstTime=?10, l.endStationEndTime=?11, l.linePlayType=?12, "
-			+ "l.openDate=?13, l.es=?14, l.shortName=?15, l.shanghaiLinecode=?16, l.eqLinecode=?17, l.startPhone=?18, "
-			+ "l.endPhone=?19, l.carSumNumber=?20, l.hvacCarNumber=?21, l.ordCarNumber=?22, l.history=?23, "
-			+ "l.descriptions=?24, l.destroy=?25, l.supperLine=?26, l.spacGrade=?27, l.warrantCar=?28, l.region=?30 , l.inUse=?31 , l.ticketPrice=?32 where "
-			+ "l.lineCode=?29")
-	int update(String name, String company, String brancheCompany, String level, String nature,
-			String startStationName, String endStationName, String startStationFirstTime, String startStationEndTime,
-			String endStationFirstTime, String endStationEndTime, Integer linePlayType, Date openDate, String es,
-			String shortName, String shanghaiLinecode, String eqLinecode, String startPhone, String endPhone,
-			Integer carSumNumber, Integer hvacCarNumber, Integer ordCarNumber, String history, String descriptions,
-			Integer destroy, Integer supperLine, Integer spacGrade, Integer warrantCar, String lineCode, Integer region, Integer inUser, int ticketPrice);
-
-	/**
-	 * 查询线路版本文件
-	 * @param lineId
-	 * @return
-	 */
-	@Query(value = "SELECT version_count FROM bsth_c_line_file_version where line = ?1", nativeQuery = true)
-	Integer findfileVersions(Integer lineId);
-
-	/**
-	 *  添加线路文件版本
-	 * @param lineId
-	 * @param line_code
-	 */
-	@Transactional
-	@Modifying
-	@Query(value = "INSERT INTO bsth_c_line_file_version (line,line_code,version_count) VALUES (?1,?2,1)", nativeQuery = true)
-	public void addFileVersions(Integer lineId, String line_code);
-
-	/**
-	 *  线路文件版本修改
-	 * @param lineId
-	 * @param version_count
-	 */
-	@Transactional
-	@Modifying
-	@Query(value = "UPDATE bsth_c_line_file_version set version_count=?2 WHERE line = ?1", nativeQuery = true)
-	public void editFileVersions(Integer lineId, Integer version_count);
-
-}
+package com.bsth.repository;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.bsth.entity.Line;
+
+/**
+ * 
+ * @Interface: LineRepository(线路Repository数据持久层接口)
+ * 
+ * @Extends : BaseRepository
+ * 
+ * @Description: TODO(线路Repository数据持久层接口)
+ * 
+ * @Author bsth@lq
+ * 
+ * @Date 2016年4月28日 上午9:21:17
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+@Repository
+public interface LineRepository extends BaseRepository<Line, Integer> {
+
+	/**
+	 * 获取线路编码
+	 * 
+	 * @return int <lineCode：线路编码>
+	 */
+	@Query(value = "  SELECT IFNULL(num,0) as maxId from (SELECT MAX(id) as num FROM bsth_c_line) k ", nativeQuery = true)
+	public long selectMaxIdToLineCode();
+
+	@Query(value = "  SELECT l FROM Line l where l.name like ?1")
+	List<Line> findLine(String line);
+	
+	@Query(value = "  SELECT l FROM Line l where l.lineCode = ?1")
+	List<Line> findLineByCode(String lineCode);
+
+	public Line findByLineCode(String string);
+
+	@Query(value = "  SELECT l FROM Line l where l.company like ?1 and l.brancheCompany like ?2 and l.lineCode like ?3")
+	public List<Line> findLineBygsBm(String gsBm, String fgsBm, String line);
+
+	@Query("SELECT L FROM Line L where L.destroy=0 and L.remove !=1")
+	List<Line> findAllService();
+
+	/**
+	 * 获取全部线路（含撤销线路，不含删除的）
+	 * 
+	 */
+	@Query("SELECT L FROM Line L where L.remove !=1 or L.remove is null order by destroy asc")
+	List<Line> findAllLine();
+	
+	
+	@Query("SELECT L FROM Line L")
+	List<Line> findAll();
+
+	@Modifying
+	@Query(value = "UPDATE Line l set l.name=?1 , l.company=?2, l.brancheCompany=?3, "
+			+ "l.level=?4, l.nature=?5, l.startStationName=?6, l.endStationName=?7, l.startStationFirstTime=?8, "
+			+ "l.startStationEndTime=?9, l.endStationFirstTime=?10, l.endStationEndTime=?11, l.linePlayType=?12, "
+			+ "l.openDate=?13, l.es=?14, l.shortName=?15, l.shanghaiLinecode=?16, l.eqLinecode=?17, l.startPhone=?18, "
+			+ "l.endPhone=?19, l.carSumNumber=?20, l.hvacCarNumber=?21, l.ordCarNumber=?22, l.history=?23, "
+			+ "l.descriptions=?24, l.destroy=?25, l.supperLine=?26, l.spacGrade=?27, l.warrantCar=?28, l.region=?30 , l.inUse=?31 , l.ticketPrice=?32 where "
+			+ "l.lineCode=?29")
+	int update(String name, String company, String brancheCompany, String level, String nature,
+			String startStationName, String endStationName, String startStationFirstTime, String startStationEndTime,
+			String endStationFirstTime, String endStationEndTime, Integer linePlayType, Date openDate, String es,
+			String shortName, String shanghaiLinecode, String eqLinecode, String startPhone, String endPhone,
+			Integer carSumNumber, Integer hvacCarNumber, Integer ordCarNumber, String history, String descriptions,
+			Integer destroy, Integer supperLine, Integer spacGrade, Integer warrantCar, String lineCode, Integer region, Integer inUser, int ticketPrice);
+
+	/**
+	 * 查询线路版本文件
+	 * @param lineId
+	 * @return
+	 */
+	@Query(value = "SELECT version_count FROM bsth_c_line_file_version where line = ?1", nativeQuery = true)
+	Integer findfileVersions(Integer lineId);
+
+	/**
+	 *  添加线路文件版本
+	 * @param lineId
+	 * @param line_code
+	 */
+	@Transactional
+	@Modifying
+	@Query(value = "INSERT INTO bsth_c_line_file_version (line,line_code,version_count) VALUES (?1,?2,1)", nativeQuery = true)
+	public void addFileVersions(Integer lineId, String line_code);
+
+	/**
+	 *  线路文件版本修改
+	 * @param lineId
+	 * @param version_count
+	 */
+	@Transactional
+	@Modifying
+	@Query(value = "UPDATE bsth_c_line_file_version set version_count=?2 WHERE line = ?1", nativeQuery = true)
+	public void editFileVersions(Integer lineId, Integer version_count);
+
+}
@@ -47,8 +47,8 @@ public interface CwjyRepository extends BaseRepository&lt;Cwjy, Integer&gt;{
  
 	@Transactional
     @Modifying
-	@Query(value="UPDATE bsth_c_ylxxb set jzl = ?1, jsy = ?2, stationid = ?3, bz = ?4 "
-			   + "where gsdm = ?5 and yyrq = ?6 and nbbm = ?7 and jylx = '1' ",nativeQuery=true)
-	void import_UpdateJzl(String jzl, String jsy, String jyz, String remarks, String gsbm, String rq, String nbbm);
+	@Query(value="UPDATE bsth_c_ylxxb set jzl = ?1, jsy = ?2, stationid = ?3, bz = ?4, updatetime = ?5 "
+			   + "where gsdm = ?6 and yyrq = ?7 and nbbm = ?8 and jylx = '1' ",nativeQuery=true)
+	void import_UpdateJzl(String jzl, String jsy, String jyz, String remarks, String updatetime, String gsbm, String rq, String nbbm);
  
 }
@@ -35,8 +35,8 @@ public interface JdlRepository extends BaseRepository&lt;Jdl, Integer&gt;{
  
 	@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",nativeQuery=true)
-	void UpdateJdl(String jdl, String gsbm, String fgsbm, String rq, String nbbm);
+	@Query(value="UPDATE bsth_c_jdl set jdl = ?1, update_date = ?2 where gs_bm = ?3 and fgs_bm = ?4 and rq = ?5 and nbbm = ?6",nativeQuery=true)
+	void UpdateJdl(String jdl, String updateDate, String gsbm, String fgsbm, String rq, String nbbm);
  
 	@Query(value="SELECT * FROM bsth_c_jdl where rq=?1 and gs_bm like %?2%",nativeQuery=true)
 	List<Jdl> obtainJdl(String rq, String gsbm);
@@ -35,7 +35,7 @@ public interface JqlRepository extends BaseRepository&lt;Jql, Integer&gt;{
  
 	@Transactional
     @Modifying
-	@Query(value="UPDATE bsth_c_jql set jql = ?1 where gs_bm = ?2 and fgs_bm = ?3 and rq = ?4 and nbbm = ?5",nativeQuery=true)
-	void UpdateJql(String jql, String gsbm, String fgsbm, String rq, String nbbm);
+	@Query(value="UPDATE bsth_c_jql set jql = ?1, update_date = ?2 where gs_bm = ?3 and fgs_bm = ?4 and rq = ?5 and nbbm = ?6",nativeQuery=true)
+	void UpdateJql(String jql, String updateDate, String gsbm, String fgsbm, String rq, String nbbm);
  
 }
@@ -251,7 +251,7 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 					y.setStationid(stationid);
 					y.setJyggh(jyggh);
 					y.setBz(bz);
-					y.setCreatetime(new Date());
+					y.setUpdatetime(new Date());
 					y.setYyrq(date);
 					ylxxbRepository.save(y);
 				}else{
@@ -530,7 +530,7 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 					repository.import_insertData(gsbm, rq, nbbm, jsy, 
 							df.format(jzl), jyz, remarks, sd.format(new Date()));
 				}else{
-					repository.import_UpdateJzl(df.format(jzl), jsy, jyz, remarks, gsbm, rq, nbbm);
+					repository.import_UpdateJzl(df.format(jzl), jsy, jyz, remarks, sd.format(new Date()), gsbm, rq, nbbm);
 				}
 			}
  
@@ -90,7 +90,7 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 							df.format(jdl), jdz, remarks, sd.format(new Date()));
 				}else{
 //					jdl += jdl_.get(0);
-					repository.UpdateJdl(df.format(jdl), gsbm, fgsbm, rq, nbbm);
+					repository.UpdateJdl(df.format(jdl), sd.format(new Date()), gsbm, fgsbm, rq, nbbm);
 				}
 			}
 			wb.close();
@@ -90,7 +90,7 @@ public class JqlServiceImpl extends BaseServiceImpl&lt;Jql, Integer&gt; implements Jql
 							df.format(jql), jqz, remarks, sd.format(new Date()));
 				}else{
 //					jql += jql_.get(0);
-					repository.UpdateJql(df.format(jql), gsbm, fgsbm, rq, nbbm);
+					repository.UpdateJql(df.format(jql), sd.format(new Date()), gsbm, fgsbm, rq, nbbm);
 				}
 			}
 			wb.close();
@@ -44,6 +44,8 @@ public interface ReportService {
  
 	 List<Map<String, Object>> lineList();
  
+	 List<Map<String, Object>> lineListNotDestroy();
+	 
 	 List<Map<String, String>> carList(Map<String, Object> map);
 	 List<Map<String, String>> carListByHistory(Map<String, Object> map);
  
@@ -1990,6 +1990,25 @@ public class ReportServiceImpl implements ReportService{
 	public List<Map<String, Object>> lineList() {
 		// TODO Auto-generated method stub
 		List<Map<String, Object>>  list=new ArrayList<Map<String,Object>>();
+		List<Line> findAllLine = lineRepository.findAllLine();
+		for(Line line : findAllLine){
+			Map<String, Object> map=new HashMap<String,Object>();
+			map.put("gsbm", line.getCompany());
+			map.put("fgsbm", line.getBrancheCompany());
+			map.put("xlbm", line.getLineCode());
+			if(line.getDestroy() == 1){
+				map.put("xlname", line.getName() + "(撤销)");
+			} else {
+				map.put("xlname", line.getName());
+			}
+			list.add(map);
+		}
+		return list;
+	}
+	@Override
+	public List<Map<String, Object>> lineListNotDestroy() {
+		// TODO Auto-generated method stub
+		List<Map<String, Object>>  list=new ArrayList<Map<String,Object>>();
 		Iterator<Line> iterator = lineRepository.findAllService().iterator();
 		Line line;
 		while (iterator.hasNext()) {