潘钊 / bsth_control · Commits

Commit e23f89d112f583489f7ed977cf71dbf9028ff428

Authored by BSTH
1 parent 16bf0ab3
build: skipped

报表优化

Inline Side-by-side
Showing 8 changed files with 829 additions and 45 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
  View file @e23f89d
... ... @@ -298,8 +298,8 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo,
298 298  
299 299 @RequestMapping(value = "/exportWaybill")
300 300 public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName, @RequestParam String clZbh,
301   - @RequestParam String lpName) {
302   - return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName);
  301 + @RequestParam String lpName,@RequestParam String date) {
  302 + return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName,date);
303 303 }
304 304  
305 305 @RequestMapping(value = "/dailyInfo")
... ... @@ -319,8 +319,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
319 319 }
320 320  
321 321 @RequestMapping(value="/findKMBC")
322   - public Map<String,Object> findKMBC(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName){
323   - return scheduleRealInfoService.findKMBC(jName, clZbh,lpName);
  322 + public Map<String,Object> findKMBC(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
  323 + ,@RequestParam String date){
  324 + return scheduleRealInfoService.findKMBC(jName, clZbh,lpName,date);
324 325 }
325 326  
326 327 @RequestMapping(value="/findLpName")
... ... @@ -348,8 +349,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
348 349 * @return
349 350 */
350 351 @RequestMapping(value="/queryListWaybill")
351   - public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName){
352   - return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName);
  352 + public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
  353 + ,@RequestParam String date){
  354 + return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date);
353 355 }
354 356  
355 357 @RequestMapping(value="/statisticsDaily")
... ...
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
  View file @e23f89d
... ... @@ -20,10 +20,10 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
20 20 List<ScheduleRealInfo> findByLines(List<String> lines);
21 21  
22 22  
23   - @Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by jName,clZbh,lpName order by (lpName+1)")
  23 + @Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.bcType = 'out' order by (lpName+1)")
24 24 List<ScheduleRealInfo> queryUserInfo(String line,String date);
25 25  
26   - @Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 order by fcsj")
  26 + @Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 order by bcs")
27 27 List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName);
28 28  
29 29 @Query(value="select new map(clZbh as clZbh,jGh as jGh,jName as jName,sum(jhlc) as zgl,sum(addMileage) as ksgl,count(jName) as bcs) from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by clZbh,jGh")
... ... @@ -54,8 +54,8 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
54 54 @Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDate >= str_to_date(?2,'%Y-%m-%d') and s.scheduleDate <= str_to_date(?3,'%Y-%m-%d') and s.lpName = ?4 order by s.fcsj")
55 55 List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName);
56 56  
57   - @Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 order by fcsj")
58   - List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName);
  57 + @Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate <= str_to_date(?4,'%Y-%m-%d') order by bcs")
  58 + List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date);
59 59  
60 60 @Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2")
61 61 List<ScheduleRealInfo> scheduleDaily(String line,String date);
... ...
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
  View file @e23f89d
... ... @@ -60,7 +60,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
60 60  
61 61 List<ScheduleRealInfo> queryUserInfo(String line,String date);
62 62  
63   - List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName);
  63 + List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName,String date);
64 64  
65 65 List<Map<String,Object>> dailyInfo(String line,String date,String type);
66 66  
... ... @@ -84,7 +84,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
84 84  
85 85 List<Map<String,String>> findLine(String line);
86 86  
87   - Map<String,Object> findKMBC(String jName,String clZbh,String lpName);
  87 + Map<String,Object> findKMBC(String jName,String clZbh,String lpName,String date);
88 88  
89 89 List<Map<String,String>> findLpName(String lpName);
90 90  
... ... @@ -92,7 +92,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
92 92  
93 93 List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code);
94 94  
95   - List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName);
  95 + List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date);
