youxiw2000 / bsthLineProfiles · Commits

Commit d5a6f3bd9a82f331686cfa491f2175ea2318639b

Authored by yiming
1 parent 7831c5c7
build: skipped

bf

Inline Side-by-side
Showing 5 changed files with 61 additions and 24 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLine.java
  View file @d5a6f3b
... ... @@ -295,35 +295,27 @@ public class BsthTLine extends BaseEntity
295 295 private String coldBonusType;
296 296  
297 297 /** 月度营收 */
298   - @Excel(name = "月度营收")
299 298 private Long revenuesMonth;
300 299  
301 300 /** 月度人次 */
302   - @Excel(name = "月度人次")
303 301 private Long personMonth;
304 302  
305 303 /** 月度里程 */
306   - @Excel(name = "月度里程")
307 304 private Long mileageMonth;
308 305  
309 306 /** 百公里人次 */
310   - @Excel(name = "百公里人次")
311 307 private Long personMonthAvg;
312 308  
313 309 /** 营收 */
314   - @Excel(name = "营收")
315 310 private Long revenues;
316 311  
317 312 /** 人次 */
318   - @Excel(name = "人次")
319 313 private Long persons;
320 314  
321 315 /** 里程 */
322   - @Excel(name = "里程")
323 316 private Long mileages;
324 317  
325 318 /** 百公里人次 */
326   - @Excel(name = "百公里人次")
327 319 private Long personAvg;
328 320  
329 321 /** 开通日期（无） */
... ... @@ -350,7 +342,9 @@ public class BsthTLine extends BaseEntity
350 342  
351 343 private String revenueType;
352 344  
  345 + private String createTimeStr;
353 346  
  347 + private String createTimeEnd;
354 348  
355 349 public void setId(Long id)
356 350 {
... ... @@ -1147,6 +1141,21 @@ public class BsthTLine extends BaseEntity
1147 1141 this.revenueType = revenueType;
1148 1142 }
1149 1143  
  1144 + public String getCreateTimeStr() {
  1145 + return createTimeStr;
  1146 + }
  1147 +
  1148 + public void setCreateTimeStr(String createTimeStr) {
  1149 + this.createTimeStr = createTimeStr;
  1150 + }
  1151 +
  1152 + public String getCreateTimeEnd() {
  1153 + return createTimeEnd;
  1154 + }
  1155 +
  1156 + public void setCreateTimeEnd(String createTimeEnd) {
  1157 + this.createTimeEnd = createTimeEnd;
  1158 + }
1150 1159  
1151 1160 @Override
1152 1161 public String toString() {
... ...
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
  View file @d5a6f3b
... ... @@ -684,6 +684,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
684 684 <if test="examineStatus == 'true' "> and examine_status in(0,1)</if>
685 685 <if test="examineStatus == 'false' "> and examine_status =2</if>
686 686 <if test="examineType != null and examineType != ''"> and examine_type = #{examineType}</if>
  687 + <if test="createTimeStr != null and createTimeStr != ''"> and create_time >= #{createTimeStr}</if>
  688 + <if test="createTimeEnd != null and createTimeEnd != ''"> and create_time &lt;= #{createTimeEnd}</if>
687 689 </where>
688 690 </select>
689 691  
... ...
bsthLineProfiles/src/main/resources/templates/system/lineAdd/add.html
  View file @d5a6f3b
... ... @@ -460,13 +460,13 @@
460 460 </select>
461 461 </div>
462 462 <!---------------------------------->
463   - <label class="col-sm-1 control-label">启用时间：</label>
  463 + <!--<label class="col-sm-1 control-label">启用时间：</label>
464 464 <div class="col-sm-2">
465 465 <div class="input-group date">
466 466 <input name="startDate" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
467 467 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
468 468 </div>
469   - </div>
  469 + </div>-->
470 470 <!---------------------------------->
471 471 <label class="col-sm-1 control-label">备注：</label>
472 472 <div class="col-sm-2">
... ...
bsthLineProfiles/src/main/resources/templates/system/lineAdd/edit.html
  View file @d5a6f3b
... ... @@ -479,7 +479,7 @@
479 479 </select>
480 480 </div>
481 481 <!---------------------------------->
482   - <label class="col-sm-1 control-label">启用时间：</label>
  482 + <!--<label class="col-sm-1 control-label">启用时间：</label>
483 483 <div class="col-sm-2">
484 484 <div class="input-group date">
485 485 <input name="startDate" th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}"
... ... @@ -487,7 +487,7 @@
487 487 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
488 488 </div>
489 489  
490   - </div>
  490 + </div>-->
