1.线路调查表加入起讫站

王通
1 parent 3e1c7b92
Showing 4 changed files with 333 additions and 318 deletions
src/main/java/com/bsth/entity/calc/CalcInvestigateMonth.java
src/main/java/com/bsth/service/calc/impl/CalcMixServiceImpl.java
src/main/resources/static/pages/forms/calc/calcInvestigateMonth.html
src/main/resources/static/pages/forms/mould/calcInvestigateMonth.xls
-package com.bsth.entity.calc;
-
-import java.util.Date;
-
-import javax.persistence.*;
-
-@Entity
-@Table(name = "bsth_c_calc_investigate_month")
-public class CalcInvestigateMonth {
-	/* 主键*/
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Long id;
-	/* 月(yyyy-MM)*/
-	private String month;
-	/* 线路*/
-	private String xl;
-	/* 公司编码*/
-	private String gsbm;
-	/* 分公司编码*/
-	private String fgsbm;
-	/* 线路名称*/
-	private String xlmc;
-	/* 权证配车数*/
-	private String qzpcs;
-	/* 线路属性*/
-	private String xlsx;
-	/* 线路类型*/
-	private String xllx;
-	/* 线路长度*/
-	private String xlcd;
-	/* 是否挂牌*/
-	private String sfgp;
-	/* 是否冷僻线路*/
-	private String sflpxl;
-	/* 首末班时间*/
-	private String smbsj;
-	/* 调度方式(常规、多样化)*/
-	private String ddfs;
-	/* 高峰间隔时间*/
-	private String gfjgsj;
-	/* 低谷间隔时间*/
-	private String dgjgsj;
-	/* 是否衔接轨交末班*/
-	private String sfxjgj;
-	/* 日均里程*/
-	private String rjlc;
-	/* 日均班次*/
-	private String rjbc;
-	/* 日均人次*/
-	private String rjrc;
-	/* 日均单车人次*/
-	private String rjdcrc;
-	/* 每班车人次*/
-	private String mbcrc;
-	/* 计划总公里*/
-	private String jhzgl;
-	/* 实际总公里*/
-	private String sjzgl;
-	/* 实际营运里程*/
-	private String sjyylc;
-	/* 里程利用率*/
-	private String lclyl;
-	/* 百公里人次*/
-	private String bglrc;
-	/* 月人次*/
-	private String yrc;
-	/* 月营收*/
-	private String yys;
-	/* 票价*/
-	private String pj;
-	/* 百公里营收*/
-	private String bglys;
-	/* 途径轨交站*/
-	private String tjgjz;
-	/* 途径三级医院*/
-	private String tjsjyy;
-	/* 唯一线*/
-	private String wyx;
-	/* 线路走向*/
-	private String xlzx;
-	/* 线路站点*/
-	private String xlzd;
-	/* 备注*/
-	private String bz;
-	/* 创建时间（更新时间）*/
-	private Date createDate;
-	
-	public Long getId() {
-		return id;
-	}
-	public void setId(Long id) {
-		this.id = id;
-	}
-	public String getMonth() {
-		return month;
-	}
-	public void setMonth(String month) {
-		this.month = month;
-	}
-	public String getGsbm() {
-		return gsbm;
-	}
-	public void setGsbm(String gsbm) {
-		this.gsbm = gsbm;
-	}
-	public String getFgsbm() {
-		return fgsbm;
-	}
-	public void setFgsbm(String fgsbm) {
-		this.fgsbm = fgsbm;
-	}
-	public String getXl() {
-		return xl;
-	}
-	public void setXl(String xl) {
-		this.xl = xl;
-	}
-	public String getXlmc() {
-		return xlmc;
-	}
-	public void setXlmc(String xlmc) {
-		this.xlmc = xlmc;
-	}
-	public String getQzpcs() {
-		return qzpcs;
-	}
-	public void setQzpcs(String qzpcs) {
-		this.qzpcs = qzpcs;
-	}
-	public String getXlsx() {
-		return xlsx;
-	}
-	public void setXlsx(String xlsx) {
-		this.xlsx = xlsx;
-	}
-	public String getXllx() {
-		return xllx;
-	}
-	public void setXllx(String xllx) {
-		this.xllx = xllx;
-	}
-	public String getXlcd() {
-		return xlcd;
-	}
-	public void setXlcd(String xlcd) {
-		this.xlcd = xlcd;
-	}
-	public String getSfgp() {
-		return sfgp;
-	}
-	public void setSfgp(String sfgp) {
-		this.sfgp = sfgp;
-	}
-	public String getSflpxl() {
-		return sflpxl;
-	}
-	public void setSflpxl(String sflpxl) {
-		this.sflpxl = sflpxl;
-	}
-	public String getSmbsj() {
-		return smbsj;
-	}
-	public void setSmbsj(String smbsj) {
-		this.smbsj = smbsj;
-	}
-	public String getDdfs() {
-		return ddfs;
-	}
-	public void setDdfs(String ddfs) {
-		this.ddfs = ddfs;
-	}
-	public String getGfjgsj() {
-		return gfjgsj;
-	}
-	public void setGfjgsj(String gfjgsj) {
-		this.gfjgsj = gfjgsj;
-	}
-	public String getDgjgsj() {
-		return dgjgsj;
-	}
-	public void setDgjgsj(String dgjgsj) {
-		this.dgjgsj = dgjgsj;
-	}
-	public String getSfxjgj() {
-		return sfxjgj;
-	}
-	public void setSfxjgj(String sfxjgj) {
-		this.sfxjgj = sfxjgj;
-	}
-	public String getRjlc() {
-		return rjlc;
-	}
-	public void setRjlc(String rjlc) {
-		this.rjlc = rjlc;
-	}
-	public String getRjbc() {
-		return rjbc;
-	}
-	public void setRjbc(String rjbc) {
-		this.rjbc = rjbc;
-	}
-	public String getRjrc() {
-		return rjrc;
-	}
-	public void setRjrc(String rjrc) {
-		this.rjrc = rjrc;
-	}
-	public String getRjdcrc() {
-		return rjdcrc;
-	}
-	public void setRjdcrc(String rjdcrc) {
-		this.rjdcrc = rjdcrc;
-	}
-	public String getMbcrc() {
-		return mbcrc;
-	}
-	public void setMbcrc(String mbcrc) {
-		this.mbcrc = mbcrc;
-	}
-	public String getJhzgl() {
-		return jhzgl;
-	}
-	public void setJhzgl(String jhzgl) {
-		this.jhzgl = jhzgl;
-	}
-	public String getSjzgl() {
-		return sjzgl;
-	}
-	public void setSjzgl(String sjzgl) {
-		this.sjzgl = sjzgl;
-	}
-	public String getSjyylc() {
-		return sjyylc;
-	}
-	public void setSjyylc(String sjyylc) {
-		this.sjyylc = sjyylc;
-	}
-	public String getLclyl() {
-		return lclyl;
-	}
-	public void setLclyl(String lclyl) {
-		this.lclyl = lclyl;
-	}
-	public String getBglrc() {
-		return bglrc;
-	}
-	public void setBglrc(String bglrc) {
-		this.bglrc = bglrc;
-	}
-	public String getYrc() {
-		return yrc;
-	}
-	public void setYrc(String yrc) {
-		this.yrc = yrc;
-	}
-	public String getYys() {
-		return yys;
-	}
-	public void setYys(String yys) {
-		this.yys = yys;
-	}
-	public String getPj() {
-		return pj;
-	}
-	public void setPj(String pj) {
-		this.pj = pj;
-	}
-	public String getBglys() {
-		return bglys;
-	}
-	public void setBglys(String bglys) {
-		this.bglys = bglys;
-	}
-	public String getTjgjz() {
-		return tjgjz;
-	}
-	public void setTjgjz(String tjgjz) {
-		this.tjgjz = tjgjz;
-	}
-	public String getTjsjyy() {
-		return tjsjyy;
-	}
-	public void setTjsjyy(String tjsjyy) {
-		this.tjsjyy = tjsjyy;
-	}
-	public String getWyx() {
-		return wyx;
-	}
-	public void setWyx(String wyx) {
-		this.wyx = wyx;
-	}
-	public String getXlzx() {
-		return xlzx;
-	}
-	public void setXlzx(String xlzx) {
-		this.xlzx = xlzx;
-	}
-	public String getXlzd() {
-		return xlzd;
-	}
-	public void setXlzd(String xlzd) {
-		this.xlzd = xlzd;
-	}
-	public String getBz() {
-		return bz;
-	}
-	public void setBz(String bz) {
-		this.bz = bz;
-	}
-	public Date getCreateDate() {
-		return createDate;
-	}
-	public void setCreateDate(Date createDate) {
-		this.createDate = createDate;
-	}
-	
-}
+package com.bsth.entity.calc;
+
+import java.util.Date;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "bsth_c_calc_investigate_month")
+public class CalcInvestigateMonth {
+	/* 主键*/
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Long id;
+	/* 月(yyyy-MM)*/
+	private String month;
+	/* 线路*/
+	private String xl;
+	/* 公司编码*/
+	private String gsbm;
+	/* 分公司编码*/
+	private String fgsbm;
+	/* 线路名称*/
+	private String xlmc;
+	/* 权证配车数*/
+	private String qzpcs;
+	/* 线路属性*/
+	private String xlsx;
+	/* 线路类型*/
+	private String xllx;
+	/* 线路长度*/
+	private String xlcd;
+	/* 是否挂牌*/
+	private String sfgp;
+	/* 是否冷僻线路*/
+	private String sflpxl;
+	/* 首末班时间*/
+	private String smbsj;
+	/* 调度方式(常规、多样化)*/
+	private String ddfs;
+	/* 高峰间隔时间*/
+	private String gfjgsj;
+	/* 低谷间隔时间*/
+	private String dgjgsj;
+	/* 是否衔接轨交末班*/
+	private String sfxjgj;
+	/* 日均里程*/
+	private String rjlc;
+	/* 日均班次*/
+	private String rjbc;
+	/* 日均人次*/
+	private String rjrc;
+	/* 日均单车人次*/
+	private String rjdcrc;
+	/* 每班车人次*/
+	private String mbcrc;
+	/* 计划总公里*/
+	private String jhzgl;
+	/* 实际总公里*/
+	private String sjzgl;
+	/* 实际营运里程*/
+	private String sjyylc;
+	/* 里程利用率*/
+	private String lclyl;
+	/* 百公里人次*/
+	private String bglrc;
+	/* 月人次*/
+	private String yrc;
+	/* 月营收*/
+	private String yys;
+	/* 票价*/
+	private String pj;
+	/* 百公里营收*/
+	private String bglys;
+	/* 途径轨交站*/
+	private String tjgjz;
+	/* 途径三级医院*/
+	private String tjsjyy;
+	/* 唯一线*/
+	private String wyx;
+	/* 线路走向*/
+	private String xlzx;
+	/* 线路站点*/
+	private String xlzd;
+	/* 备注*/
+	private String bz;
+	/* 创建时间（更新时间）*/
+	private Date createDate;
+
+	/**
+	 * 起讫站
+	 */
+	private String qqz;
+	
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public String getMonth() {
+		return month;
+	}
+	public void setMonth(String month) {
+		this.month = month;
+	}
+	public String getGsbm() {
+		return gsbm;
+	}
+	public void setGsbm(String gsbm) {
+		this.gsbm = gsbm;
+	}
+	public String getFgsbm() {
+		return fgsbm;
+	}
+	public void setFgsbm(String fgsbm) {
+		this.fgsbm = fgsbm;
+	}
+	public String getXl() {
+		return xl;
+	}
+	public void setXl(String xl) {
+		this.xl = xl;
+	}
+	public String getXlmc() {
+		return xlmc;
+	}
+	public void setXlmc(String xlmc) {
+		this.xlmc = xlmc;
+	}
+	public String getQzpcs() {
+		return qzpcs;
+	}
+	public void setQzpcs(String qzpcs) {
+		this.qzpcs = qzpcs;
+	}
+	public String getXlsx() {
+		return xlsx;
+	}
+	public void setXlsx(String xlsx) {
+		this.xlsx = xlsx;
+	}
+	public String getXllx() {
+		return xllx;
+	}
+	public void setXllx(String xllx) {
+		this.xllx = xllx;
+	}
+	public String getXlcd() {
+		return xlcd;
+	}
+	public void setXlcd(String xlcd) {
+		this.xlcd = xlcd;
+	}
+	public String getSfgp() {
+		return sfgp;
+	}
+	public void setSfgp(String sfgp) {
+		this.sfgp = sfgp;
+	}
+	public String getSflpxl() {
+		return sflpxl;
+	}
+	public void setSflpxl(String sflpxl) {
+		this.sflpxl = sflpxl;
+	}
+	public String getSmbsj() {
+		return smbsj;
+	}
+	public void setSmbsj(String smbsj) {
+		this.smbsj = smbsj;
+	}
+	public String getDdfs() {
+		return ddfs;
+	}
+	public void setDdfs(String ddfs) {
+		this.ddfs = ddfs;
+	}
+	public String getGfjgsj() {
+		return gfjgsj;
+	}
+	public void setGfjgsj(String gfjgsj) {
+		this.gfjgsj = gfjgsj;
+	}
+	public String getDgjgsj() {
+		return dgjgsj;
+	}
+	public void setDgjgsj(String dgjgsj) {
+		this.dgjgsj = dgjgsj;
+	}
+	public String getSfxjgj() {
+		return sfxjgj;
+	}
+	public void setSfxjgj(String sfxjgj) {
+		this.sfxjgj = sfxjgj;
+	}
+	public String getRjlc() {
+		return rjlc;
+	}
+	public void setRjlc(String rjlc) {
+		this.rjlc = rjlc;
+	}
+	public String getRjbc() {
+		return rjbc;
+	}
+	public void setRjbc(String rjbc) {
+		this.rjbc = rjbc;
+	}
+	public String getRjrc() {
+		return rjrc;
+	}
+	public void setRjrc(String rjrc) {
+		this.rjrc = rjrc;
+	}
+	public String getRjdcrc() {
+		return rjdcrc;
+	}
+	public void setRjdcrc(String rjdcrc) {
+		this.rjdcrc = rjdcrc;
+	}
+	public String getMbcrc() {
+		return mbcrc;
+	}
+	public void setMbcrc(String mbcrc) {
+		this.mbcrc = mbcrc;
+	}
+	public String getJhzgl() {
+		return jhzgl;
+	}
+	public void setJhzgl(String jhzgl) {
+		this.jhzgl = jhzgl;
+	}
+	public String getSjzgl() {
+		return sjzgl;
+	}
+	public void setSjzgl(String sjzgl) {
+		this.sjzgl = sjzgl;
+	}
+	public String getSjyylc() {
+		return sjyylc;
+	}
+	public void setSjyylc(String sjyylc) {
+		this.sjyylc = sjyylc;
+	}
+	public String getLclyl() {
+		return lclyl;
+	}
+	public void setLclyl(String lclyl) {
+		this.lclyl = lclyl;
+	}
+	public String getBglrc() {
+		return bglrc;
+	}
+	public void setBglrc(String bglrc) {
+		this.bglrc = bglrc;
+	}
+	public String getYrc() {
+		return yrc;
+	}
+	public void setYrc(String yrc) {
+		this.yrc = yrc;
+	}
+	public String getYys() {
+		return yys;
+	}
+	public void setYys(String yys) {
+		this.yys = yys;
+	}
+	public String getPj() {
+		return pj;
+	}
+	public void setPj(String pj) {
+		this.pj = pj;
+	}
+	public String getBglys() {
+		return bglys;
+	}
+	public void setBglys(String bglys) {
+		this.bglys = bglys;
+	}
+	public String getTjgjz() {
+		return tjgjz;
+	}
+	public void setTjgjz(String tjgjz) {
+		this.tjgjz = tjgjz;
+	}
+	public String getTjsjyy() {
+		return tjsjyy;
+	}
+	public void setTjsjyy(String tjsjyy) {
+		this.tjsjyy = tjsjyy;
+	}
+	public String getWyx() {
+		return wyx;
+	}
+	public void setWyx(String wyx) {
+		this.wyx = wyx;
+	}
+	public String getXlzx() {
+		return xlzx;
+	}
+	public void setXlzx(String xlzx) {
+		this.xlzx = xlzx;
+	}
+	public String getXlzd() {
+		return xlzd;
+	}
+	public void setXlzd(String xlzd) {
+		this.xlzd = xlzd;
+	}
+	public String getBz() {
+		return bz;
+	}
+	public void setBz(String bz) {
+		this.bz = bz;
+	}
+	public Date getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	public String getQqz() {
+		return qqz;
+	}
+
+	public void setQqz(String qqz) {
+		this.qqz = qqz;
+	}
+}
@@ -440,6 +440,7 @@ public class CalcMixServiceImpl implements CalcMixService {
 					map.put("xlzx", c.getXlzx()!=null?c.getXlzx():"");
 					map.put("xlzd", c.getXlzd()!=null?c.getXlzd():"");
 					map.put("bz", c.getBz()!=null?c.getBz():"");
+					map.put("qqz", c.getQqz()!=null?c.getQqz():"");
 					mapList.add(map);
 				}
 				listI.add(mapList.iterator());
@@ -94,6 +94,7 @@
 								<td rowspan="2">线路长度</td>
 								<td rowspan="2">是否挂牌线路</td>
 								<td rowspan="2">是否冷僻线路</td>
+								<td rowspan="2">起讫站</td>
 								<td rowspan="2" style="min-width:175px">首末班时间</td>
 								<td colspan="2">调度方式</td>
@@ -325,6 +326,7 @@
 			<td>{{obj.xlcd}}</td>
 			<td>{{obj.sfgp}}</td>
 			<td>{{obj.sflpxl}}</td>
+			<td>{{obj.qqz}}</td>
 			<td>{{obj.smbsj}}</td>
 			<td>{{if obj.ddfs == '常规'}}√{{/if}}</td>
 			<td>{{if obj.ddfs == '多样化'}}√{{/if}}</td>