update...

潘钊
1 parent 8f41b106
Showing 4 changed files with 24 additions and 4 deletions
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/entity/directive/D80.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/resources/static/real_control_v2/fragments/north/nav/report_80.html
@@ -121,6 +121,7 @@ public class PilotReport {
             //反射搜索用 瞬时字段
             d80.setLineId(d80.getData().getLineId());
             d80.setNbbm(d80.getData().getNbbm());
+            d80.setRequestCode(d80.getData().getRequestCode());
         } catch (Exception e) {
             logger.error("", e);
         }
@@ -74,6 +74,10 @@ public class D80 {
 	@JsonIgnore
 	private String nbbm;
+	@Transient
+	@JsonIgnore
+	private Short requestCode;
+
 	public Long getSchId() {
 		return schId;
 	}
@@ -98,6 +102,14 @@ public class D80 {
 		this.nbbm = nbbm;
 	}
+	public Short getRequestCode() {
+		return requestCode;
+	}
+
+	public void setRequestCode(Short requestCode) {
+		this.requestCode = requestCode;
+	}
+
 	@Embeddable
 	public static class D80Data {
@@ -496,15 +496,22 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         rsMap.put("totalPages", count % size == 0 ? count / size - 1 : count / size);
         rsMap.put("page", page);*/
-        Collection all = pilotReport.findAll();
-        List<D80> d80s = ListPageQueryUtils.paging(ListFilterUtils.filter(all, map, D80.class), page, size);
+        List all = ListFilterUtils.filter(pilotReport.findAll(), map, D80.class);
+        //排序
+        Collections.sort(all, new Comparator<D80>() {
+            @Override
+            public int compare(D80 o1, D80 o2) {
+                return (int) (o2.getTimestamp() - o1.getTimestamp());
+            }
+        });
+        List<D80> d80s = ListPageQueryUtils.paging(all, page, size);
         //时间格式化
         for (D80 d80 : d80s) {
             d80.setTimeStr(fmtHHmm.print(d80.getTimestamp()));
         }
         Map<String, Object> rsMap = new HashMap<>();
         rsMap.put("list", d80s);
-        rsMap.put("totalPages", d80s.size() % size == 0 ? d80s.size() / size - 1 : d80s.size() / size);
+        rsMap.put("totalPages", all.size() % size == 0 ? all.size() / size - 1: all.size() / size);
         rsMap.put("page", page);
         return rsMap;
     }
@@ -12,7 +12,7 @@
                     </legend>
                     <span class="horizontal-field">请求代码</span>
                     <select name="requestCode">
-                        <option value="-1">全部</option>
+                        <option value="">全部</option>
                     </select>
                     <span class="horizontal-field">线路</span>
                     <div class="uk-autocomplete uk-form autocomplete-line" >