Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

潘钊
2 parents 933f4e6a 75699f96
Showing 2 changed files with 53 additions and 35 deletions
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/resources/static/pages/base/stationroute/js/stationroute-list-function.js
@@ -3,6 +3,7 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.Line;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
+import org.apache.commons.lang3.StringUtils;
 import javax.persistence.*;
 import java.util.Date;
@@ -199,12 +200,29 @@ public class SchedulePlanInfo {
         }
         this.j = employeeConfigInfo.getJsy().getId();
-        this.jGh = employeeConfigInfo.getJsy().getJobCode();
+//        this.jGh = employeeConfigInfo.getJsy().getJobCode();
+        if (StringUtils.isNotEmpty(employeeConfigInfo.getJsy().getJobCode())) {
+            String[] jsy_temp = employeeConfigInfo.getJsy().getJobCode().split("-");
+            if (jsy_temp.length > 1) {
+                this.jGh = jsy_temp[1];
+            } else {
+                this.jGh = jsy_temp[0];
+            }
+        }
         this.jName = employeeConfigInfo.getJsy().getPersonnelName();
         // 关联的售票员
         if (employeeConfigInfo.getSpy() != null) {
             this.s = employeeConfigInfo.getSpy().getId();
-            this.sGh = employeeConfigInfo.getSpy().getJobCode();
+//            this.sGh = employeeConfigInfo.getSpy().getJobCode();
+            if (StringUtils.isNotEmpty(employeeConfigInfo.getSpy().getJobCode())) {
+                String[] spy_temp = employeeConfigInfo.getSpy().getJobCode().split("-");
+                if (spy_temp.length > 1) {
+                    this.sGh = spy_temp[1];
+                } else {
+                    this.sGh = spy_temp[0];
+                }
+            }
+
             this.sName = employeeConfigInfo.getSpy().getPersonnelName();
         }
@@ -640,13 +640,39 @@ var PublicFunctions = function () {
 					WorldsBMap.clearMarkAndOverlays();
-					var ceter_index = Math.round(resultdata.length / 2);
-			  		
-			  		var ceterPointsStr = resultdata[ceter_index].bJwpoints;
-			  		
-			  		var ceterPointsArray = ceterPointsStr.split(' ');
-	  				
-	  				var polyline_center = new BMap.Point(ceterPointsArray[0],ceterPointsArray[1]);
+					var polyline_center;
+					
+					// 如果站点路由数据不为空
+					if(resultdata.length>0) {
+			  			
+						var ceter_index = Math.round(resultdata.length / 2);
+				  		
+				  		var ceterPointsStr = resultdata[ceter_index].bJwpoints;
+				  		
+				  		var ceterPointsArray = ceterPointsStr.split(' ');
+		  				
+		  				polyline_center = new BMap.Point(ceterPointsArray[0],ceterPointsArray[1]);
+						
+						// 遍历站点路由数据
+			  			for(var s = 0 ; s<resultdata.length;s++) {
+			  				
+			  				// 中心点坐标字符串
+			  				var bJwpointsStr = resultdata[s].bJwpoints;
+			  				
+			  				var stationName = resultdata[s].stationName;
+			  				
+			  				// 起个中心点坐标字符串
+			  				var bJwpointsArray = bJwpointsStr.split(' ');
+			  				
+			  				// 设置中心点
+			  				var point_center = new BMap.Point(bJwpointsArray[0],bJwpointsArray[1]);
+			  				
+			  				/** 在地图上画点 @param：<point_center：中心坐标点> */
+			  				WorldsBMap.drawingUpStationPoint(point_center,stationName,s+1);
+			  				
+			  			}
+			  			
+			  		}
 					// 路段数据长度
 					var dataLen = data.length;
@@ -680,36 +706,10 @@ var PublicFunctions = function () {
 								polylineArray.push(new BMap.Point(lineArray[i].split(' ')[0],lineArray[i].split(' ')[1]));
 							}
-							
 							/** 在地图上画出线路走向 @param：<polylineArray：地图折线坐标点集合；resultdata：站点路由数据> */
 							WorldsBMap.drawingUpline(polylineArray,polyline_center);
 						}
-						
-						// 如果站点路由数据不为空
-						if(resultdata.length>0) {
-				  			
-							// 遍历站点路由数据
-				  			for(var s = 0 ; s<resultdata.length;s++) {
-				  				
-				  				// 中心点坐标字符串
-				  				var bJwpointsStr = resultdata[s].bJwpoints;
-				  				
-				  				var stationName = resultdata[s].stationName;
-				  				
-				  				// 起个中心点坐标字符串
-				  				var bJwpointsArray = bJwpointsStr.split(' ');
-				  				
-				  				// 设置中心点
-				  				var point_center = new BMap.Point(bJwpointsArray[0],bJwpointsArray[1]);
-				  				
-				  				/** 在地图上画点 @param：<point_center：中心坐标点> */
-				  				WorldsBMap.drawingUpStationPoint(point_center,stationName,s+1);
-				  				
-				  			}
-				  			
-				  		}
-						
 					}
 				});