潘钊 / bsth_control · Commits

Commit c049ece84b163ee1617f97791acc6f9c159715d8

Authored by 潘钊
1 parent a57e7142
build: skipped

update...

Inline Side-by-side
Showing 2 changed files with 11 additions and 11 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @c049ece
@@ -3018,11 +3018,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf @@ -3018,11 +3018,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
3018 Set<ScheduleRealInfo> set = new HashSet<>(); 3018 Set<ScheduleRealInfo> set = new HashSet<>();
3019 3019
3020 ScheduleRealInfo sch; 3020 ScheduleRealInfo sch;
3021 - StringBuilder sb = new StringBuilder(); 3021 + //StringBuilder sb = new StringBuilder();
3022 3022
3023 String jGh = null,jName,sGh,sName; 3023 String jGh = null,jName,sGh,sName;
3024 for (ChangePersonCar cpc : cpcs) { 3024 for (ChangePersonCar cpc : cpcs) {
3025 - sb = new StringBuilder(); 3025 + //sb = new StringBuilder();
3026 3026
3027 sch = dayOfSchedule.get(cpc.getSchId()); 3027 sch = dayOfSchedule.get(cpc.getSchId());
3028 if (sch == null) 3028 if (sch == null)
@@ -3058,8 +3058,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3058,8 +3058,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3058 3058
3059 //换驾驶员 3059 //换驾驶员
3060 if (StringUtils.isNotEmpty(cpc.getJsy())) { 3060 if (StringUtils.isNotEmpty(cpc.getJsy())) {
3061 - if(!jGh.equals(sch.getjGh()))  
3062 - sb.append(sch.getjGh() + " 换 " + jGh + ";"); 3061 + /*if(!jGh.equals(sch.getjGh()))
  3062 + sb.append(sch.getjGh() + " 换 " + jGh + ";");*/
3063 //换驾驶员 3063 //换驾驶员
3064 if(persoChange(sch, jGh)) 3064 if(persoChange(sch, jGh))
3065 set.add(sch); 3065 set.add(sch);
@@ -3075,8 +3075,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3075,8 +3075,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3075 return rs; 3075 return rs;
3076 } 3076 }
3077 3077
3078 - if(!sGh.equals(sch.getsGh()))  
3079 - sb.append(sch.getsGh() + " 换 " + sGh + ";"); 3078 + /*if(!sGh.equals(sch.getsGh()))
  3079 + sb.append(sch.getsGh() + " 换 " + sGh + ";");*/
3080 if(persoChangeSPY(sch, sGh)) 3080 if(persoChangeSPY(sch, sGh))
3081 set.add(sch); 3081 set.add(sch);
3082 } 3082 }
@@ -3087,13 +3087,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3087,13 +3087,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3087 3087
3088 //换车 3088 //换车
3089 if (StringUtils.isNotEmpty(cpc.getClZbh()) && !cpc.getClZbh().equals(sch.getClZbh())) { 3089 if (StringUtils.isNotEmpty(cpc.getClZbh()) && !cpc.getClZbh().equals(sch.getClZbh())) {
3090 - sb.append(sch.getClZbh() + " 换 " + cpc.getClZbh() + ";"); 3090 + //sb.append(sch.getClZbh() + " 换 " + cpc.getClZbh() + ";");
3091 set.add(sch); 3091 set.add(sch);
3092 set.addAll(dayOfSchedule.changeCar(sch, cpc.getClZbh())); 3092 set.addAll(dayOfSchedule.changeCar(sch, cpc.getClZbh()));
3093 } 3093 }
3094 3094
3095 - if(sb.length() > 0)  
3096 - sch.setRemarks(sb.toString()); 3095 + /*if(sb.length() > 0)
  3096 + sch.setRemarks(sb.toString());*/
3097 3097
3098 dayOfSchedule.save(sch); 3098 dayOfSchedule.save(sch);
3099 set.add(sch); 3099 set.add(sch);
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/bc_type_major.html
  View file @c049ece
@@ -84,11 +84,11 @@ @@ -84,11 +84,11 @@
84 84
85 //只修改起点 85 //只修改起点
86 if (sch.qdzCode != $qdz.val() && sch.zdzCode == $zdz.val()) { 86 if (sch.qdzCode != $qdz.val() && sch.zdzCode == $zdz.val()) {
87 - remarks = ' 从 ' + sch.qdzName + ' 待客至 ' + qdzName + ' ，放站至 ' + zdzName; 87 + remarks = ' 从 ' + sch.qdzName + ' 带客至 ' + qdzName + ' ，放站至 ' + zdzName;
88 } 88 }
89 //只修改终点 89 //只修改终点
90 else if (sch.qdzCode == $qdz.val() && sch.zdzCode != $zdz.val()) { 90 else if (sch.qdzCode == $qdz.val() && sch.zdzCode != $zdz.val()) {
91 - remarks = ' 从 ' + sch.qdzName + ' 放站至 ' + zdzName + ' 开始待客'; 91 + remarks = ' 从 ' + sch.qdzName + ' 放站至 ' + zdzName + ' 开始带客';
92 } 92 }
93 //起终点都改变 93 //起终点都改变
94 else if (sch.qdzCode != $qdz.val() && sch.zdzCode != $zdz.val()) { 94 else if (sch.qdzCode != $qdz.val() && sch.zdzCode != $zdz.val()) {