调度日报添加青浦格式导出

廖磊
1 parent cf8d49f2
Showing 8 changed files with 275 additions and 112 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/electricity/list/list.html
src/main/resources/static/pages/forms/statement/historyMessage.html
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/forms/statement/scheduleDailyQp.html
src/main/resources/static/pages/forms/statement/statisticsDailyCalc2.html
@@ -515,6 +515,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.realScheduleList(line,date);
 	}
+	@RequestMapping(value="/realScheduleList_zrw")
+	public List<ScheduleRealInfo> realScheduleList_zrw(@RequestParam String line,@RequestParam String date){
+		return scheduleRealInfoService.realScheduleList_zrw(line,date);
+	}
+	
 	@RequestMapping(value="/realScheduleList_mh_2")
 	public List<ScheduleRealInfo> realScheduleList_mh_2(@RequestParam String line,@RequestParam String date){
 		return scheduleRealInfoService.realScheduleList_mh_2(line,date);
@@ -132,8 +132,8 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Long getMaxId();
 	Map<String,Object> scheduleDaily(String line,String date);
-	
 	List<ScheduleRealInfo> realScheduleList(String line,String date);
+	List<ScheduleRealInfo> realScheduleList_zrw(String line,String date);
 	List<ScheduleRealInfo> realScheduleListQp(String line,String date);
 	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm,String jGh,String nbbm);
@@ -3433,6 +3433,195 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     }
     @Override
