Update

徐烜
1 parent 71e82ae3
Showing 6 changed files with 93 additions and 23 deletions
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
src/main/java/com/bsth/service/schedule/SchedulePlanInfoService.java
src/main/java/com/bsth/service/schedule/SchedulePlanInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/info/list_info.html
@@ -157,6 +157,7 @@ public class SchedulePlanInfo {
             Line xl,
             ScheduleResult_output scheduleResult_output,
             TTInfoDetail ttInfoDetail,
+            Boolean isFb,
             CarConfigInfo carConfigInfo,
             List<EmployeeConfigInfo> employeeConfigInfoList,
             SchedulePlan schedulePlan) {
@@ -191,7 +192,7 @@ public class SchedulePlanInfo {
         // TODO：报道时间，出场时间没有
         // 关联的驾驶员
         EmployeeConfigInfo employeeConfigInfo = null;
-        if (ttInfoDetail.getIsFB()) {
+        if (isFb) {
             if (employeeConfigInfoList.size() > 1) {
                 employeeConfigInfo = employeeConfigInfoList.get(1);
             } else {
@@ -33,17 +33,18 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
             "lp_name as lpName, " +
             "cl as clId, " +
             "cl_zbh as clZbh, " +
-            "group_concat(distinct fcsj) ccsj, " +
+            "group_concat(fcsj) ccsj, " +
+            "group_concat(bc_type) bctype, " +
             "group_concat(distinct j) jsyId, " +
             "group_concat(distinct j_gh) jsyGh, " +
             "group_concat(distinct j_name) jsyName, " +
             "group_concat(distinct s) spyId, " +
             "group_concat(distinct s_gh) spyGh, " +
             "group_concat(distinct s_name) spyName, " +
-            "max(create_date) as createDate " +
+            "max(create_date) as createDate, " +
+            "group_concat(fcno) fcno " +
             "from bsth_c_s_sp_info " +
-            "where bc_type = 'out' and " +
-            "xl = ?1 and " +
+            "where xl = ?1 and " +
             "schedule_date = ?2 " +
             "group by xl_name, schedule_date, lp, lp_name, cl, cl_zbh " +
             "order by xl_name, schedule_date, lp ", nativeQuery = true)
@@ -71,14 +72,16 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
             "scpinfo.scheduleDate = :p3 and " +
             "scpinfo.lpName = :p4 and " +
             "scpinfo.fcsj = :p5 and " +
-            "scpinfo.bcType = :p6 ")
+            "scpinfo.bcType = :p6 and " +
+            "scpinfo.fcno = :p7 " )
     int updateGroupInfo_type_2_4(
             @Param("p1") String fcsj,
             @Param("p2") Integer xlid,
             @Param("p3") Date scheduleDate,
             @Param("p4") String lpName,
             @Param("p5") String fcsj_src,
-            @Param("p6") String bcType);
+            @Param("p6") String bcType,
+            @Param("p7") Integer fcno);
     @Modifying
     @Query(value = "update " +
@@ -4,6 +4,7 @@ import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.BaseService;
 import org.joda.time.DateTime;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -117,6 +118,11 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
         /** 创建时间 */
         private Date createDate;
+        /** 出场班次1发车的顺序号 */
+        private Integer fcno1;
+        /** 出场班次2发车的顺序号 */
+        private Integer fcno2;
+
         public GroupInfo() {}
         public GroupInfo(Object[] datas) {
@@ -132,19 +138,40 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
             this.clId = Integer.valueOf(String.valueOf(datas[4]));
             // 车辆自编号
             this.clZbh = String.valueOf(datas[5]);
-            // 出场时间，如果有多个，需要分开
+            // 出场时间，出场班次，如果有多个，需要分开
             Object ccsj = datas[6];
+            Object bctype = datas[7];
+            Object fcno = datas[15];
+
             if (ccsj != null) {
                 String[] ccsj_array = ((String) ccsj).split(",");
-                if (ccsj_array.length > 1) {
-                    this.ccsj1 = String.valueOf(ccsj_array[0]);
-                    this.ccsj2 = String.valueOf(ccsj_array[1]);
-                } else {
-                    this.ccsj1 = String.valueOf(ccsj_array[0]);
+                String[] bctype_array = ((String) bctype).split(",");
+                String[] fcno_array = ((String) fcno).split(",");
+                List<Integer> bctype_index = new ArrayList<>();
+
+                for (int i = 0; i < bctype_array.length; i++) {
+                    if (bctype_index.size() == 2) { // 只记录2个出场
+                        break;
+                    }
+                    if (bctype_array[i].equals("out")) {
+                        bctype_index.add(i);
+                    }
+                }
+
+                if (bctype_index.size() == 1) {
+                    this.ccsj1 = String.valueOf(ccsj_array[bctype_index.get(0)]);
+                    this.fcno1 = Integer.valueOf(fcno_array[bctype_index.get(0)]);
+                } else if (bctype_index.size() == 2) {
+                    this.ccsj1 = String.valueOf(ccsj_array[bctype_index.get(0)]);
+                    this.ccsj2 = String.valueOf(ccsj_array[bctype_index.get(1)]);
+
+                    this.fcno1 = Integer.valueOf(fcno_array[bctype_index.get(0)]);
+                    this.fcno2 = Integer.valueOf(fcno_array[bctype_index.get(1)]);
                 }
+
             }
             // 驾驶员id，如果有多个，需要分开
-            Object jsyId = datas[7];
+            Object jsyId = datas[8];
             if (jsyId != null) {
                 String[] jsyId_array = ((String) jsyId).split(",");
                 if (jsyId_array.length > 1) {
@@ -155,7 +182,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
                 }
             }
             // 驾驶员工号，如果有多个，需要分开
-            Object jsyGh = datas[8];
+            Object jsyGh = datas[9];
             if (jsyGh != null) {
                 String[] jsyGh_array = ((String) jsyGh).split(",");
                 if (jsyGh_array.length > 1) {
@@ -166,7 +193,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
                 }
             }
             // 驾驶员名字，如果有多个，需要分开
-            Object jsyName = datas[9];
+            Object jsyName = datas[10];
             if (jsyName != null) {
                 String[] jsyName_array = ((String) jsyName).split(",");
                 if (jsyName_array.length > 1) {
@@ -178,7 +205,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
             }
             // 售票员id，如果有多个，需要分开
-            Object spyId = datas[10];
+            Object spyId = datas[11];
             if (spyId != null) {
                 String[] spyId_array = ((String) spyId).split(",");
                 if (spyId_array.length > 1) {
@@ -190,7 +217,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
             }
             // 售票员工号，如果有多个，需要分开
-            Object spyGh = datas[11];
+            Object spyGh = datas[12];
             if (spyGh != null) {
                 String[] spyGh_array = ((String) spyGh).split(",");
                 if (spyGh_array.length > 1) {
@@ -201,7 +228,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
                 }
             }
             // 售票员名字，如果有多个，需要分开
-            Object spyName = datas[12];
+            Object spyName = datas[13];
             if (spyName != null) {
                 String[] spyName_array = ((String) spyName).split(",");
                 if (spyName_array.length > 1) {
@@ -212,7 +239,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
                 }
             }
             // 创建时间
-            this.createDate = new DateTime(datas[13]).toDate();
+            this.createDate = new DateTime(datas[14]).toDate();
             // TODO：可能还有其他字段
         }
@@ -384,5 +411,21 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
         public void setXlId(Integer xlId) {
             this.xlId = xlId;
         }
+
+        public Integer getFcno1() {
+            return fcno1;
+        }
+
+        public void setFcno1(Integer fcno1) {
+            this.fcno1 = fcno1;
+        }
+
+        public Integer getFcno2() {
+            return fcno2;
+        }
+
+        public void setFcno2(Integer fcno2) {
+            this.fcno2 = fcno2;
+        }
     }
 }
@@ -55,7 +55,8 @@ public class SchedulePlanInfoServiceImpl extends BaseServiceImpl&lt;SchedulePlanInf
                         groupInfoUpdate.getUpdate().getScheduleDate(),
                         groupInfoUpdate.getSrc().getLpName(),
                         groupInfoUpdate.getSrc().getCcsj1(),
-                        "out"
+                        "out",
+                        groupInfoUpdate.getSrc().getFcno1()
                 );
             }
@@ -94,7 +95,8 @@ public class SchedulePlanInfoServiceImpl extends BaseServiceImpl&lt;SchedulePlanInf
                         groupInfoUpdate.getUpdate().getScheduleDate(),
                         groupInfoUpdate.getSrc().getLpName(),
                         groupInfoUpdate.getSrc().getCcsj2(),
-                        "out"
+                        "out",
+                        groupInfoUpdate.getSrc().getFcno2()
                 );
             }
