路单不对

廖磊
1 parent b1734b52
Showing 3 changed files with 11 additions and 8 deletions
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/waybill.html
@@ -111,5 +111,5 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<ScheduleRealInfo> realScheduleList(String line,String date);
-	List<Map<String,Object>> yesterdayDataList(String line);
+	List<Map<String,Object>> yesterdayDataList(String line,String date);
 }
@@ -451,7 +451,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public List<ScheduleRealInfo> queryUserInfo(String line, String date) {
-		return scheduleRealInfoRepository.queryUserInfo(line, date);
+		return scheduleRealInfoRepository.queryUserInfo2(line, date);
 	}
 	/**
 	 * 
@@ -1107,7 +1107,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public List<ScheduleRealInfo> queryListWaybill(String jName, String clZbh,
 			String lpName,String date) {
-		return scheduleRealInfoRepository.queryListWaybill(jName,clZbh,lpName,date);
+		return scheduleRealInfoRepository.queryListWaybill2(jName,clZbh,lpName,date);
 	}
 	@Override
@@ -1422,9 +1422,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		return rs;
 	}
-	public List<Map<String,Object>> yesterdayDataList(String line) {
+	public List<Map<String,Object>> yesterdayDataList(String line,String date) {
 		//前一天日期
-		String date = sdfMonth.format(org.apache.commons.lang.time.DateUtils.addDays(new Date(), -1));
+//		String date = sdfMonth.format(org.apache.commons.lang.time.DateUtils.addDays(new Date(), -1));
+//		String date = "2016-09-20";
 		List<Map<String,Object>> yesterdayDataList = scheduleRealInfoRepository.yesterdayDataList(line, date);
 		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
 		for(ScheduleRealInfo scheduleRealInfo:list){
@@ -158,9 +158,11 @@
 			$(this).children().each(function(index){
 				params[index] = $(this).text();
 			});
+			console.log(params);
 			jName = params[0].split("\\")[0];
 			var id = $("#"+params[1]).val();
 			$get('/realSchedule/'+id,null,function(result){
+				console.log(result);
 			    result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
 				var ludan_1 = template('ludan_1',result);
 				//var ludan_4 = template('ludan_4',result);
@@ -220,9 +222,9 @@
 <script type="text/html" id="list_info">
 	{{each list as obj i}}
 		<tr>
-			<td width="45%">{{obj.jName}}\{{obj.jGh}}</td>
-			<td width="32%">{{obj.clZbh}}</td>
-			<td width="23%">{{obj.lpName}}<input type="hidden" id="{{obj.clZbh}}" value="{{obj.id}}"></td>
+			<td width="45%">{{obj[4]}}\{{obj[1]}}</td>
+			<td width="32%">{{obj[2]}}</td>
+			<td width="23%">{{obj[3]}}<input type="hidden" id="{{obj[2]}}" value="{{obj[0]}}"></td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}