491 491 <!---------------------------------->
492 492 <label class="col-sm-1 control-label">备注：</label>
493 493 <div class="col-sm-2">
... ...
bsthLineProfiles/src/main/resources/templates/system/lineExamine/line.html
  View file @d5a6f3b
... ... @@ -3,6 +3,7 @@
3 3 xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
4 4 <head>
5 5 <th:block th:include="include :: header('线路档案信息')" />
  6 +<th:block th:include="include :: datetimepicker-css" />
6 7 </head>
7 8 <body class="gray-bg">
8 9 <div class="container-div" id="context">
... ... @@ -11,12 +12,31 @@
11 12 <form id="formId">
12 13 <div class="select-list">
13 14 <ul>
14   - <li><label>公司：</label> <input type="text" name="company" />
  15 + <div class="form-group">
  16 + <li class="col-sm-3"><label>公司：</label> <input type="text" name="company" />
15 17 </li>
16   - <li><label>分公司：</label> <input type="text" name="fCompany" />
  18 + <li class="col-sm-3"><label>分公司：</label> <input type="text" name="fCompany" />
17 19 </li>
18   - <li><label>线路名称：</label> <input type="text" name="lineName" />
  20 + <li class="col-sm-3"><label>线路名称：</label> <input type="text" name="lineName" />
19 21 </li>
  22 + <li class="col-sm-3"><label>申请开始：</label>
  23 + <div class="input-group date">
  24 + <input name="createTimeStr" id="createTimeStr" class="form-control" placeholder="yyyy-MM-dd" type="text"
  25 + autocomplete="off">
  26 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
  27 + </div>
  28 + </li>
  29 + </div>
  30 + <div class="form-group">
  31 + <li class="col-sm-3"><label>申请结束：</label>
  32 + <div class="input-group date">
  33 + <input name="createTimeEnd" id="createTimeEnd" class="form-control" placeholder="yyyy-MM-dd" type="text"
  34 + autocomplete="off">
  35 + <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
  36 + </div>
  37 + </li>
  38 + </div>
  39 +
20 40 <li>
21 41 <el-button size="mini" type="primary" icon="el-icon-search" onClick="$.table.search();">搜索</el-button>
22 42 <el-button size="mini" icon="el-icon-refresh" onClick="$.form.reset();">重置</el-button>
... ... @@ -27,11 +47,6 @@
27 47 </form>
28 48 </div>
29 49  
30   - <!--<div class="btn-group-sm" id="toolbar" role="group">
31   -
32   - <el-button plain size="mini" type="primary" icon="el-icon-plus" onClick="add(this);" shiro:hasPermission="system:line:add">新增</el-button>
33   -
34   - </div>-->
35 50  
36 51 <div class="col-sm-12 select-table table-striped">
37 52 <table id="bootstrap-table"></table>
... ... @@ -39,6 +54,7 @@
39 54 </div>
40 55 </div>
41 56 <th:block th:include="include :: footer" />
  57 + <th:block th:include="include :: datetimepicker-js" />
42 58 <div class="modal fade" id="myModal" tabindex="-1" role="dialog"
43 59 aria-labelledby="myModalLabel" aria-hidden="true">
44 60 <div class="modal-dialog">
... ... @@ -67,10 +83,6 @@
67 83  
68 84 <script th:inline="javascript">
69 85  
70   - /* function add(obj){
71   - if($(obj)[0].className.indexOf("disabled") == -1)
72   - $.operate.add();
73   - }*/
74 86  
75 87 new Vue({
76 88 el: '#context',
... ... @@ -83,6 +95,10 @@
83 95 function queryParams(params) {
84 96 var search = $.table.queryParams(params);
85 97 search.examineStatus ='true';
  98 + var createTimeStr=$('#createTimeStr').val();
  99 + var createTimeEnd=$('#createTimeEnd').val();
  100 + search.createTimeStr=createTimeStr;
  101 + search.createTimeEnd=createTimeEnd;
86 102 return search;
87 103 }
88 104  
... ... @@ -530,6 +546,16 @@
530 546 });
531 547 layer.full(index);
532 548 }
  549 + $("input[name='createTimeStr']").datetimepicker({
  550 + format: "yyyy-mm-dd",
  551 + minView: "month",
  552 + autoclose: true
  553 + });
  554 + $("input[name='createTimeEnd']").datetimepicker({
  555 + format: "yyyy-mm-dd",
  556 + minView: "month",
  557 + autoclose: true
  558 + });
533 559 </script>
534 560 <style>
535 561 .col_checkbox {
... ...