96 96  
97 97 Map<String, Object> removeChildTask(Long taskId);
98 98  
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @e23f89d
... ... @@ -455,11 +455,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
455 455 *
456 456 */
457 457 @Override
458   - public List<ScheduleRealInfo> exportWaybill(String jName, String clZbh, String lpName) {
  458 + public List<ScheduleRealInfo> exportWaybill(String jName, String clZbh, String lpName,String date) {
459 459 ReportUtils ee = new ReportUtils();
460 460 ReportRelatedUtils rru = new ReportRelatedUtils();
461 461 List<Iterator<?>> list = new ArrayList<Iterator<?>>();
462   - List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.exportWaybill(jName, clZbh, lpName);
  462 + List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName,date);
463 463 List<Map<String,Object>> listMap = new ArrayList<Map<String,Object>>();
464 464  
465 465 DecimalFormat format = new DecimalFormat("0.00");
... ... @@ -979,8 +979,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
979 979  
980 980 @Override
981 981 public Map<String, Object> findKMBC(String jName, String clZbh,
982   - String lpName) {
983   - List<ScheduleRealInfo> list = scheduleRealInfoRepository.exportWaybill(jName, clZbh, lpName);
  982 + String lpName,String date) {
  983 + List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date);
984 984 DecimalFormat format = new DecimalFormat("0.00");
985 985 int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
986 986 int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
... ... @@ -1039,8 +1039,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1039 1039  
1040 1040 @Override
1041 1041 public List<ScheduleRealInfo> queryListWaybill(String jName, String clZbh,
1042   - String lpName) {
1043   - return scheduleRealInfoRepository.queryListWaybill(jName,clZbh,lpName);
  1042 + String lpName,String date) {
  1043 + return scheduleRealInfoRepository.queryListWaybill(jName,clZbh,lpName,date);
1044 1044 }
1045 1045  
1046 1046 @Override
... ...
src/main/resources/static/pages/forms/statement/realDaily.html 0 → 100644
  View file @e23f89d
  1 +<style type="text/css">
  2 + .table-bordered {
  3 + border: 1px solid; }
  4 + .table-bordered > thead > tr > th,
  5 + .table-bordered > thead > tr > td,
  6 + .table-bordered > tbody > tr > th,
  7 + .table-bordered > tbody > tr > td,
  8 + .table-bordered > tfoot > tr > th,
  9 + .table-bordered > tfoot > tr > td {
  10 + border: 1px solid; }
  11 + .table-bordered > thead > tr > th,
  12 + .table-bordered > thead > tr > td {
  13 + border-bottom-width: 2px; }
  14 +
  15 + .table > tbody + tbody {
  16 + border-top: 1px solid; }
  17 +</style>
  18 +
  19 +<div class="page-head">
  20 + <div class="page-title">
  21 + <h1>计划实际日报表</h1>
  22 + </div>
  23 +</div>
  24 +
  25 +<div class="row">
  26 + <div class="col-md-12">
  27 + <div class="portlet light porttlet-fit bordered">
  28 + <div class="portlet-title">
  29 + <form class="form-inline" action="">
  30 + <div style="display: inline-block;">
  31 + <span class="item-label" style="width: 80px;">线路: </span>
  32 + <select class="form-control" name="line" id="line" style="width: 180px;"></select>
  33 + </div>
  34 + <div style="display: inline-block;margin-left: 15px;">
  35 + <span class="item-label" style="width: 80px;">时间: </span>
  36 + <input class="form-control" type="text" id="date" style="width: 180px;"/>
  37 + </div>
  38 + <div style="display: inline-block;">
  39 + <span class="item-label" style="width: 80px;">数据显示: </span>
  40 + <select class="form-control" name="dataShow" id="dataShow" style="width: 180px;">
  41 + <option value="1">驾驶员、路牌、车辆</option>
  42 + <option value="2">车辆、人员、路牌</option>
  43 + <option value="3">路牌、人员、车辆</option>
  44 + <option value="4">驾驶员</option>
  45 + <option value="5">车辆</option>
  46 + <option value="6">路牌</option>
  47 + </select>
  48 + </div>
  49 + <div class="form-group">
  50 + <input class="btn btn-default" type="button" id="query" value="筛选"/>
  51 + <input class="btn btn-default" type="button" id="export" value="导出"/>
  52 + </div>
  53 + </form>
  54 + </div>
  55 + <div class="portlet-body">
  56 + <div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
  57 + <table class="table table-bordered table-hover table-checkable" id="forms">
  58 + <thead>
  59 + <tr>
  60 + <th colspan="16">班次车辆人员日统计</th>
  61 + </tr>
  62 + </thead>
  63 + <tbody class="realDaily">
  64 +
  65 + </tbody>
  66 + </table>
  67 + </div>
  68 + </div>
  69 + </div>
  70 + </div>
  71 +</div>
  72 +
  73 +<script>
  74 + $(function(){
  75 + // 关闭左侧栏
  76 + if (!$('body').hasClass('page-sidebar-closed'))
  77 + $('.menu-toggler.sidebar-toggler').click();
  78 +
  79 + $("#date").datetimepicker({
  80 + format : 'YYYY-MM-DD',
  81 + locale : 'zh-cn'
  82 + });
  83 +
  84 + $('#line').select2({
  85 + ajax: {
  86 + url: '/realSchedule/findLine',
  87 + type: 'post',
  88 + dataType: 'json',
  89 + delay: 150,
  90 + data: function(params){
  91 + return{line: params.term};
  92 + },
  93 + processResults: function (data) {
  94 + return {
  95 + results: data
  96 + };
  97 + },
  98 + cache: true
  99 + },
  100 + templateResult: function(repo){
  101 + if (repo.loading) return repo.text;
  102 + var h = '<span>'+repo.text+'</span>';
  103 + return h;
  104 + },
  105 + escapeMarkup: function (markup) { return markup; },
  106 + minimumInputLength: 1,
  107 + templateSelection: function(repo){
  108 + return repo.text;
  109 + },
  110 + language: {
  111 + noResults: function(){
  112 + return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
  113 + },
  114 + inputTooShort : function(e) {
  115 + return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
  116 + },
  117 + searching : function() {
  118 + return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
  119 + }
  120 + }
  121 + });
  122 +
  123 + var line;
  124 + var date;
  125 + $("#query").on("click",function(){
  126 + line = $("#line").val();
  127 + date = $("#date").val();
  128 + var dataShow = $("#dataShow").val();
  129 + $get('/realSchedule/queryUserInfo',{line:line,date:date},function(result){
  130 + // 把数据填充到模版中
  131 + var tbodyHtml = template('realDaily_'+dataShow,{list:result});
  132 + // 把渲染好的模版html文本追加到表格中
  133 + $('#forms .realDaily').html(tbodyHtml);
  134 + });
  135 + });
  136 + $("#export").on("click",function(){
  137 + $get('/realSchedule/dailyInfo',{line:line,date:date},function(result){
  138 + window.open("/downloadFile/download?fileName=实际计划日报表"+moment(date).format("YYYYMMDD"));
  139 + });
  140 + });
  141 + });
  142 +</script>
  143 +<script type="text/html" id="realDaily_1">
  144 + <tr>
  145 + <td>驾驶员</td>
  146 + <td>售票员</td>
  147 + <td>路牌</td>
  148 + <td>车辆</td>
  149 + <td>计划里程</td>
  150 + <td>实际计划里程</td>
  151 + <td>营运里程</td>
  152 + <td>空驶里程</td>
  153 + <td>抽减里程</td>
  154 + <td>增加里程</td>
  155 + <td>总里程</td>
  156 + <td>计划班次</td>
  157 + <td>实际计划班次</td>
  158 + <td>抽减班次</td>
  159 + <td>增加班次</td>
  160 + <td>实际班次</td>
  161 + </tr>
  162 + {{each list as obj i}}
  163 + <tr>
  164 + <td>{{obj.jName}}</td>
  165 + <td>{{obj.sName}}</td>
  166 + <td>{{obj.lpName}}</td>
  167 + <td>{{obj.clZbh}}</td>
  168 + <td>&nbsp;</td>
  169 + <td>&nbsp;</td>
  170 + <td>&nbsp;</td>
  171 + <td>&nbsp;</td>
  172 + <td>&nbsp;</td>
  173 + <td>&nbsp;</td>
  174 + <td>&nbsp;</td>
  175 + <td>&nbsp;</td>
  176 + <td>&nbsp;</td>
  177 + <td>&nbsp;</td>
  178 + <td>&nbsp;</td>
  179 + <td>&nbsp;</td>
  180 + </tr>
  181 + {{/each}}
  182 + {{if list.length == 0}}
  183 + <tr>
  184 + <td colspan="16"><h6 class="muted">没有找到相关数据</h6></td>
  185 + </tr>
  186 + {{/if}}
  187 +</script>
  188 +<script type="text/html" id="realDaily_2">
  189 + <tr>
  190 + <td>车辆</td>
  191 + <td>驾驶员</td>
  192 + <td>售票员</td>
  193 + <td>路牌</td>
  194 + <td>计划里程</td>
  195 + <td>实际计划里程</td>
  196 + <td>营运里程</td>
  197 + <td>空驶里程</td>
  198 + <td>抽减里程</td>
  199 + <td>增加里程</td>
  200 + <td>总里程</td>
  201 + <td>计划班次</td>
  202 + <td>实际计划班次</td>
  203 + <td>抽减班次</td>
  204 + <td>增加班次</td>
  205 + <td>实际班次</td>
  206 + </tr>
  207 + {{each list as obj i}}
  208 + <tr>
  209 + <td>{{obj.clZbh}}</td>
  210 + <td>{{obj.jName}}</td>
  211 + <td>{{obj.sName}}</td>
  212 + <td>{{obj.lpName}}</td>
  213 + <td>&nbsp;</td>
  214 + <td>&nbsp;</td>
  215 + <td>&nbsp;</td>
  216 + <td>&nbsp;</td>
  217 + <td>&nbsp;</td>
  218 + <td>&nbsp;</td>
  219 + <td>&nbsp;</td>
  220 + <td>&nbsp;</td>
  221 + <td>&nbsp;</td>
  222 + <td>&nbsp;</td>
  223 + <td>&nbsp;</td>
  224 + <td>&nbsp;</td>
  225 + </tr>
  226 + {{/each}}
  227 + {{if list.length == 0}}
  228 + <tr>
  229 + <td colspan="16"><h6 class="muted">没有找到相关数据</h6></td>
  230 + </tr>
  231 + {{/if}}
  232 +</script>
  233 +<script type="text/html" id="realDaily_3">
  234 + <tr>
  235 + <td>路牌</td>
  236 + <td>车辆</td>
  237 + <td>驾驶员</td>
  238 + <td>售票员</td>
  239 + <td>计划里程</td>
  240 + <td>实际计划里程</td>
  241 + <td>营运里程</td>
  242 + <td>空驶里程</td>
  243 + <td>抽减里程</td>
  244 + <td>增加里程</td>
  245 + <td>总里程</td>
  246 + <td>计划班次</td>
  247 + <td>实际计划班次</td>
  248 + <td>抽减班次</td>
  249 + <td>增加班次</td>
  250 + <td>实际班次</td>
  251 + </tr>
  252 + {{each list as obj i}}
  253 + <tr>
  254 + <td>{{obj.lpName}}</td>
  255 + <td>{{obj.clZbh}}</td>
  256 + <td>{{obj.jName}}</td>
  257 + <td>{{obj.sName}}</td>
  258 + <td>&nbsp;</td>
  259 + <td>&nbsp;</td>
  260 + <td>&nbsp;</td>
  261 + <td>&nbsp;</td>
  262 + <td>&nbsp;</td>
  263 + <td>&nbsp;</td>
  264 + <td>&nbsp;</td>
  265 + <td>&nbsp;</td>
  266 + <td>&nbsp;</td>
  267 + <td>&nbsp;</td>
  268 + <td>&nbsp;</td>
  269 + <td>&nbsp;</td>
  270 + </tr>
  271 + {{/each}}
  272 + {{if list.length == 0}}
  273 + <tr>
  274 + <td colspan="16"><h6 class="muted">没有找到相关数据</h6></td>
  275 + </tr>
  276 + {{/if}}
  277 +</script>
  278 +<script type="text/html" id="realDaily_4">
  279 + <tr>
  280 + <td>驾驶员</td>
  281 + <td>计划里程</td>
  282 + <td>实际计划里程</td>
  283 + <td>营运里程</td>
  284 + <td>空驶里程</td>
  285 + <td>抽减里程</td>
  286 + <td>增加里程</td>
  287 + <td>总里程</td>
  288 + <td>计划班次</td>
  289 + <td>实际计划班次</td>
  290 + <td>抽减班次</td>
  291 + <td>增加班次</td>
  292 + <td>实际班次</td>
  293 + </tr>
  294 + {{each list as obj i}}
  295 + <tr>
  296 + <td>{{obj.jName}}</td>
  297 + <td>&nbsp;</td>
  298 + <td>&nbsp;</td>
  299 + <td>&nbsp;</td>
  300 + <td>&nbsp;</td>
  301 + <td>&nbsp;</td>
  302 + <td>&nbsp;</td>
  303 + <td>&nbsp;</td>
  304 + <td>&nbsp;</td>
  305 + <td>&nbsp;</td>
  306 + <td>&nbsp;</td>
  307 + <td>&nbsp;</td>
  308 + <td>&nbsp;</td>
  309 + </tr>
  310 + {{/each}}
  311 + {{if list.length == 0}}
  312 + <tr>
  313 + <td colspan="13"><h6 class="muted">没有找到相关数据</h6></td>
  314 + </tr>
  315 + {{/if}}
  316 +</script>
  317 +<script type="text/html" id="realDaily_5">
  318 + <tr>
  319 + <td>车辆</td>
  320 + <td>计划里程</td>
  321 + <td>实际计划里程</td>
  322 + <td>营运里程</td>
  323 + <td>空驶里程</td>
  324 + <td>抽减里程</td>
  325 + <td>增加里程</td>
  326 + <td>总里程</td>
  327 + <td>计划班次</td>
  328 + <td>实际计划班次</td>
  329 + <td>抽减班次</td>
  330 + <td>增加班次</td>
  331 + <td>实际班次</td>
  332 + </tr>
  333 + {{each list as obj i}}
  334 + <tr>
  335 + <td>{{obj.clZbh}}</td>
  336 + <td>&nbsp;</td>
  337 + <td>&nbsp;</td>
  338 + <td>&nbsp;</td>
  339 + <td>&nbsp;</td>
  340 + <td>&nbsp;</td>
  341 + <td>&nbsp;</td>
  342 + <td>&nbsp;</td>
  343 + <td>&nbsp;</td>
  344 + <td>&nbsp;</td>
  345 + <td>&nbsp;</td>
  346 + <td>&nbsp;</td>
  347 + <td>&nbsp;</td>
  348 + </tr>
  349 + {{/each}}
  350 + {{if list.length == 0}}
  351 + <tr>
  352 + <td colspan="13"><h6 class="muted">没有找到相关数据</h6></td>
  353 + </tr>
  354 + {{/if}}
  355 +</script>
  356 +<script type="text/html" id="realDaily_6">
  357 + <tr>
  358 + <td>路牌</td>
  359 + <td>计划里程</td>
  360 + <td>实际计划里程</td>
  361 + <td>营运里程</td>
  362 + <td>空驶里程</td>
  363 + <td>抽减里程</td>
  364 + <td>增加里程</td>
  365 + <td>总里程</td>
  366 + <td>计划班次</td>
  367 + <td>实际计划班次</td>
  368 + <td>抽减班次</td>
  369 + <td>增加班次</td>
  370 + <td>实际班次</td>
  371 + </tr>
  372 + {{each list as obj i}}
  373 + <tr>
  374 + <td>{{obj.lpName}}</td>
  375 + <td>&nbsp;</td>
  376 + <td>&nbsp;</td>
  377 + <td>&nbsp;</td>
  378 + <td>&nbsp;</td>
  379 + <td>&nbsp;</td>
  380 + <td>&nbsp;</td>
  381 + <td>&nbsp;</td>
  382 + <td>&nbsp;</td>
  383 + <td>&nbsp;</td>
  384 + <td>&nbsp;</td>
  385 + <td>&nbsp;</td>
  386 + <td>&nbsp;</td>
  387 + </tr>
  388 + {{/each}}
  389 + {{if list.length == 0}}
  390 + <tr>
  391 + <td colspan="13"><h6 class="muted">没有找到相关数据</h6></td>
  392 + </tr>
  393 + {{/if}}
  394 +</script>
0 395 \ No newline at end of file
... ...
src/main/resources/static/pages/forms/statement/realDaily_minhang.html 0 → 100644
  View file @e23f89d
  1 +<style type="text/css">
  2 + .table-bordered {
  3 + border: 1px solid; }
  4 + .table-bordered > thead > tr > th,
  5 + .table-bordered > thead > tr > td,
  6 + .table-bordered > tbody > tr > th,
  7 + .table-bordered > tbody > tr > td,
  8 + .table-bordered > tfoot > tr > th,
  9 + .table-bordered > tfoot > tr > td {
  10 + border: 1px solid; }
  11 + .table-bordered > thead > tr > th,
  12 + .table-bordered > thead > tr > td {
  13 + border-bottom-width: 2px; }
  14 +
  15 + .table > tbody + tbody {
  16 + border-top: 1px solid; }
  17 +</style>
  18 +
  19 +<div class="page-head">
  20 + <div class="page-title">
  21 + <h1>计划实际日报表</h1>
  22 + </div>
  23 +</div>
  24 +
  25 +<div class="row">
  26 + <div class="col-md-12">
  27 + <div class="portlet light porttlet-fit bordered">
  28 + <div class="portlet-title">
  29 + <form class="form-inline" action="">
  30 + <div style="display: inline-block;">
  31 + <span class="item-label" style="width: 80px;">线路: </span>
  32 + <select class="form-control" name="line" id="line" style="width: 180px;"></select>
  33 + </div>
  34 + <div style="display: inline-block;margin-left: 15px;">
  35 + <span class="item-label" style="width: 80px;">时间: </span>
  36 + <input class="form-control" type="text" id="date" style="width: 180px;"/>
  37 + </div>
  38 + <div style="display: inline-block;">
  39 + <span class="item-label" style="width: 80px;">数据显示: </span>
  40 + <select class="form-control" name="dataShow" id="dataShow" style="width: 180px;">
  41 + <option value="1">驾驶员、路牌、车辆</option>
  42 + <option value="2">车辆、人员、路牌</option>
  43 + <option value="3">路牌、人员、车辆</option>
  44 + <option value="4">驾驶员</option>
  45 + <option value="5">车辆</option>
  46 + <option value="6">路牌</option>
  47 + </select>
  48 + </div>
  49 + <div class="form-group">
  50 + <input class="btn btn-default" type="button" id="query" value="筛选"/>
  51 + <input class="btn btn-default" type="button" id="export" value="导出"/>
  52 + </div>
  53 + </form>
  54 + </div>
  55 + <div class="portlet-body">
  56 + <div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
  57 + <table class="table table-bordered table-hover table-checkable" id="forms">
  58 + <thead>
  59 + <tr>
  60 + <th colspan="16">班次车辆人员日统计</th>
  61 + </tr>
  62 + </thead>
  63 + <tbody class="realDaily">
  64 +
  65 + </tbody>
  66 + </table>
  67 + </div>
  68 + </div>
  69 + </div>
  70 + </div>
  71 +</div>
  72 +
  73 +<script>
  74 + $(function(){
  75 + // 关闭左侧栏
  76 + if (!$('body').hasClass('page-sidebar-closed'))
  77 + $('.menu-toggler.sidebar-toggler').click();
  78 +
  79 + $("#date").datetimepicker({
  80 + format : 'YYYY-MM-DD',
  81 + locale : 'zh-cn'
  82 + });
  83 +
  84 + $('#line').select2({
  85 + ajax: {
  86 + url: '/realSchedule/findLine',
  87 + type: 'post',
  88 + dataType: 'json',
  89 + delay: 150,
  90 + data: function(params){
  91 + return{line: params.term};
  92 + },
  93 + processResults: function (data) {
  94 + return {
  95 + results: data
  96 + };
  97 + },
  98 + cache: true
  99 + },
  100 + templateResult: function(repo){
  101 + if (repo.loading) return repo.text;
  102 + var h = '<span>'+repo.text+'</span>';
  103 + return h;
  104 + },
  105 + escapeMarkup: function (markup) { return markup; },
  106 + minimumInputLength: 1,
  107 + templateSelection: function(repo){
  108 + return repo.text;
  109 + },
  110 + language: {
  111 + noResults: function(){
  112 + return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
  113 + },
  114 + inputTooShort : function(e) {
  115 + return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
  116 + },
  117 + searching : function() {
  118 + return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
  119 + }
  120 + }
  121 + });
  122 +
  123 + var line;
  124 + var date;
  125 + $("#query").on("click",function(){
  126 + line = $("#line").val();
  127 + date = $("#date").val();
  128 + var dataShow = $("#dataShow").val();
  129 + $get('/realSchedule/queryUserInfo',{line:line,date:date},function(result){
  130 + // 把数据填充到模版中
  131 + var tbodyHtml = template('realDaily_'+dataShow,{list:result});
  132 + // 把渲染好的模版html文本追加到表格中
  133 + $('#forms .realDaily').html(tbodyHtml);
  134 + });
  135 + });
  136 + $("#export").on("click",function(){
  137 + $get('/realSchedule/dailyInfo',{line:line,date:date},function(result){
  138 + window.open("/downloadFile/download?fileName=实际计划日报表"+moment(date).format("YYYYMMDD"));
  139 + });
  140 + });
  141 + });
  142 +</script>
  143 +<script type="text/html" id="realDaily_1">
  144 + <tr>
  145 + <td>驾驶员</td>
  146 + <td>售票员</td>
  147 + <td>路牌</td>
  148 + <td>车辆</td>
  149 + <td>计划里程</td>
  150 + <td>实际计划里程</td>
  151 + <td>营运里程</td>
  152 + <td>空驶里程</td>
  153 + <td>抽减里程</td>
  154 + <td>增加里程</td>
  155 + <td>总里程</td>
  156 + <td>计划班次</td>
  157 + <td>实际计划班次</td>
  158 + <td>抽减班次</td>
  159 + <td>增加班次</td>
  160 + <td>实际班次</td>
  161 + </tr>
  162 + {{each list as obj i}}
  163 + <tr>
  164 + <td>{{obj.jName}}</td>
  165 + <td>{{obj.sName}}</td>
  166 + <td>{{obj.lpName}}</td>
  167 + <td>{{obj.clZbh}}</td>
  168 + <td>&nbsp;</td>
  169 + <td>&nbsp;</td>
  170 + <td>&nbsp;</td>
  171 + <td>&nbsp;</td>
  172 + <td>&nbsp;</td>
  173 + <td>&nbsp;</td>
  174 + <td>&nbsp;</td>
  175 + <td>&nbsp;</td>
  176 + <td>&nbsp;</td>
  177 + <td>&nbsp;</td>
  178 + <td>&nbsp;</td>
  179 + <td>&nbsp;</td>
  180 + </tr>
  181 + {{/each}}
  182 + {{if list.length == 0}}
  183 + <tr>
  184 + <td colspan="16"><h6 class="muted">没有找到相关数据</h6></td>
  185 + </tr>
  186 + {{/if}}
  187 +</script>
  188 +<script type="text/html" id="realDaily_2">
  189 + <tr>
  190 + <td>车辆</td>
  191 + <td>驾驶员</td>
  192 + <td>售票员</td>
  193 + <td>路牌</td>
  194 + <td>计划里程</td>
  195 + <td>实际计划里程</td>
  196 + <td>营运里程</td>
  197 + <td>空驶里程</td>
  198 + <td>抽减里程</td>
  199 + <td>增加里程</td>
  200 + <td>总里程</td>
  201 + <td>计划班次</td>
  202 + <td>实际计划班次</td>
  203 + <td>抽减班次</td>
  204 + <td>增加班次</td>
  205 + <td>实际班次</td>
  206 + </tr>
  207 + {{each list as obj i}}
  208 + <tr>
  209 + <td>{{obj.clZbh}}</td>
  210 + <td>{{obj.jName}}</td>
  211 + <td>{{obj.sName}}</td>
  212 + <td>{{obj.lpName}}</td>
  213 + <td>&nbsp;</td>
  214 + <td>&nbsp;</td>
  215 + <td>&nbsp;</td>
  216 + <td>&nbsp;</td>
  217 + <td>&nbsp;</td>
  218 + <td>&nbsp;</td>
  219 + <td>&nbsp;</td>
  220 + <td>&nbsp;</td>
  221 + <td>&nbsp;</td>
  222 + <td>&nbsp;</td>
  223 + <td>&nbsp;</td>
  224 + <td>&nbsp;</td>
  225 + </tr>
  226 + {{/each}}
  227 + {{if list.length == 0}}
  228 + <tr>
  229 + <td colspan="16"><h6 class="muted">没有找到相关数据</h6></td>
  230 + </tr>
  231 + {{/if}}
  232 +</script>
  233 +<script type="text/html" id="realDaily_3">
  234 + <tr>
  235 + <td>路牌</td>
  236 + <td>车辆</td>
  237 + <td>驾驶员</td>
  238 + <td>售票员</td>
  239 + <td>计划里程</td>
  240 + <td>实际计划里程</td>
  241 + <td>营运里程</td>
  242 + <td>空驶里程</td>
  243 + <td>抽减里程</td>
  244 + <td>增加里程</td>
  245 + <td>总里程</td>
  246 + <td>计划班次</td>
  247 + <td>实际计划班次</td>
  248 + <td>抽减班次</td>
  249 + <td>增加班次</td>
  250 + <td>实际班次</td>
  251 + </tr>
  252 + {{each list as obj i}}
  253 + <tr>
  254 + <td>{{obj.lpName}}</td>
  255 + <td>{{obj.clZbh}}</td>
  256 + <td>{{obj.jName}}</td>
  257 + <td>{{obj.sName}}</td>
  258 + <td>&nbsp;</td>
  259 + <td>&nbsp;</td>
  260 + <td>&nbsp;</td>
  261 + <td>&nbsp;</td>
  262 + <td>&nbsp;</td>
  263 + <td>&nbsp;</td>
  264 + <td>&nbsp;</td>
  265 + <td>&nbsp;</td>
  266 + <td>&nbsp;</td>
  267 + <td>&nbsp;</td>
  268 + <td>&nbsp;</td>
  269 + <td>&nbsp;</td>
  270 + </tr>
  271 + {{/each}}
  272 + {{if list.length == 0}}
  273 + <tr>
  274 + <td colspan="16"><h6 class="muted">没有找到相关数据</h6></td>
  275 + </tr>
  276 + {{/if}}
  277 +</script>
  278 +<script type="text/html" id="realDaily_4">
  279 + <tr>
  280 + <td>驾驶员</td>
  281 + <td>计划里程</td>
  282 + <td>实际计划里程</td>
  283 + <td>营运里程</td>
  284 + <td>空驶里程</td>
  285 + <td>抽减里程</td>
  286 + <td>增加里程</td>
  287 + <td>总里程</td>
  288 + <td>计划班次</td>
  289 + <td>实际计划班次</td>
  290 + <td>抽减班次</td>
  291 + <td>增加班次</td>
  292 + <td>实际班次</td>
  293 + </tr>
  294 + {{each list as obj i}}
  295 + <tr>
  296 + <td>{{obj.jName}}</td>
  297 + <td>&nbsp;</td>
  298 + <td>&nbsp;</td>
  299 + <td>&nbsp;</td>
  300 + <td>&nbsp;</td>
  301 + <td>&nbsp;</td>
  302 + <td>&nbsp;</td>
  303 + <td>&nbsp;</td>
  304 + <td>&nbsp;</td>
  305 + <td>&nbsp;</td>
  306 + <td>&nbsp;</td>
  307 + <td>&nbsp;</td>
  308 + <td>&nbsp;</td>
  309 + </tr>
  310 + {{/each}}
  311 + {{if list.length == 0}}
  312 + <tr>
  313 + <td colspan="13"><h6 class="muted">没有找到相关数据</h6></td>
  314 + </tr>
  315 + {{/if}}
  316 +</script>
  317 +<script type="text/html" id="realDaily_5">
  318 + <tr>
  319 + <td>车辆</td>
  320 + <td>计划里程</td>
  321 + <td>实际计划里程</td>
  322 + <td>营运里程</td>
  323 + <td>空驶里程</td>
  324 + <td>抽减里程</td>
  325 + <td>增加里程</td>
  326 + <td>总里程</td>
  327 + <td>计划班次</td>
  328 + <td>实际计划班次</td>
  329 + <td>抽减班次</td>
  330 + <td>增加班次</td>
  331 + <td>实际班次</td>
  332 + </tr>
  333 + {{each list as obj i}}
  334 + <tr>
  335 + <td>{{obj.clZbh}}</td>
  336 + <td>&nbsp;</td>
  337 + <td>&nbsp;</td>
  338 + <td>&nbsp;</td>
  339 + <td>&nbsp;</td>
  340 + <td>&nbsp;</td>
  341 + <td>&nbsp;</td>
  342 + <td>&nbsp;</td>
  343 + <td>&nbsp;</td>
  344 + <td>&nbsp;</td>
  345 + <td>&nbsp;</td>
  346 + <td>&nbsp;</td>
  347 + <td>&nbsp;</td>
  348 + </tr>
  349 + {{/each}}
  350 + {{if list.length == 0}}
  351 + <tr>
  352 + <td colspan="13"><h6 class="muted">没有找到相关数据</h6></td>
  353 + </tr>
  354 + {{/if}}
  355 +</script>
  356 +<script type="text/html" id="realDaily_6">
  357 + <tr>
  358 + <td>路牌</td>
  359 + <td>计划里程</td>
  360 + <td>实际计划里程</td>
  361 + <td>营运里程</td>
  362 + <td>空驶里程</td>
  363 + <td>抽减里程</td>
  364 + <td>增加里程</td>
  365 + <td>总里程</td>
  366 + <td>计划班次</td>
  367 + <td>实际计划班次</td>
  368 + <td>抽减班次</td>
  369 + <td>增加班次</td>
  370 + <td>实际班次</td>
  371 + </tr>
  372 + {{each list as obj i}}
  373 + <tr>
  374 + <td>{{obj.lpName}}</td>
  375 + <td>&nbsp;</td>
  376 + <td>&nbsp;</td>
  377 + <td>&nbsp;</td>
  378 + <td>&nbsp;</td>
  379 + <td>&nbsp;</td>
  380 + <td>&nbsp;</td>
  381 + <td>&nbsp;</td>
  382 + <td>&nbsp;</td>
  383 + <td>&nbsp;</td>
  384 + <td>&nbsp;</td>
  385 + <td>&nbsp;</td>
  386 + <td>&nbsp;</td>
  387 + </tr>
  388 + {{/each}}
  389 + {{if list.length == 0}}
  390 + <tr>
  391 + <td colspan="13"><h6 class="muted">没有找到相关数据</h6></td>
  392 + </tr>
  393 + {{/if}}
  394 +</script>
0 395 \ No newline at end of file
... ...
src/main/resources/static/pages/forms/statement/waybill.html
  View file @e23f89d
... ... @@ -134,10 +134,11 @@
134 134 }
135 135 }
136 136 });
137   -
  137 +
  138 + var date;
