Merge branch 'PSM-12' into qingpu

徐烜
2 parents 1632ba86 2911e54c
Showing 1 changed file with 20 additions and 12 deletions
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
@@ -184,16 +184,7 @@ public class SchedulePlanInfo {
  
         // 关联的车辆信息
         this.cl = carConfigInfo.getCl().getId(); // 车辆id
-//        this.clZbh = carConfigInfo.getCl().getInsideCode(); // 自编号/内部编号
-        // 有时候自编号是内部编号的一部分，由-隔开，需要处理一下
-        if (StringUtils.isNotEmpty(carConfigInfo.getCl().getInsideCode())) {
-            String[] incode_temp = carConfigInfo.getCl().getInsideCode().split("-");
-            if (incode_temp.length > 1) {
-                this.clZbh = incode_temp[1];
-            } else {
-                this.clZbh = incode_temp[0];
-            }
-        }
+        this.clZbh = carConfigInfo.getCl().getInsideCode(); // 自编号/内部编号
  
         // TODO：报道时间，出场时间没有
         // 关联的驾驶员
@@ -209,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();
         }