@@ -119,13 +119,28 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
                 employeeConfigInfoList.add(employeeConfigMaps.get(Long.valueOf(eid)));
             }
             // 排班明细（这个要迭代的）
-            Collection<TTInfoDetail> ttInfoDetails = gbdTTinfoMaps.get(scheduleResult_output.getSd().toDate()).get(
+            Collection<TTInfoDetail> ttInfoDetails_ = gbdTTinfoMaps.get(scheduleResult_output.getSd().toDate()).get(
                     Long.parseLong(scheduleResult_output.getGuideboardId()));
+            List<TTInfoDetail> ttInfoDetails = new ArrayList<>(ttInfoDetails_);
+
+            // 排序ttInfoDetails
+            Collections.sort(ttInfoDetails, new Comparator<TTInfoDetail>() {
+                @Override
+                public int compare(TTInfoDetail o1, TTInfoDetail o2) {
+                    return o1.getFcno().compareTo(o2.getFcno());
+                }
+            });
+
+            Boolean isFb = false; // 是否分班
             for (TTInfoDetail ttInfoDetail : ttInfoDetails) {
+                if (ttInfoDetail.getIsFB())
+                    isFb = ttInfoDetail.getIsFB();
+
                 SchedulePlanInfo schedulePlanInfo = new SchedulePlanInfo(
                         xl,
                         scheduleResult_output,
                         ttInfoDetail,
+                        isFb,
                         configInfo,
                         employeeConfigInfoList,
                         schedulePlan);
@@ -138,6 +153,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
                 schedulePlanInfos.add(schedulePlanInfo);
                 ttInfoMap.put(ttInfoDetail.getTtinfo().getId(), ttInfoDetail.getTtinfo().getName());
+
             }
         }
@@ -12,6 +12,7 @@
                 <th style="width: 150px;">驾驶员（工号）</th>
                 <th style="width: 150px;">售票员（工号）</th>
                 <th style="width: 80px;">班次类型</th>
+                <th style="width: 80px;">上下行</th>
                 <th style="width: 80px;">发车时间</th>
                 <th style="width: 100%">时刻表</th>
@@ -42,6 +43,7 @@
                 <td></td>
                 <td></td>
                 <td></td>
+                <td></td>
             </tr>
             </thead>
@@ -74,6 +76,9 @@
                     <span ng-bind="info.bcType | dict:'ScheduleType':'未知' "></span>
                 </td>
                 <td>
+                    <span ng-bind="info.xlDir | dict:'LineTrend2':'未知' "></span>
+                </td>
+                <td>
                     <span ng-bind="info.fcsj"></span>
                 </td>
                 <td>