1.线路调查表加入‘公司’列

王通
1 parent 09fea85d
Showing 4 changed files with 36 additions and 0 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
@@ -17,8 +17,22 @@ public class CalcInvestigateMonth {
 	private String xl;
 	/* 公司编码*/
 	private String gsbm;
+
+	/**
+	 * 公司名称
+	 */
+	@Transient
+	private String gsName;
+
 	/* 分公司编码*/
 	private String fgsbm;
+
+	/**
+	 * 分公司名称
+	 */
+	@Transient
+	private String fgsName;
+
 	/* 线路名称*/
 	private String xlmc;
 	/* 权证配车数*/
@@ -327,4 +341,20 @@ public class CalcInvestigateMonth {
 	public void setQqz(String qqz) {
 		this.qqz = qqz;
 	}
+
+	public String getGsName() {
+		return gsName;
+	}
+
+	public void setGsName(String gsName) {
+		this.gsName = gsName;
+	}
+
+	public String getFgsName() {
+		return fgsName;
+	}
+
+	public void setFgsName(String fgsName) {
+		this.fgsName = fgsName;
+	}
 }
@@ -371,6 +371,8 @@ public class CalcMixServiceImpl implements CalcMixService {
 		}
  
 		for(CalcInvestigateMonth c : list){
+			c.setGsName(BasicData.businessCodeNameMap.get(c.getGsbm()));
+			c.setFgsName(BasicData.businessFgsCodeNameMap.get(String.format("%s_%s", c.getGsbm(), c.getFgsbm())));
 			if("1".equals(nature)){
 				if(lineNature.containsKey(c.getXl()) && lineNature.get(c.getXl())){
 					resList.add(c);
@@ -441,6 +443,8 @@ public class CalcMixServiceImpl implements CalcMixService {
 					map.put("xlzd", c.getXlzd()!=null?c.getXlzd():"");
 					map.put("bz", c.getBz()!=null?c.getBz():"");
 					map.put("qqz", c.getQqz()!=null?c.getQqz():"");
+					map.put("gsName", BasicData.businessCodeNameMap.get(c.getGsbm()));
+					map.put("fgsName", BasicData.businessFgsCodeNameMap.get(String.format("%s_%s", c.getGsbm(), c.getFgsbm())));
 					mapList.add(map);
 				}
 				listI.add(mapList.iterator());
@@ -88,6 +88,7 @@
 							<tr>
 								<td rowspan="2">序号</td>
 								<td rowspan="2" style="min-width:90px">线路</td>
+								<td rowspan="2" style="min-width:90px">公司</td>
 								<td rowspan="2" style="min-width:90px">权证配车数</td>
 								<td rowspan="2">线路属性</td>
 								<td rowspan="2">线路类型</td>
@@ -320,6 +321,7 @@
 		<tr>
 			<td>{{i + 1}}</td>
 			<td>{{obj.xlmc}}</td>
+			<td>{{obj.gsName}}</td>
 			<td>{{obj.qzpcs}}</td>
 			<td>{{obj.xlsx}}</td>
 			<td>{{obj.xllx}}</td>