潘钊 / bsth_control · Commits

Commit afa41ec95196f56c1134d7512d9c2ff4ff15645e

Authored by 王通
1 parent 485f89c5
build: skipped

1.发车信息微调修正时间显示错误

Inline Side-by-side
Showing 2 changed files with 223 additions and 210 deletions
src/main/java/com/bsth/data/schedule/edit_logs/service/dto/SchEditInfoDto.java
  View file @afa41ec
1   -package com.bsth.data.schedule.edit_logs.service.dto;
2   -
3   -/**
4   - * Created by panzhao on 2017/5/22.
5   - */
6   -public class SchEditInfoDto {
7   -
8   - private long id;
9   - /*** 日期 yyyy-MM-dd*/
10   - private String rq;
11   -
12   - /*** 时间 HH:mm*/
13   - private String timeStr;
14   -
15   - private String lineCode;
16   -
17   - private String gsbm;
18   -
19   - private String fgsbm;
20   -
21   - /*** 班次ID*/
22   - private long schId;
23   -
24   - /*** 类型*/
25   - private String type;
26   -
27   - private String type2;
28   - /*** 操作人 @system 系统/用户名*/
29   - private String user;
30   -
31   - /*** 操作明细*/
32   - private String jsonArray;
33   -
34   - private String remarks;
35   -
36   - /** 路牌 */
37   - private String lpName;
38   -
39   - /** 驾驶员工号 */
40   - private String jGh;
41   -
42   - /** 驾驶员姓名 */
43   - private String jName;
44   -
45   - /** 车辆自编号 */
46   - private String clZbh;
47   -
48   - /** 计发时间 */
49   - private String fcsj;
50   -
51   - /** 上下行 */
52   - private int xlDir;
53   -
54   - /** 实际执行日期 */
55   - private String realExecDate;
56   -
57   - public long getId() {
58   - return id;
59   - }
60   -
61   - public void setId(long id) {
62   - this.id = id;
63   - }
64   -
65   - public String getRq() {
66   - return rq;
67   - }
68   -
69   - public void setRq(String rq) {
70   - this.rq = rq;
71   - }
72   -
73   - public String getTimeStr() {
74   - return timeStr;
75   - }
76   -
77   - public void setTimeStr(String timeStr) {
78   - this.timeStr = timeStr;
79   - }
80   -
81   - public String getLineCode() {
82   - return lineCode;
83   - }
84   -
85   - public void setLineCode(String lineCode) {
86   - this.lineCode = lineCode;
87   - }
88   -
89   - public String getGsbm() {
90   - return gsbm;
91   - }
92   -
93   - public void setGsbm(String gsbm) {
94   - this.gsbm = gsbm;
95   - }
96   -
97   - public String getFgsbm() {
98   - return fgsbm;
99   - }
100   -
101   - public void setFgsbm(String fgsbm) {
102   - this.fgsbm = fgsbm;
103   - }
104   -
105   - public long getSchId() {
106   - return schId;
107   - }
108   -
109   - public void setSchId(long schId) {
110   - this.schId = schId;
111   - }
112   -
113   - public String getType2() {
114   - return type2;
115   - }
116   -
117   - public void setType2(String type2) {
118   - this.type2 = type2;
119   - }
120   -
121   - public String getUser() {
122   - return user;
123   - }
124   -
125   - public void setUser(String user) {
126   - this.user = user;
127   - }
128   -
129   - public String getJsonArray() {
130   - return jsonArray;
131   - }
132   -
133   - public void setJsonArray(String jsonArray) {
134   - this.jsonArray = jsonArray;
135   - }
136   -
137   - public String getRemarks() {
138   - return remarks;
139   - }
140   -
141   - public void setRemarks(String remarks) {
142   - this.remarks = remarks;
143   - }
144   -
145   - public String getLpName() {
146   - return lpName;
147   - }
148   -
149   - public void setLpName(String lpName) {
150   - this.lpName = lpName;
151   - }
152   -
153   - public String getjGh() {
154   - return jGh;
155   - }
156   -
157   - public void setjGh(String jGh) {
158   - this.jGh = jGh;
159   - }
160   -
161   - public String getjName() {
162   - return jName;
163   - }
164   -
165   - public void setjName(String jName) {
166   - this.jName = jName;
167   - }
168   -
169   -
170   - public String getRealExecDate() {
171   - return realExecDate;
172   - }
173   -
174   - public void setRealExecDate(String realExecDate) {
175   - this.realExecDate = realExecDate;
176   - }
177   -
178   - public String getType() {
179   - return type;
180   - }
181   -
182   - public void setType(String type) {
183   - this.type = type;
184   - }
185   -
186   - public String getClZbh() {
187   - return clZbh;
188   - }
189   -
190   - public void setClZbh(String clZbh) {
191   - this.clZbh = clZbh;
192   - }
193   -
194   - public String getFcsj() {
195   - return fcsj;
196   - }
197   -
198   - public void setFcsj(String fcsj) {
199   - this.fcsj = fcsj;
200   - }
201   -
202   - public int getXlDir() {
203   - return xlDir;
204   - }
205   -
206   - public void setXlDir(int xlDir) {
207   - this.xlDir = xlDir;
208   - }
209   -}
  1 +package com.bsth.data.schedule.edit_logs.service.dto;
  2 +
  3 +/**
  4 + * Created by panzhao on 2017/5/22.
  5 + */
  6 +public class SchEditInfoDto {
  7 +
  8 + private long id;
  9 + /*** 日期 yyyy-MM-dd*/
  10 + private String rq;
  11 +
  12 + /*** 时间 HH:mm*/
  13 + private String timeStr;
  14 +
  15 + private String lineCode;
  16 +
  17 + private String gsbm;
  18 +
  19 + private String fgsbm;
  20 +
  21 + /*** 班次ID*/
  22 + private long schId;
  23 +
  24 + /*** 类型*/
  25 + private String type;
  26 +
  27 + private String type2;
  28 + /*** 操作人 @system 系统/用户名*/
  29 + private String user;
  30 +
  31 + /*** 操作明细*/
  32 + private String jsonArray;
  33 +
  34 + private String remarks;
  35 +
  36 + /** 路牌 */
  37 + private String lpName;
  38 +
  39 + /** 驾驶员工号 */
  40 + private String jGh;
  41 +
  42 + /** 驾驶员姓名 */
  43 + private String jName;
  44 +
  45 + /** 车辆自编号 */
  46 + private String clZbh;
  47 +
  48 + /** 计发时间 */
  49 + private String fcsj;
  50 +
  51 + /** 上下行 */
  52 + private int xlDir;
  53 +
  54 + /** 实际执行日期 */
  55 + private String realExecDate;
  56 +
  57 + /**
  58 + * 班次修正时间戳
  59 + */
  60 + private long ts;
  61 +
  62 + public long getId() {
  63 + return id;
  64 + }
  65 +
  66 + public void setId(long id) {
  67 + this.id = id;
  68 + }
  69 +
  70 + public String getRq() {
  71 + return rq;
  72 + }
  73 +
  74 + public void setRq(String rq) {
  75 + this.rq = rq;
  76 + }
  77 +
  78 + public String getTimeStr() {
  79 + return timeStr;
  80 + }
  81 +
  82 + public void setTimeStr(String timeStr) {
  83 + this.timeStr = timeStr;
  84 + }
  85 +
  86 + public String getLineCode() {
  87 + return lineCode;
  88 + }
  89 +
  90 + public void setLineCode(String lineCode) {
  91 + this.lineCode = lineCode;
  92 + }
  93 +
  94 + public String getGsbm() {
  95 + return gsbm;
  96 + }
  97 +
  98 + public void setGsbm(String gsbm) {
  99 + this.gsbm = gsbm;
  100 + }
  101 +
  102 + public String getFgsbm() {
  103 + return fgsbm;
  104 + }
  105 +
  106 + public void setFgsbm(String fgsbm) {
  107 + this.fgsbm = fgsbm;
  108 + }
  109 +
  110 + public long getSchId() {
  111 + return schId;
  112 + }
  113 +
  114 + public void setSchId(long schId) {
  115 + this.schId = schId;
  116 + }
  117 +
  118 + public String getType2() {
  119 + return type2;
  120 + }
  121 +
  122 + public void setType2(String type2) {
  123 + this.type2 = type2;
  124 + }
  125 +
  126 + public String getUser() {
  127 + return user;
  128 + }
  129 +
  130 + public void setUser(String user) {
  131 + this.user = user;
  132 + }
  133 +
  134 + public String getJsonArray() {
  135 + return jsonArray;
  136 + }
  137 +
  138 + public void setJsonArray(String jsonArray) {
  139 + this.jsonArray = jsonArray;
  140 + }
  141 +
  142 + public String getRemarks() {
  143 + return remarks;
  144 + }
  145 +
  146 + public void setRemarks(String remarks) {
  147 + this.remarks = remarks;
  148 + }
  149 +
  150 + public String getLpName() {
  151 + return lpName;
  152 + }
  153 +
  154 + public void setLpName(String lpName) {
  155 + this.lpName = lpName;
  156 + }
  157 +
  158 + public String getjGh() {
  159 + return jGh;
  160 + }
  161 +
  162 + public void setjGh(String jGh) {
  163 + this.jGh = jGh;
  164 + }
  165 +
  166 + public String getjName() {
  167 + return jName;
  168 + }
  169 +
  170 + public void setjName(String jName) {
  171 + this.jName = jName;
  172 + }
  173 +
  174 +
  175 + public String getRealExecDate() {
  176 + return realExecDate;
  177 + }
  178 +
  179 + public void setRealExecDate(String realExecDate) {
  180 + this.realExecDate = realExecDate;
  181 + }
  182 +
  183 + public String getType() {
  184 + return type;
  185 + }
  186 +
  187 + public void setType(String type) {
  188 + this.type = type;
  189 + }
  190 +
  191 + public String getClZbh() {
  192 + return clZbh;
  193 + }
  194 +
  195 + public void setClZbh(String clZbh) {
  196 + this.clZbh = clZbh;
  197 + }
  198 +
  199 + public String getFcsj() {
  200 + return fcsj;
  201 + }
  202 +
  203 + public void setFcsj(String fcsj) {
  204 + this.fcsj = fcsj;
  205 + }
  206 +
  207 + public int getXlDir() {
  208 + return xlDir;
  209 + }
  210 +
  211 + public void setXlDir(int xlDir) {
  212 + this.xlDir = xlDir;
  213 + }
  214 +
  215 + public long getTs() {
  216 + return ts;
  217 + }
  218 +
  219 + public void setTs(long ts) {
  220 + this.ts = ts;
  221 + }
  222 +}
... ...
src/main/resources/static/real_control_v2/fragments/north/nav/sch_edit_info/list.html
  View file @afa41ec
... ... @@ -131,7 +131,7 @@
131 131 {{each jsonArray as obj i}}
132 132 <p class="text">{{obj.title}} 由 {{obj.old==null?'无':obj.old}} 调整为 {{obj.now}}</p>
133 133 {{/each}}
134   - <p class="sub_text">调整人：{{user}} 调整时间：{{timeStr}}</p>
  134 +<p class="sub_text">调整人：{{user}} 调整时间：{{ts_str}}</p>Z
135 135 {{if remarks!=null && remarks != ''}}
136 136 <p class="sub_text">备注：{{remarks}}</p>
137 137 {{/if}}
... ...