update...

潘钊
1 parent 1cd8d7fe
Showing 2 changed files with 13 additions and 10 deletions
src/main/java/com/bsth/data/schedule/edit_logs/ScheduleModifyLogger.java
src/main/resources/static/real_control_v2/js/main.js
@@ -186,13 +186,14 @@ public class ScheduleModifyLogger {
         try {
             String newNbbm = cpc.getClZbh();
             String newJsy = cpc.getJsy();
-            String oldJsy = sch.getjGh() + "/" + sch.getjName();
+            String newSpy = cpc.getSpy();
+            //String oldJsy = sch.getjGh() + "/" + sch.getjName();
  
-            if (newNbbm == null && newJsy == null)
+            if (newNbbm == null && newJsy == null && newSpy==null)
                 return;
-            if (newNbbm != null && newJsy != null
+            /*if (newNbbm != null && newJsy != null
                     && newNbbm.equals(sch.getClZbh()) && newJsy.equals(oldJsy))
-                return;
+                return;*/
  
  
             SchEditInfo sei = SchEditInfo.getInstance(sch);
@@ -200,18 +201,20 @@ public class ScheduleModifyLogger {
  
             //detail
             JSONObject jobj = new JSONObject();
-            if (StringUtils.isNotEmpty(newNbbm)) {
+            if (StringUtils.isNotEmpty(newNbbm) && !newNbbm.equals(sch.getClZbh())) {
                 jobj.put("old_nbbm", sch.getClZbh());
                 jobj.put("now_nbbm", newNbbm);
             }
  
-            if (StringUtils.isNotEmpty(newJsy)) {
-                jobj.put("old_jsy", sch.getjGh() + "/" + sch.getjName());
+            String oldJsy = sch.getjGh() + "/" + sch.getjName();
+            if (StringUtils.isNotEmpty(newJsy) && !newJsy.equals(oldJsy)) {
+                jobj.put("old_jsy", oldJsy);
                 jobj.put("now_jsy", newJsy);
             }
  
-            if (StringUtils.isNotEmpty(cpc.getSpy()) && cpc.getSpy().length() > 3) {
-                jobj.put("old_spy", sch.getsGh() + "/" + sch.getsName());
+            String oldSpy = sch.getsGh() + "/" + sch.getsName();
+            if (StringUtils.isNotEmpty(newSpy) && !newSpy.equals(oldSpy)) {
+                jobj.put("old_spy", oldSpy);
                 jobj.put("now_spy", cpc.getSpy());
             }
  
@@ -170,7 +170,7 @@ function showUpdateDescription() {
     //更新说明
     var updateDescription = {
         date: '2017-05-23',
-        text: '<h5>现在可以在 数据&统计 里面看到班次修正日志。05-23之后的数据开始展现</h5>'
+        text: '<h5>现在可以在 数据&统计 里面看到部分班次修正日志。05-23之后的数据开始展现</h5>'
     };
  
     var storage = window.localStorage