线调更新,修复临加班次分公司名称字段未保存

lizhuojun
1 parent 7dfd8bc8
Showing 3 changed files with 5 additions and 10 deletions
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/permission/user/authorize.html
@@ -239,7 +239,6 @@ public class GpsServiceImpl implements GpsService {
         long serviceState;
         ArrivalEntity arrival;
         Set<String> lineSet=new HashSet();
-        String firstLineCode="";
         List<Map<String,Object>> lineSwitch=new ArrayList<>();
  
         List<Map> gpsNotValidList=new ArrayList();
@@ -568,7 +568,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
             //公司 和 分公司名称
             t.setGsName(BasicData.businessCodeNameMap.get(t.getGsBm()));
-            t.setFgsName(BasicData.businessFgsCodeNameMap.get(t.getGsBm() + "_" + t.getFgsBm()));
+            t.setFgsName(BasicData.businessFgsCodeNameMap.get(t.getFgsBm()+ "_" + t.getGsBm() ));
  
             //t.setScheduleDateStr(schDate);
             t.setScheduleDate(sdfyyyyMMdd.parse(t.getScheduleDateStr()));
@@ -312,8 +312,6 @@
                 <form>
                     <div class="uk-margin">
                         <div class="uk-inline" >
-                            <!--<span class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></span>-->
-                            <!--<input class="uk-input role_search_input" type="text" placeholder="搜索角色">-->
                         </div>
                     </div>
                 </form>
@@ -329,8 +327,6 @@
                 <form>
                     <div class="uk-margin">
                         <div class="uk-inline" >
-                            <!--<span class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></span>-->
-                            <!--<input class="uk-input user_search_input" type="text" placeholder="搜索用户">-->
                         </div>
                     </div>
                 </form>
@@ -349,7 +345,7 @@
     </div>
 </div>
  
-<script id="authorize-role-list-temp" type="text/html">
+<script id="authorize-role-list-temp1" type="text/html">
     {{each list as r i}}
     <li data-id="{{r.id}}" data-name="{{r.roleName}}" data-code="{{r.codeUp}}">{{r.roleName}}
         <span class="role-code">{{r.codeName}}</span>
@@ -358,7 +354,7 @@
     </li>
     {{/each}}
 </script>
-<script id="authorize-user-list-temp" type="text/html">
+<script id="authorize-user-list-temp1" type="text/html">
     {{each list as u i}}
     <li class="uk-animation-fade uk-animation-fast" data-name="{{u.name}}" data-code="{{u.userNameUp}}" data-id="{{u.id}}">{{u.name}}<span class="role-code">{{u.userName}}</span></li>
     {{/each}}
@@ -514,14 +510,14 @@
     }
  
     function render_role_list(list) {
-        var htmlStr = template('authorize-role-list-temp', {list: list});
+        var htmlStr = template('authorize-role-list-temp1', {list: list});
         $('ul.role-list').html(htmlStr);
         up_scroll();
     }
  
  
     function render_user_list(list) {
-        var htmlStr = template('authorize-user-list-temp', {list: list});
+        var htmlStr = template('authorize-user-list-temp1', {list: list});
         $('ul.user-list').html(htmlStr);
         up_scroll();
     }