潘钊 / bsth_control · Commits

Commit 45ef968994387bb79d3fec4101e7e0da2c38a408

Authored by 廖磊
1 parent b1734b52

路单不对

Inline Side-by-side
Showing 3 changed files with 11 additions and 8 deletions
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
  View file @45ef968
... ... @@ -111,5 +111,5 @@ public interface ScheduleRealInfoService extends BaseService<ScheduleRealInfo, L
111 111  
112 112 List<ScheduleRealInfo> realScheduleList(String line,String date);
113 113  
114   - List<Map<String,Object>> yesterdayDataList(String line);
  114 + List<Map<String,Object>> yesterdayDataList(String line,String date);
115 115 }
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @45ef968
... ... @@ -451,7 +451,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
451 451  
452 452 @Override
453 453 public List<ScheduleRealInfo> queryUserInfo(String line, String date) {
454   - return scheduleRealInfoRepository.queryUserInfo(line, date);
  454 + return scheduleRealInfoRepository.queryUserInfo2(line, date);
455 455 }
456 456 /**
457 457 *
... ... @@ -1107,7 +1107,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1107 1107 @Override
1108 1108 public List<ScheduleRealInfo> queryListWaybill(String jName, String clZbh,
1109 1109 String lpName,String date) {
1110   - return scheduleRealInfoRepository.queryListWaybill(jName,clZbh,lpName,date);
  1110 + return scheduleRealInfoRepository.queryListWaybill2(jName,clZbh,lpName,date);
1111 1111 }
1112 1112  
1113 1113 @Override
... ... @@ -1422,9 +1422,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1422 1422 return rs;
1423 1423 }
1424 1424  
1425   - public List<Map<String,Object>> yesterdayDataList(String line) {
  1425 + public List<Map<String,Object>> yesterdayDataList(String line,String date) {
1426 1426 //前一天日期
1427   - String date = sdfMonth.format(org.apache.commons.lang.time.DateUtils.addDays(new Date(), -1));
  1427 +// String date = sdfMonth.format(org.apache.commons.lang.time.DateUtils.addDays(new Date(), -1));
  1428 +// String date = "2016-09-20";
1428 1429 List<Map<String,Object>> yesterdayDataList = scheduleRealInfoRepository.yesterdayDataList(line, date);
1429 1430 List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
1430 1431 for(ScheduleRealInfo scheduleRealInfo:list){
... ...
src/main/resources/static/pages/forms/statement/waybill.html
  View file @45ef968
... ... @@ -158,9 +158,11 @@
158 158 $(this).children().each(function(index){
159 159 params[index] = $(this).text();
160 160 });
  161 + console.log(params);
161 162 jName = params[0].split("\\")[0];
162 163 var id = $("#"+params[1]).val();
163 164 $get('/realSchedule/'+id,null,function(result){
  165 + console.log(result);
164 166 result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
165 167 var ludan_1 = template('ludan_1',result);
166 168 //var ludan_4 = template('ludan_4',result);
... ... @@ -220,9 +222,9 @@
220 222 <script type="text/html" id="list_info">
221 223 {{each list as obj i}}
222 224 <tr>
223   - <td width="45%">{{obj.jName}}\{{obj.jGh}}</td>
224   - <td width="32%">{{obj.clZbh}}</td>
225   - <td width="23%">{{obj.lpName}}<input type="hidden" id="{{obj.clZbh}}" value="{{obj.id}}"></td>
  225 + <td width="45%">{{obj[4]}}\{{obj[1]}}</td>
  226 + <td width="32%">{{obj[2]}}</td>
  227 + <td width="23%">{{obj[3]}}<input type="hidden" id="{{obj[2]}}" value="{{obj[0]}}"></td>
226 228 </tr>
227 229 {{/each}}
228 230 {{if list.length == 0}}
... ...