Commit af3beaa59e7372797aa623592f29ba8443bc7789
1 parent
1cd8d7fe
update...
Showing
2 changed files
with
13 additions
and
10 deletions
src/main/java/com/bsth/data/schedule/edit_logs/ScheduleModifyLogger.java
| @@ -186,13 +186,14 @@ public class ScheduleModifyLogger { | @@ -186,13 +186,14 @@ public class ScheduleModifyLogger { | ||
| 186 | try { | 186 | try { |
| 187 | String newNbbm = cpc.getClZbh(); | 187 | String newNbbm = cpc.getClZbh(); |
| 188 | String newJsy = cpc.getJsy(); | 188 | String newJsy = cpc.getJsy(); |
| 189 | - String oldJsy = sch.getjGh() + "/" + sch.getjName(); | 189 | + String newSpy = cpc.getSpy(); |
| 190 | + //String oldJsy = sch.getjGh() + "/" + sch.getjName(); | ||
| 190 | 191 | ||
| 191 | - if (newNbbm == null && newJsy == null) | 192 | + if (newNbbm == null && newJsy == null && newSpy==null) |
| 192 | return; | 193 | return; |
| 193 | - if (newNbbm != null && newJsy != null | 194 | + /*if (newNbbm != null && newJsy != null |
| 194 | && newNbbm.equals(sch.getClZbh()) && newJsy.equals(oldJsy)) | 195 | && newNbbm.equals(sch.getClZbh()) && newJsy.equals(oldJsy)) |
| 195 | - return; | 196 | + return;*/ |
| 196 | 197 | ||
| 197 | 198 | ||
| 198 | SchEditInfo sei = SchEditInfo.getInstance(sch); | 199 | SchEditInfo sei = SchEditInfo.getInstance(sch); |
| @@ -200,18 +201,20 @@ public class ScheduleModifyLogger { | @@ -200,18 +201,20 @@ public class ScheduleModifyLogger { | ||
| 200 | 201 | ||
| 201 | //detail | 202 | //detail |
| 202 | JSONObject jobj = new JSONObject(); | 203 | JSONObject jobj = new JSONObject(); |
| 203 | - if (StringUtils.isNotEmpty(newNbbm)) { | 204 | + if (StringUtils.isNotEmpty(newNbbm) && !newNbbm.equals(sch.getClZbh())) { |
| 204 | jobj.put("old_nbbm", sch.getClZbh()); | 205 | jobj.put("old_nbbm", sch.getClZbh()); |
| 205 | jobj.put("now_nbbm", newNbbm); | 206 | jobj.put("now_nbbm", newNbbm); |
| 206 | } | 207 | } |
| 207 | 208 | ||
| 208 | - if (StringUtils.isNotEmpty(newJsy)) { | ||
| 209 | - jobj.put("old_jsy", sch.getjGh() + "/" + sch.getjName()); | 209 | + String oldJsy = sch.getjGh() + "/" + sch.getjName(); |
| 210 | + if (StringUtils.isNotEmpty(newJsy) && !newJsy.equals(oldJsy)) { | ||
| 211 | + jobj.put("old_jsy", oldJsy); | ||
| 210 | jobj.put("now_jsy", newJsy); | 212 | jobj.put("now_jsy", newJsy); |
| 211 | } | 213 | } |
| 212 | 214 | ||
| 213 | - if (StringUtils.isNotEmpty(cpc.getSpy()) && cpc.getSpy().length() > 3) { | ||
| 214 | - jobj.put("old_spy", sch.getsGh() + "/" + sch.getsName()); | 215 | + String oldSpy = sch.getsGh() + "/" + sch.getsName(); |
| 216 | + if (StringUtils.isNotEmpty(newSpy) && !newSpy.equals(oldSpy)) { | ||
| 217 | + jobj.put("old_spy", oldSpy); | ||
| 215 | jobj.put("now_spy", cpc.getSpy()); | 218 | jobj.put("now_spy", cpc.getSpy()); |
| 216 | } | 219 | } |
| 217 | 220 |
src/main/resources/static/real_control_v2/js/main.js
| @@ -170,7 +170,7 @@ function showUpdateDescription() { | @@ -170,7 +170,7 @@ function showUpdateDescription() { | ||
| 170 | //更新说明 | 170 | //更新说明 |
| 171 | var updateDescription = { | 171 | var updateDescription = { |
| 172 | date: '2017-05-23', | 172 | date: '2017-05-23', |
| 173 | - text: '<h5>现在可以在 数据&统计 里面看到班次修正日志。05-23之后的数据开始展现</h5>' | 173 | + text: '<h5>现在可以在 数据&统计 里面看到部分班次修正日志。05-23之后的数据开始展现</h5>' |
| 174 | }; | 174 | }; |
| 175 | 175 | ||
| 176 | var storage = window.localStorage | 176 | var storage = window.localStorage |