138 139 $("#query").on("click",function(){
139 140 var line = $("#line").val();
140   - var date = $("#date").val();
  141 + date = $("#date").val();
141 142 $(".hidden").removeClass("hidden");
142 143 $get('/realSchedule/queryUserInfo',{line:line,date:date},function(result){
143 144 // 把数据填充到模版中
... ... @@ -150,10 +151,6 @@
150 151 var params = {};
151 152 var jName;
152 153 $("#info tbody").on("click","tr",function(){
153   - $('#forms .ludan_1').html('');
154   - $('#forms .ludan_2').html('');
155   - $('#forms .ludan_3').html('');
156   - $('#forms .ludan_4').html('');
157 154 if($(this).children().size() < 2){
158 155 return;
159 156 }
... ... @@ -168,24 +165,24 @@
168 165 var ludan_1 = template('ludan_1',result);
169 166 //var ludan_4 = template('ludan_4',result);
170 167 // 把渲染好的模版html文本追加到表格中
171   - $('#forms .ludan_1').append(ludan_1);
172   - //$('#forms .ludan_4').append(ludan_4);
  168 + $('#forms .ludan_1').html(ludan_1);
  169 + //$('#forms .ludan_4').html(ludan_4);
173 170 });
174   - $post('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2]},function(result){
  171 + $post('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
175 172 getTime(result);
176 173 var ludan_2 = template('ludan_2',{list:result});
177 174 // 把渲染好的模版html文本追加到表格中
178   - $('#forms .ludan_2').append(ludan_2);
  175 + $('#forms .ludan_2').html(ludan_2);
179 176 });
180   - $post('/realSchedule/findKMBC',{jName:jName,clZbh:params[1],lpName:params[2]},function(result){
  177 + $post('/realSchedule/findKMBC',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
181 178 var ludan_3 = template('ludan_3',result);
182   - $('#forms .ludan_3').append(ludan_3);
  179 + $('#forms .ludan_3').html(ludan_3);
183 180 });
184 181  
185 182 });
186 183  
187 184 $("#export").on("click",function(){
188   - $post('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2]},function(result){
  185 + $post('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
189 186 window.open("/downloadFile/download?fileName="+jName);
190 187 });
191 188 });
... ...
src/main/resources/static/pages/forms/statement/waybill_minhang.html
  View file @e23f89d
... ... @@ -134,10 +134,11 @@
134 134 }
135 135 }
136 136 });
137   -
  137 +
  138 + var date;
