Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents 952886fc bf2b6a97
Showing 2 changed files with 35 additions and 20 deletions
src/main/java/com/bsth/data/schedule/edit_logs/ScheduleModifyLogger.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -187,17 +187,9 @@ public class ScheduleModifyLogger {
             String newNbbm = cpc.getClZbh();
             String newJsy = cpc.getJsy();
             String newSpy = cpc.getSpy();
-            //String oldJsy = sch.getjGh() + "/" + sch.getjName();
             if (newNbbm == null && newJsy == null && newSpy==null)
                 return;
-            /*if (newNbbm != null && newJsy != null
-                    && newNbbm.equals(sch.getClZbh()) && newJsy.equals(oldJsy))
-                return;*/
-
-
-            SchEditInfo sei = SchEditInfo.getInstance(sch);
-            sei.setType(EditType.TZRC);
             //detail
             JSONObject jobj = new JSONObject();
@@ -213,11 +205,22 @@ public class ScheduleModifyLogger {
             }
             String oldSpy = sch.getsGh() + "/" + sch.getsName();
-            if (StringUtils.isNotEmpty(newSpy) && !newSpy.equals(oldSpy)) {
-                jobj.put("old_spy", oldSpy);
-                jobj.put("now_spy", cpc.getSpy());
+            if(newSpy != null){
+                if(newSpy.equals(""))
+                    newSpy = "/";
+
+                if(!newSpy.equals(oldSpy)){
+                    jobj.put("old_spy", oldSpy);
+                    jobj.put("now_spy", newSpy);
+                }
             }
+            if(jobj.size() == 0)
+                return;
+
+            SchEditInfo sei = SchEditInfo.getInstance(sch);
+            sei.setType(EditType.TZRC);
+
             sei.setJsonArray(jobj.toJSONString());
             put(sei);
         } catch (Exception e) {
@@ -244,6 +244,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 schedule.setBcType(bcType);
             }
+            //如果正在执行该班次
+            ScheduleRealInfo exec = dayOfSchedule.executeCurr(schedule.getClZbh());
+            if(exec != null && exec == schedule){
+                //重新计算正在执行班次
+                dayOfSchedule.reCalcExecPlan(schedule.getClZbh());
+            }
+
             //重新计算是否误点
             schedule.reCalcLate();
             //取消应发未到标记，不再自动调整待发
@@ -3282,8 +3289,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if (StringUtils.isNotEmpty(cpc.getJsy())) {
                 //换驾驶员
-                persoChange(sch, jGh);
-                set.add(sch);
+                if(persoChange(sch, jGh))
+                    set.add(sch);
             }
             //换售票员
@@ -3295,8 +3302,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     rs.put("status", ResponseCode.ERROR);
                     return rs;
                 }
-                persoChangeSPY(sch, sGh);
-                set.add(sch);
+                if(persoChangeSPY(sch, sGh))
+                    set.add(sch);
             }
             else if(StringUtils.isNotEmpty(sch.getsGh())){
                 sch.setsGh("");
@@ -3304,12 +3311,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
             //换车
-            if (StringUtils.isNotEmpty(cpc.getClZbh())) {
+            if (StringUtils.isNotEmpty(cpc.getClZbh()) && !cpc.getClZbh().equals(sch.getClZbh())) {
                 set.add(sch);
                 set.addAll(dayOfSchedule.changeCar(sch, cpc.getClZbh()));
             }
             dayOfSchedule.save(sch);
+            set.add(sch);
         }
         rs.put("ts", set);
@@ -3321,9 +3329,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
      * @Title: persoChange
      * @Description: TODO(班次换驾驶员)
      */
-    public void persoChange(ScheduleRealInfo sch, String jGh) {
+    public boolean persoChange(ScheduleRealInfo sch, String jGh) {
         if (sch.getjGh().equals(jGh))
-            return;
+            return false;
         String jName = getPersonName(sch.getGsBm() , jGh);
         if (StringUtils.isNotEmpty(jName)) {
@@ -3333,16 +3341,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 sch.setjGh(jGh);
             sch.setjName(jName);
+            return true;
         }
+        return false;
     }
     /**
      * @Title: persoChange
      * @Description: TODO(班次换售票员)
      */
-    public void persoChangeSPY(ScheduleRealInfo sch, String sGh) {
+    public boolean persoChangeSPY(ScheduleRealInfo sch, String sGh) {
         if (sch.getsGh().equals(sGh))
-            return;
+            return false;
         String sName = getPersonName(sch.getGsBm() , sGh);
         if (StringUtils.isNotEmpty(sName)) {
             if (sGh.indexOf("-") != -1)
@@ -3350,7 +3360,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             else
                 sch.setsGh(sGh);
             sch.setsName(sName);
+            return true;
         }
+        return false;
     }
     /**