+    public List<ScheduleRealInfo> realScheduleList_zrw(String line, String date) {
+        List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
+        String lpName = "lpName";
+        String zdsj = "";
+        String zdsjActual = "";
+        String zdsj1 = "";
+        String zdsjActual1 = "";
+        List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.scheduleDdrb(line, date);
+        
+        /*
+         * 对计划发车时间相同的班次进行排序 out最前 in最后
+         */
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        String minfcsj = "02:00";
+        List<Line> lineList = lineRepository.findLineByCode(line);
+        if (lineList.size() > 0) {
+            String sqlMinYysj = "select start_opt from bsth_c_line_config where "
+                    + " id = ("
+                    + "select max(id) from bsth_c_line_config where line ='" + lineList.get(0).getId() + "'"
+                    + ")";
+            minfcsj = jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        }
+        String[] minSjs = minfcsj.split(":");
+        Long minSj = Long.parseLong(minSjs[0]) * 60 + Long.parseLong(minSjs[1]);
+        for (int i = 0; i < listInfo.size(); i++) {
+            ScheduleRealInfo s = listInfo.get(i);
+            if (s.getBcType().equals("out")) {
+                s.setRemark("1");
+            } else if (s.getBcType().equals("in")) {
+                s.setRemark("3");
+            } else {
+                s.setRemark("2");
+            }
+            String[] fcsj = s.getFcsj().split(":");
+            Long fcsjL = Long.parseLong(fcsj[0]) * 60 + Long.parseLong(fcsj[1]);
+
+            Long fscjT = 0L;
+            if (fcsjL < minSj) {
+                Calendar calendar = new GregorianCalendar();
+                calendar.setTime(s.getScheduleDate());
+                calendar.add(calendar.DATE, 1);
+                s.setScheduleDate(calendar.getTime());
+                try {
+                    fscjT = sdf.parse(sdf.format(s.getScheduleDate()) + " " + s.getFcsj()).getTime();
+                } catch (ParseException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+
+            } else {
+                try {
+                    fscjT = sdf.parse(s.getScheduleDateStr() + " " + s.getFcsj()).getTime();
+                } catch (ParseException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+                ;
+            }
+            s.setFcsjT(fscjT);
+        }
+
+//        Collections.sort(listInfo, new compareLpFcsjType());
+        List<ScheduleRealInfo> listInfo2=new ArrayList<ScheduleRealInfo>();
+
+        Collections.sort(listInfo, new compareLpFcsjType());
+        for (int i = 0; i < listInfo.size(); i++) {
+            ScheduleRealInfo t = listInfo.get(i);
+            if (!lpName.equals(t.getLpName())) {
+                zdsjActual = t.getZdsjActual();
+                zdsj = t.getZdsj();
+                t.setZdsjActual("");
+                t.setZdsj("");
+            } else {
+                zdsj1 = t.getZdsj();
+                zdsjActual1 = t.getZdsjActual();
+                t.setZdsjActual(zdsjActual);
+                t.setZdsj(zdsj);
+                zdsj = zdsj1;
+                zdsjActual = zdsjActual1;
+            }
+            
+            
+           
+            lpName = t.getLpName();
+            listInfo2.add(t);
+            
+        }
+
+       Collections.sort(listInfo2,new compareDirLpFcsjType());
+       for (int i = 0; i < listInfo2.size(); i++) {
+    	   ScheduleRealInfo t=listInfo2.get(i);
+    	   list.add(t);
+           Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+           //计算营运里程，空驶里程
+           if (!childTaskPlans.isEmpty()) {
+               List<ChildTaskPlan> listit = new ArrayList<ChildTaskPlan>(childTaskPlans);
+               Collections.sort(listit, new ComparableChild());
+               for (int j = 0; j < listit.size(); j++) {
+                   ScheduleRealInfo s = new ScheduleRealInfo();
+                   ChildTaskPlan childTaskPlan = listit.get(j);
+                   if (childTaskPlan.getCcId() == null) {
+                       if (childTaskPlan.isDestroy()) {
+                           s.setFcsjActual("");
+                           s.setZdsjActual("");
+                       } else {
+                           s.setFcsjActual(childTaskPlan.getStartDate());
+                           s.setZdsjActual("");
+                           s.setJhlc(Double.parseDouble(String.valueOf(childTaskPlan.getMileage())));
+                       }
+                       s.setFcsj(childTaskPlan.getStartDate());
+                       s.setZdsj("");
+                       s.setQdzName(childTaskPlan.getStartStationName());
+                       s.setZdzName(childTaskPlan.getEndStationName());
+                       s.setRemarks(childTaskPlan.getRemarks());
+                       s.setAdjustExps("子");
+                       s.setLpName("");
+                       list.add(s);
+                   }
+               }
+           }
+       }
+        List<ScheduleRealInfo> xList = new ArrayList<ScheduleRealInfo>();
+        List<ScheduleRealInfo> yList = new ArrayList<ScheduleRealInfo>();
+        List<ScheduleRealInfo> zList = new ArrayList<ScheduleRealInfo>();
+        List<ScheduleRealInfo> newList = new ArrayList<ScheduleRealInfo>();
+        if (list.size() > 0) {
+            int a = list.size() % 3;
+            int b = list.size() / 3;
+            int x = 0, y = 0;
+            if (a == 2) {
+                x = b + 1;
+                y = x * 2;
+            } else if (a == 1) {
+                x = b + 1;
+                y = x * 2 - 1;
+            } else {
+                x = b;
+                y = 2 * x;
+
+            }
+            for (int i = 0; i < list.size(); i++) {
+                ScheduleRealInfo s = list.get(i);
+                if (i + 1 <= x) {
+                    xList.add(s);
+                } else if ((i + 1) > x && (i + 1) <= y) {
+                    yList.add(s);
+                } else {
+                    zList.add(s);
+                }
+            }
+            for (int i = 0; i < x; i++) {
+                newList.add(xList.get(i));
+                if (yList.size() > i) {
+                    newList.add(yList.get(i));
+                } else {
+                    newList.add(new ScheduleRealInfo());
+                }
+                if (zList.size() > i) {
+                    newList.add(zList.get(i));
+                } else {
+                    newList.add(new ScheduleRealInfo());
+                }
+
+            }
+        }
+      /*  for (int i = 0; i < newList.size(); i++) {
+            ScheduleRealInfo t1 = newList.get(i);
+            for (int j = 0; j < list.size(); j++) {
+                ScheduleRealInfo t2 = list.get(j);
+                if (t1.getId() == t2.getId()) {
+                    t1 = t2;
+                }
+            }
+        }*/
+
+        for (int i = 0; i < newList.size(); i++) {
+            ScheduleRealInfo t1 = newList.get(i);
+            String reamrks1 = t1.getRemarks() == null ? "" : t1.getRemarks();
+            if (reamrks1.length() > 4) {
+                t1.setRemarks(reamrks1.substring(0, 4));
+                t1.setRemark(reamrks1);
+            } else {
+                t1.setRemark(reamrks1);
+            }
+        }
+        return newList;
+    }
+    
+    @Override
     public List<ScheduleRealInfo> realScheduleList_mh_2(String line, String date) {
         List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
         String lpName = "lpName";
@@ -4774,13 +4963,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         String xlName = map.get("xlName").toString();
         String state = map.get("state").toString();
         String type = map.get("type").toString();
-
+        String genre =map.get("genre").toString();
         List<Map<String, Object>> dataList2 = new ArrayList<Map<String, Object>>();
         List<Map<String, Object>> dataList3 = new ArrayList<Map<String, Object>>();
         List<Map<String, Object>> list1 = this.statisticsDaily(line, date, xlName, null);
         List<ScheduleRealInfo> list2 = this.queryUserInfo(line, date, state);
-        List<ScheduleRealInfo> list3 = this.realScheduleList(line, date);
-
+        List<ScheduleRealInfo> list3 =   new ArrayList<ScheduleRealInfo>();
+        if(genre.equals("qp"))
+        	list3=this.realScheduleListQp(line, date);
+        else if(genre.equals("zrw"))	
+        	list3=this.realScheduleList_zrw(line, date);
+        else 
+        	list3=this.realScheduleList(line, date);
         Map<String, Object> nMap = new HashMap<String, Object>();
         nMap.put("date", xlName + date);
         nMap.put("jls", list1.get(0).get("jls"));
@@ -4908,7 +5102,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
             }
             tempMap.put("zdsjk" + x, zdsjk);
-            tempMap.put("zdsjm" + x, zdsjm);
+            tempMap.put("zdsjm" + x, zdsjm.equals("0")?"":zdsjm);
             tempMap.put("fcsj" + x, schedule.getFcsj());
             String fcsjActural = schedule.getFcsjActual() != null ? schedule.getFcsjActual() : "";
             String bcType = schedule.getBcType() != null ? schedule.getBcType() : "";
@@ -4935,7 +5129,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
             }
             tempMap.put("fcsjk" + x, fcsjk);
-            tempMap.put("fcsjm" + x, fcsjm);
+            tempMap.put("fcsjm" + x, fcsjm.equals("0")?"":fcsjm);
             tempMap.put("remarks" + x, schedule.getRemark() != null ? schedule.getRemark() : "");
             size++;
@@ -273,7 +273,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             if ($("#rq").val() != "") {
             	var params=getParamsList();
             	$get('/ylb/checkDate',params,function(status){
-            		if(status=='3'){
+            		if(status=='2'){
                		 layer.msg('只能操作三天内数据.');
                		}else{
 		                var i = layer.load(2);
@@ -294,7 +294,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             if ($("#rq").val() != "") {
             	var params=getParamsList();
             	$get('/ylb/checkDate',params,function(status){
-            		if(status=='3'){
+            		if(status=='2'){
                		 layer.msg('只能操作三天内数据.');
                		}else{
 		                var i = layer.load(2);
@@ -314,7 +314,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         $("#saveButton").on('click',function(){
         	var params_=getParamsList();
         	$get('/ylb/checkDate',params_,function(status){
-        		if(status=='3'){
+        		if(status=='2'){
            		 layer.msg('只能操作三天内数据.');
            		}else{
 		        	var ylArray = [];
@@ -426,7 +426,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             if ($("#rq").val() != "") {
             	var params=getParamsList();
             	$get('/ylb/checkDate',params,function(status){
-            		if(status=='3'){
+            		if(status=='2'){
                		 layer.msg('只能操作三天内数据.');
                		}else{
 		                var i = layer.load(2);
@@ -590,7 +590,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         	var params=getParamsList();
 			var id = $(this).data('id');
         	$get('/ylb/checkDate',params,function(status){
-        		if(status=='3'){
+        		if(status=='2'){
            		 layer.msg('只能操作三天内数据.');
            		}else{
 		    		var jsy=$('.in_carpark_jsy[data-id='+id+']', '#dl_oil_list').val();
@@ -734,7 +734,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         $('#removeButton').on('click', function () {
         	var params_=getParamsList();
         	$get('/ylb/checkDate',params_,function(status){
-        		if(status=='3'){
+        		if(status=='2'){
            		 layer.msg('只能操作三天内数据.');
            		}else{
 		        	var idArray = [];
@@ -159,7 +159,7 @@
 			var type = "query";
 			$(".hidden").removeClass("hidden");
 			var i = layer.load(2);
-			if(code==""||code==null){
+// 			if(code==""||code==null){
 				$get('/realSchedule/historyMessage',{line:line,date:date,code:code,type:type},function(result){
 					// 把数据填充到模版中
 					var tbodyHtml = template('list_history',{list:result});
@@ -173,7 +173,7 @@
 						$("#export").removeAttr("disabled");
 				});	
-			}else{
+			/* }else{
 				$get('/report/historyMessageList',{line:line,date:date,code:code,type:type},function(result){
 					// 把数据填充到模版中
 					var tbodyHtml = template('list_history_msg',{list:result});
@@ -187,21 +187,21 @@
 						$("#export").removeAttr("disabled");
 				});	
-			}
+			} */
 		});
 		$("#export").on("click",function(){
 			var type = "export";
 			var i = layer.load(2);
-			if(code==""||code==null){
+// 			if(code==""||code==null){
 				$get('/realSchedule/historyMessage', {line:line,date:date,code:code,type:type}, function(result){
 				window.open("/downloadFile/download?fileName="
 						+moment(date).format("YYYYMMDD")
 						+"-"+lineName+"-调度历史消息");
 				layer.close(i);
 			});
-			}else{
+			/* }else{
 				$get('/report/historyMessageList',{line:line,date:date,code:code,type:"export_msg"},function(result){
 				window.open("/downloadFile/download?fileName="
 						+moment(date).format("YYYYMMDD")+"-"+lineName+"-调度消息分析");
@@ -209,7 +209,7 @@
 			});
-			}
+			} */
 		});
 	});
@@ -446,7 +446,7 @@
 				 divFrom2 = window.document.getElementById('forms_1');
 				divFrom2.style.width=divFrom1.offsetWidth+"px";
 			});
-			$.get('/realSchedule/realScheduleList',{line:line,date:date,type:"query"},function(result){
+			$.get('/realSchedule/realScheduleList_zrw',{line:line,date:date,type:"query"},function(result){
 				getTime(result);
 				var scheduleDaily_3 = template('scheduleDaily_3',{list:result});
 				$('#forms_2 .scheduleDaily_3').html(scheduleDaily_3);
@@ -492,6 +492,7 @@
 			params['xlName'] = xlName;
 			params['type'] = "export";
 			params['state'] = '2';
+			params['genre'] = 'fqp';
 			$get('/realSchedule/scheduleDailyExport', params, function(result){
 				if(date.length == 10)
 					window.open("/downloadFile/download?fileName="+moment(date).format("YYYYMMDD")+"-"+lineName+"-调度日报");
@@ -42,7 +42,7 @@
                     </div>
 				</form>
 			</div>
-			<div class="portlet-body">
+			<div class="portlet-body" id="ddrbExport">
 				<div class="table-container" id="ddrbBody" style="margin-top: 10px;overflow:auto;min-width: 906px">
 					<label>日期：<span id="rqxs"></span>&nbsp;&nbsp;&nbsp;&nbsp;早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
 					<table class="table table-bordered table-hover table-checkable" id="forms">
@@ -111,54 +111,6 @@
 						<tr>
 							<td colspan="40">&nbsp;</td>
 						</tr>
-						<!-- <tr>
-							<td colspan="40">合计</td>
-						</tr>
-						<tr>
-							<td>售票</td>
-							<td colspan="2">1元</td>
-							<td colspan="2">2元</td>
-							<td colspan="2">3元</td>
-							<td colspan="2">4元</td>
-							<td colspan="2">5元</td>
-							<td colspan="2">6元</td>
-							<td colspan="2">7元</td>
-							<td colspan="2">8元</td>
-							<td colspan="2">9元</td>
-							<td colspan="2">10元</td>
-							<td colspan="2">&nbsp;</td>
-							<td colspan="2">合计张数</td>
-							<td colspan="2">&nbsp;</td>
-							<td colspan="2">预售票</td>
-							<td colspan="2">1元</td>
-							<td colspan="2">1.5元</td>
-							<td colspan="2">合计张数</td>
-							<td colspan="5">&nbsp;</td>
-						</tr>
-						<tr>
-							<td>张数</td>
-							<td colspan="2">&nbsp;</td>
-							<td colspan="2">&nbsp;</td>
-							<td colspan="2">&nbsp;</td>
-							<td colspan="2">&nbsp;</td>
-							<td colspan="2">&nbsp;</td>
-							<td colspan="2">&nbsp;</td>
-							<td colspan="2">&nbsp;</td>
-							<td colspan="2">&nbsp;</td>
-							<td colspan="2">&nbsp;</td>
-							<td colspan="2">&nbsp;</td>
-							<td colspan="2">&nbsp;</td>
-							<td colspan="2">合计金额</td>
-							<td colspan="2">&nbsp;</td>
-							<td colspan="2">张数</td>
-							<td colspan="2">&nbsp;</td>
-							<td colspan="2">&nbsp;</td>
-							<td colspan="2">合计金额</td>
-							<td colspan="5">&nbsp;</td>
-						</tr>
-						<tr>
-							<td colspan="40">&nbsp;</td>
-						</tr> -->
 						<tr>
 							<td colspan="2">路牌</td>
 							<td colspan="2">车号</td>
@@ -251,7 +203,7 @@
 		</div>
 	</div>
 </div>
-
+<script src="/pages/mforms/singledatas/jquery.table2excel.min.js"></script>
 <script>
 	$(function(){
@@ -363,17 +315,28 @@
 				layer.msg("请选择时间");
 				return;
 			}
+			/* $("#ddrbExport").table2excel({
+				// 不被导出的表格行的CSS class类
+				exclude: ".noExl",
+				// 导出的Excel文档的名称，（没看到作用）
+				name: "Excel Document Name.xlsx",
+				// Excel文件的名称
+				filename: date+"调度日报"
+			}); */
+			var lineName = $('#line option:selected').text();
 			params['line'] = line;
+			params['lineName'] = lineName;
 			params['date'] = date;
 			params['xlName'] = xlName;
 			params['type'] = "export";
 			params['state'] = '2';
+			params['genre'] = 'qp';
 			$get('/realSchedule/scheduleDailyExport', params, function(result){
 				if(date.length == 10)
-					window.open("/downloadFile/download?fileName=调度日报"+moment(date).format("YYYYMMDD"));
+					window.open("/downloadFile/download?fileName="+moment(date).format("YYYYMMDD")+"-"+lineName+"-调度日报");
 				else
-					window.open("/downloadFile/download?fileName=调度日报"+moment(date).format("YYYYMM"));
-			});
+					window.open("/downloadFile/download?fileName="+moment(date).format("YYYYMMDD")+"-"+lineName+"-调度日报");
+			}); 
 		});
 	});
@@ -312,7 +312,7 @@
 				 params['nature']=nature;
 				var i = layer.load(2);
 // 				$get('/realSchedule/statisticsDailyTj',params,function(result){
-				$get('/calcWaybill/calcStatisticsDaily2',params,function(result){
+				$get('/calcWaybill/calcStatisticsDaily',params,function(result){
 					// 把数据填充到模版中
 					var tbodyHtml = template('statisticsDailyCalc2',{list:result});
 					// 把渲染好的模版html文本追加到表格中
@@ -340,7 +340,7 @@
 			 params['nature']=nature;
 			var i = layer.load(2);
 // 			$get('/realSchedule/statisticsDailyTj',params,function(result){
-			$get('/calcWaybill/calcStatisticsDaily2',params,function(result){
+			$get('/calcWaybill/calcStatisticsDaily',params,function(result){
 				var dateTime = "";
 				if(date == date2){
 					dateTime = moment(date).format("YYYYMMDD");
@@ -362,45 +362,45 @@
 			<td>{{obj.fgsName}}</td>
 			<td>{{obj.xlName}}</td>
 			<td>{{obj.jhzlc}}</td>
-			<td>{{obj.jhlc}}</td>
-			<td>{{obj.jcclc}}</td>
-			<td>{{obj.sjzgl}}</td>
-			<td>{{obj.sjgl}}</td>
-			<td>{{obj.sjksgl}}</td>
-			<td>{{obj.ssgl}}</td>
+			<td>{{obj.jhyylc}}</td>
+			<td>{{obj.jhkslc}}</td>
+			<td>{{obj.sjzlc}}</td>
+			<td>{{obj.sjyylc}}</td>
+			<td>{{obj.sjkslc}}</td>
+			<td>{{obj.sslc}}</td>
 			<td>{{obj.ssbc}}</td>
-			<td>{{obj.ssgl_lz}}</td>
-			<td>{{obj.ssgl_dm}}</td>
-			<td>{{obj.ssgl_gz}}</td>
-			<td>{{obj.ssgl_jf}}</td>
-			<td>{{obj.ssgl_zs}}</td>
-			<td>{{obj.ssgl_qr}}</td>
-			<td>{{obj.ssgl_qc}}</td>
-			<td>{{obj.ssgl_kx}}</td>
-			<td>{{obj.ssgl_qh}}</td>
-			<td>{{obj.ssgl_yw}}</td>
-			<td>{{obj.ssgl_other}}</td>
-			<td>{{obj.ljgl}}</td>
-			<td>{{obj.ljks}}</td>
-			<td>{{obj.jhbc}}</td>
-			<td>{{obj.jhbc_m}}</td>
-			<td>{{obj.jhbc_a}}</td>
-			<td>{{obj.sjbc}}</td>
-			<td>{{obj.sjbc_m}}</td>
-			<td>{{obj.sjbc_a}}</td>
-			<td>{{obj.ljbc}}</td>
-			<td>{{obj.ljbc_m}}</td>
-			<td>{{obj.ljbc_a}}</td>
-			<td>{{obj.fzbc}}</td>
-			<td>{{obj.fzbc_m}}</td>
-			<td>{{obj.fzbc_a}}</td>
-			<td>{{obj.dtbc}}</td>
-			<td>{{obj.dtbc_m}}</td>
-			<td>{{obj.dtbc_a}}</td>
-			<td>{{obj.djg}}</td>
-			<td>{{obj.djg_m}}</td>
-			<td>{{obj.djg_a}}</td>
-			<td>{{obj.djg_time}}</td>
+			<td>{{obj.lzlc}}</td>
+			<td>{{obj.dmlc}}</td>
+			<td>{{obj.gzlc}}</td>
+			<td>{{obj.jflc}}</td>
+			<td>{{obj.zslc}}</td>
+			<td>{{obj.qrlc}}</td>
+			<td>{{obj.qclc}}</td>
+			<td>{{obj.kxlc}}</td>
+			<td>{{obj.qhlc}}</td>
+			<td>{{obj.ywlc}}</td>
+			<td>{{obj.qtlc}}</td>
+			<td>{{obj.ljlc}}</td>
+			<td>{{obj.ljkslc}}</td>
+			<td>{{obj.jhbcq}}</td>
+			<td>{{obj.jhbcz}}</td>
+			<td>{{obj.jhbcw}}</td>
+			<td>{{obj.sjbcq}}</td>
+			<td>{{obj.sjbcz}}</td>
+			<td>{{obj.sjbcw}}</td>
+			<td>{{obj.ljbcq}}</td>
+			<td>{{obj.ljbcz}}</td>
+			<td>{{obj.ljbcw}}</td>
+			<td>{{obj.fzbcq}}</td>
+			<td>{{obj.fzbcz}}</td>
+			<td>{{obj.fzbcw}}</td>
+			<td>{{obj.dtbcq}}</td>
+			<td>{{obj.dtbcz}}</td>
+			<td>{{obj.dtbcw}}</td>
+			<td>{{obj.djgq}}</td>
+			<td>{{obj.djgz}}</td>
+			<td>{{obj.djgw}}</td>
+			<td>{{obj.djgsj}}</td>
 			<td>&nbsp;</td>
 		</tr>
 	{{/each}}