138 139 $("#query").on("click",function(){
139 140 var line = $("#line").val();
140   - var date = $("#date").val();
  141 + date = $("#date").val();
141 142 $(".hidden").removeClass("hidden");
142 143 $get('/realSchedule/queryUserInfo',{line:line,date:date},function(result){
143 144 // 把数据填充到模版中
... ... @@ -150,10 +151,6 @@
150 151 var params = {};
151 152 var jName;
152 153 $("#info tbody").on("click","tr",function(){
153   - $('#forms .ludan_1').html('');
154   - $('#forms .ludan_2').html('');
155   - $('#forms .ludan_3').html('');
156   - $('#forms .ludan_4').html('');
157 154 if($(this).children().size() < 2){
158 155 return;
159 156 }
... ... @@ -168,24 +165,24 @@
168 165 var ludan_1 = template('ludan_1',result);
169 166 //var ludan_4 = template('ludan_4',result);
170 167 // 把渲染好的模版html文本追加到表格中
171   - $('#forms .ludan_1').append(ludan_1);
172   - //$('#forms .ludan_4').append(ludan_4);
  168 + $('#forms .ludan_1').html(ludan_1);
  169 + //$('#forms .ludan_4').html(ludan_4);
173 170 });
174   - $post('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2]},function(result){
  171 + $post('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
175 172 getTime(result);
176 173 var ludan_2 = template('ludan_2',{list:result});
177 174 // 把渲染好的模版html文本追加到表格中
178   - $('#forms .ludan_2').append(ludan_2);
  175 + $('#forms .ludan_2').html(ludan_2);
179 176 });
180   - $post('/realSchedule/findKMBC',{jName:jName,clZbh:params[1],lpName:params[2]},function(result){
  177 + $post('/realSchedule/findKMBC',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
181 178 var ludan_3 = template('ludan_3',result);
182   - $('#forms .ludan_3').append(ludan_3);
  179 + $('#forms .ludan_3').html(ludan_3);
183 180 });
184 181  
185 182 });
186 183  
187 184 $("#export").on("click",function(){
188   - $post('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2]},function(result){
  185 + $post('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
189 186 window.open("/downloadFile/download?fileName="+jName);
190 187 });
191 188 });
... ...