潘钊 / bsth_control · Commits

Commit be6befbd20190d7bc08185f6368226b9fc9c53f2

Authored by 潘钊
1 parent 8f41b106
build: skipped

update...

Inline Side-by-side
Showing 4 changed files with 24 additions and 4 deletions
src/main/java/com/bsth/data/pilot80/PilotReport.java
  View file @be6befb
... ... @@ -121,6 +121,7 @@ public class PilotReport {
121 121 //反射搜索用 瞬时字段
122 122 d80.setLineId(d80.getData().getLineId());
123 123 d80.setNbbm(d80.getData().getNbbm());
  124 + d80.setRequestCode(d80.getData().getRequestCode());
124 125 } catch (Exception e) {
125 126 logger.error("", e);
126 127 }
... ...
src/main/java/com/bsth/entity/directive/D80.java
  View file @be6befb
... ... @@ -74,6 +74,10 @@ public class D80 {
74 74 @JsonIgnore
75 75 private String nbbm;
76 76  
  77 + @Transient
  78 + @JsonIgnore
  79 + private Short requestCode;
  80 +
77 81 public Long getSchId() {
78 82 return schId;
79 83 }
... ... @@ -98,6 +102,14 @@ public class D80 {
98 102 this.nbbm = nbbm;
99 103 }
100 104  
  105 + public Short getRequestCode() {
  106 + return requestCode;
  107 + }
  108 +
  109 + public void setRequestCode(Short requestCode) {
  110 + this.requestCode = requestCode;
  111 + }
  112 +
101 113 @Embeddable
102 114 public static class D80Data {
103 115  
... ...
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
  View file @be6befb
... ... @@ -496,15 +496,22 @@ public class DirectiveServiceImpl extends BaseServiceImpl<D60, Integer> implemen
496 496 rsMap.put("totalPages", count % size == 0 ? count / size - 1 : count / size);
497 497 rsMap.put("page", page);*/
498 498  
499   - Collection all = pilotReport.findAll();
500   - List<D80> d80s = ListPageQueryUtils.paging(ListFilterUtils.filter(all, map, D80.class), page, size);
  499 + List all = ListFilterUtils.filter(pilotReport.findAll(), map, D80.class);
  500 + //排序
  501 + Collections.sort(all, new Comparator<D80>() {
  502 + @Override
  503 + public int compare(D80 o1, D80 o2) {
  504 + return (int) (o2.getTimestamp() - o1.getTimestamp());
  505 + }
  506 + });
  507 + List<D80> d80s = ListPageQueryUtils.paging(all, page, size);
501 508 //时间格式化
502 509 for (D80 d80 : d80s) {
503 510 d80.setTimeStr(fmtHHmm.print(d80.getTimestamp()));
504 511 }
505 512 Map<String, Object> rsMap = new HashMap<>();
506 513 rsMap.put("list", d80s);
507   - rsMap.put("totalPages", d80s.size() % size == 0 ? d80s.size() / size - 1 : d80s.size() / size);
  514 + rsMap.put("totalPages", all.size() % size == 0 ? all.size() / size - 1: all.size() / size);
508 515 rsMap.put("page", page);
509 516 return rsMap;
510 517 }
... ...
src/main/resources/static/real_control_v2/fragments/north/nav/report_80.html
  View file @be6befb
... ... @@ -12,7 +12,7 @@
12 12 </legend>
13 13 <span class="horizontal-field">请求代码</span>
14 14 <select name="requestCode">
15   - <option value="-1">全部</option>
  15 + <option value="">全部</option>
16 16 </select>
17 17 <span class="horizontal-field">线路</span>
18 18 <div class="uk-autocomplete uk-form autocomplete-line" >
... ...