潘钊 / bsth_control · Commits

Commit 1f64927addb2d74b4c48ca7fc5b9fb1b6a1649bd

Authored by 潘钊
1 parent 324c6bd8

update...

Inline Side-by-side
Showing 3 changed files with 17 additions and 1 deletions
src/main/java/com/bsth/data/summary/entity/FastAndSlow.java
  View file @1f64927
@@ -23,6 +23,7 @@ public class FastAndSlow { @@ -23,6 +23,7 @@ public class FastAndSlow {
23 /** 23 /**
24 * 发车站点 24 * 发车站点
25 */ 25 */
  26 + @Column(name = "station_name")
26 private String stationName; 27 private String stationName;
27 28
28 /** 29 /**
@@ -34,79 +35,94 @@ public class FastAndSlow { @@ -34,79 +35,94 @@ public class FastAndSlow {
34 /** 35 /**
35 * 上下行 36 * 上下行
36 */ 37 */
  38 + @Column(name = "up_down")
37 private int upDown; 39 private int upDown;
38 40
39 /** 41 /**
40 * 计发时间 42 * 计发时间
41 * HH:mm 43 * HH:mm
42 */ 44 */
  45 + @Column(name = "fcsj")
43 private String fcsj; 46 private String fcsj;
44 47
45 /** 48 /**
46 * 待发时间 49 * 待发时间
47 * HH:mm 50 * HH:mm
48 */ 51 */
  52 + @Column(name = "dfsj")
49 private String dfsj; 53 private String dfsj;
50 54
51 /** 55 /**
52 * 实际发车时间 56 * 实际发车时间
53 * HH:mm 57 * HH:mm
54 */ 58 */
  59 + @Column(name = "fcsj_actual")
55 private String fcsjActual; 60 private String fcsjActual;
56 61
57 /** 62 /**
58 * 计发快误点 63 * 计发快误点
59 */ 64 */
  65 + @Column(name = "fcsj_fast")
60 private int fcsjFast; 66 private int fcsjFast;
61 67
62 /** 68 /**
63 * 计发慢误点 69 * 计发慢误点
64 */ 70 */
  71 + @Column(name = "fcsj_slow")
65 private int fcsjSlow; 72 private int fcsjSlow;
66 73
67 /** 74 /**
68 * 待发快误点 75 * 待发快误点
69 */ 76 */
  77 + @Column(name = "dfsj_fast")
70 private int dfsjFast; 78 private int dfsjFast;
71 79
72 /** 80 /**
73 * 待发慢误点 81 * 待发慢误点
74 */ 82 */
  83 + @Column(name = "dfsj_slow")
75 private int dfsjSlow; 84 private int dfsjSlow;
76 85
77 /** 86 /**
78 * 计划终点时间 87 * 计划终点时间
79 */ 88 */
  89 + @Column(name = "zdsj")
80 private String zdsj; 90 private String zdsj;
81 91
82 /** 92 /**
83 * 待发终点时间 93 * 待发终点时间
84 */ 94 */
  95 + @Column(name = "zdsj_df")
85 private String zdsjDf; 96 private String zdsjDf;
86 97
87 /** 98 /**
88 * 实际终点时间 99 * 实际终点时间
89 */ 100 */
  101 + @Column(name = "zdsj_actual")
90 private String zdsjActual; 102 private String zdsjActual;
91 103
92 /** 104 /**
93 * 计发终点快误点 105 * 计发终点快误点
94 */ 106 */
  107 + @Column(name = "zdsj_fast")
95 private int zdsjFast; 108 private int zdsjFast;
96 109
97 /** 110 /**
98 * 计发终点慢误点 111 * 计发终点慢误点
99 */ 112 */
  113 + @Column(name = "zdsj_slow")
100 private int zdsjSlow; 114 private int zdsjSlow;
101 115
102 /** 116 /**
103 * 待发终点快误点 117 * 待发终点快误点
104 */ 118 */
  119 + @Column(name = "zdsj_df_fast")
105 private int zdsjDfFast; 120 private int zdsjDfFast;
106 121
107 /** 122 /**
108 * 待发终点慢误点 123 * 待发终点慢误点
109 */ 124 */
  125 + @Column(name = "zdsj_df_slow")
110 private int zdsjDfSlow; 126 private int zdsjDfSlow;
111 127
112 @Column(name = "line_code") 128 @Column(name = "line_code")
src/main/java/com/bsth/data/summary/service/impl/FastAndSlowServiceImpl.java
  View file @1f64927
@@ -41,7 +41,7 @@ public class FastAndSlowServiceImpl extends BaseServiceImpl<FastAndSlow, Long> i @@ -41,7 +41,7 @@ public class FastAndSlowServiceImpl extends BaseServiceImpl<FastAndSlow, Long> i
41 try { 41 try {
42 //最多5天 42 //最多5天
43 map.put("rq_le", maxEndTime(map.get("rq_ge").toString() 43 map.put("rq_le", maxEndTime(map.get("rq_ge").toString()
44 - , map.get("rq_le").toString(), 5)); 44 + , map.get("rq_le").toString(), 4));
45 45
46 List<FastAndSlow> list = (List) super.list(map); 46 List<FastAndSlow> list = (List) super.list(map);
47 String type = String.valueOf(map.get("type")); 47 String type = String.valueOf(map.get("type"));
src/main/resources/static/pages/summary/excel/快慢误点报表.xls
View file @1f64927
No preview for this file type