Update

徐烜
1 parent 0510497d
Showing 7 changed files with 135 additions and 86 deletions
src/main/java/com/bsth/controller/schedule/core/SchedulePlanController.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/SchedulePlanService.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/info/list_info.html
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/list_report.html
 package com.bsth.controller.schedule.core;
  
-import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.SchedulePlan;
-import com.bsth.entity.sys.CompanyAuthority;
-import com.bsth.entity.sys.SysUser;
 import com.bsth.service.schedule.SchedulePlanService;
-import com.bsth.service.sys.SysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
  
-import javax.servlet.http.HttpSession;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
  
 /**
@@ -25,33 +22,6 @@ import java.util.Map;
 public class SchedulePlanController extends BController<SchedulePlan, Long> {
     @Autowired
     private SchedulePlanService schedulePlanService;
-    @Autowired
-    private SysUserService sysUserService;
-
-    @Override
-    public Map<String, Object> save(@RequestBody SchedulePlan schedulePlan, HttpSession httpSession) {
-        // 用户信息
-        String userName = String.valueOf(httpSession.getAttribute(Constants.SESSION_USERNAME));
-        SysUser sysUser = sysUserService.findByUserName(userName);
-
-        Date cdate = new Date();
-        schedulePlan.setCreateBy(sysUser);
-        schedulePlan.setCreateDate(cdate);
-        schedulePlan.setUpdateBy(sysUser);
-        schedulePlan.setUpdateDate(cdate);
-
-        // 如果多个公司，选第一个，以后改成页面控制
-        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) httpSession.getAttribute(Constants.COMPANY_AUTHORITYS);
-        if (cmyAuths == null || cmyAuths.size() == 0)
-            schedulePlanService.save(schedulePlan, new CompanyAuthority());
-        else
-            schedulePlanService.save(schedulePlan, cmyAuths.get(0));
-
-        Map<String, Object> rtn = new HashMap<>();
-        rtn.put("status", ResponseCode.SUCCESS);
-        rtn.put("data", new Object());
-        return rtn;
-    }
  
     /**
      * 获取明天的一歌排班计划。
@@ -27,27 +27,29 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
     Long deleteByXlAndScheduleDateGreaterThanEqualAndScheduleDateLessThanEqual(Integer xlid, Date startDate, Date endDate);
  
     @Query(value = " select " +
-            "xl as xlId, " +
-            "xl_name as xlName, " +
-            "schedule_date as scheduleDate, " +
-            "lp_name as lpName, " +
-            "cl as clId, " +
-            "cl_zbh as clZbh, " +
-            "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, " +
-            "group_concat(fcno) fcno " +
-            "from bsth_c_s_sp_info " +
-            "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)
+            "info.xl as xlId, " +
+            "info.xl_name as xlName, " +
+            "info.schedule_date as scheduleDate, " +
+            "info.lp_name as lpName, " +
+            "info.cl as clId, " +
+            "info.cl_zbh as clZbh, " +
+            "group_concat(info.fcsj) ccsj, " +
+            "group_concat(info.bc_type) bctype, " +
+            "group_concat(distinct info.j) jsyId, " +
+            "group_concat(distinct info.j_gh) jsyGh, " +
+            "group_concat(distinct info.j_name) jsyName, " +
+            "group_concat(distinct info.s) spyId, " +
+            "group_concat(distinct info.s_gh) spyGh, " +
+            "group_concat(distinct info.s_name) spyName, " +
+            "group_concat(info.fcno) fcno, " +
+            "max(info.update_date) as updateDate, " +
+            "max(user.name) as updateUserName, " +
+            "max(info.tt_info_name) as ttInfoName " +
+            "from bsth_c_s_sp_info info left join bsth_c_sys_user user on info.update_by = user.id " +
+            "where info.xl = ?1 and " +
+            "info.schedule_date = ?2 " +
+            "group by info.xl_name, info.schedule_date, info.lp, info.lp_name, info.cl, info.cl_zbh " +
+            "order by info.xl_name, info.schedule_date, info.lp ", nativeQuery = true)
     List<Object[]> findGroupInfo(Integer xlid, Date scheduleDate);
  
     @Modifying
@@ -115,8 +115,12 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
         /** 售票员1姓名 */
         private String spy2Name;
  
-        /** 创建时间 */
-        private Date createDate;
+        /** 修改时间 */
+        private Date updateDate;
+        /** 修改人名 */
+        private String updateByName;
+        /** 时刻表名字 */
+        private String ttInfoName;
  
         /** 出场班次1发车的顺序号 */
         private Integer fcno1;
@@ -141,7 +145,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
             // 出场时间，出场班次，如果有多个，需要分开
             Object ccsj = datas[6];
             Object bctype = datas[7];
-            Object fcno = datas[15];
+            Object fcno = datas[14];
  
             if (ccsj != null) {
                 String[] ccsj_array = ((String) ccsj).split(",");
@@ -238,12 +242,32 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
                     this.spy1Name = String.valueOf(spyName_array[0]);
                 }
             }
-            // 创建时间
-            this.createDate = new DateTime(datas[14]).toDate();
+            // 修改时间
+            this.updateDate = new DateTime(datas[15]).toDate();
+            // 修改人
+            this.updateByName = String.valueOf(datas[16]);
+            // 时刻表名字
+            this.ttInfoName = String.valueOf(datas[17]);
  
             // TODO：可能还有其他字段
         }
  
+        public Date getUpdateDate() {
+            return updateDate;
+        }
+
+        public void setUpdateDate(Date updateDate) {
+            this.updateDate = updateDate;
+        }
+
+        public String getUpdateByName() {
+            return updateByName;
+        }
+
+        public void setUpdateByName(String updateByName) {
+            this.updateByName = updateByName;
+        }
+
         public String getXlName() {
             return xlName;
         }
@@ -396,14 +420,6 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
             this.spy2Name = spy2Name;
         }
  
-        public Date getCreateDate() {
-            return createDate;
-        }
-
-        public void setCreateDate(Date createDate) {
-            this.createDate = createDate;
-        }
-
         public Integer getXlId() {
             return xlId;
         }
@@ -427,5 +443,13 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
         public void setFcno2(Integer fcno2) {
             this.fcno2 = fcno2;
         }
+
+        public String getTtInfoName() {
+            return ttInfoName;
+        }
+
+        public void setTtInfoName(String ttInfoName) {
+            this.ttInfoName = ttInfoName;
+        }
     }
 }
 package com.bsth.service.schedule;
  
 import com.bsth.entity.schedule.SchedulePlan;
-import com.bsth.entity.sys.CompanyAuthority;
 import com.bsth.service.schedule.rules.ttinfo2.Result;
  
 import java.util.Date;
@@ -11,7 +10,7 @@ import java.util.Date;
  */
 public interface SchedulePlanService extends BService<SchedulePlan, Long> {
  
-    SchedulePlan save(SchedulePlan schedulePlan, CompanyAuthority companyAuthority);
+    SchedulePlan save(SchedulePlan schedulePlan);
  
     /**
      * 获取有明日排班的计划。
 package com.bsth.service.schedule.impl;
  
+import com.bsth.entity.Business;
 import com.bsth.entity.Line;
 import com.bsth.entity.schedule.*;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
-import com.bsth.entity.sys.CompanyAuthority;
 import com.bsth.repository.schedule.SchedulePlanInfoRepository;
 import com.bsth.repository.schedule.SchedulePlanRepository;
+import com.bsth.service.BusinessService;
 import com.bsth.service.LineService;
 import com.bsth.service.schedule.SchedulePlanService;
 import com.bsth.service.schedule.TTInfoDetailService;
@@ -51,12 +52,14 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     private TTInfoService ttInfoService;
     @Autowired
     private TTInfoDetailService ttInfoDetailService;
+    @Autowired
+    private BusinessService businessService;
  
     /** 日志记录器 */
     private Logger logger = LoggerFactory.getLogger(SchedulePlanServiceImpl.class);
  
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
-    public SchedulePlan save(SchedulePlan schedulePlan, CompanyAuthority companyAuthority) {
+    public SchedulePlan save(SchedulePlan schedulePlan) {
         // 1-1、查找线路具体信息
         Line xl = strategy.getLine(schedulePlan.getXl().getId());
         // 1-2、查出指定线路的所有规则
@@ -149,11 +152,46 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
                         employeeConfigInfoList,
                         schedulePlan);
  
-                // 公司，分公司编码
-                schedulePlanInfo.setGsBm(companyAuthority.getCompanyCode());
-                schedulePlanInfo.setGsName(companyAuthority.getCompanyName());
-                schedulePlanInfo.setFgsBm(companyAuthority.getSubCompanyCode());
-                schedulePlanInfo.setFgsName(companyAuthority.getSubCompanyName());
+                // 获取公司，分公司信息
+                String gsbm = xl.getCompany();
+                String fgsbm = xl.getBrancheCompany();
+                Business gs = null;
+                Business fgs = null;
+
+                Map<String, Object> param = new HashMap<>();
+
+                if (StringUtils.isNotEmpty(gsbm)) {
+                    param.clear();
+                    param.put("businessCode_eq", gsbm);
+                    Iterator<Business> businessIterator = businessService.list(param).iterator();
+                    if (businessIterator.hasNext()) {
+                        gs = businessIterator.next();
+                    }
+                }
+                if (StringUtils.isNotEmpty(gsbm) && StringUtils.isNotEmpty(fgsbm)) {
+                    param.clear();;
+                    param.put("upCode_eq", gsbm);
+                    param.put("businessCode_eq", fgsbm);
+                    Iterator<Business> businessIterator = businessService.list(param).iterator();
+                    if (businessIterator.hasNext()) {
+                        fgs = businessIterator.next();
+                    }
+                }
+
+                if (gs != null) {
+                    schedulePlanInfo.setGsBm(gs.getBusinessCode());
+                    schedulePlanInfo.setGsName(gs.getBusinessName());
+                }
+                if (fgs != null) {
+                    schedulePlanInfo.setFgsBm(fgs.getBusinessCode());
+                    schedulePlanInfo.setFgsName(fgs.getBusinessName());
+                }
+
+                // 操作人，操作时间
+                schedulePlanInfo.setCreateBy(schedulePlan.getCreateBy());
+                schedulePlanInfo.setCreateDate(schedulePlan.getCreateDate());
+                schedulePlanInfo.setUpdateBy(schedulePlan.getUpdateBy());
+                schedulePlanInfo.setUpdateDate(schedulePlan.getUpdateDate());
  
                 schedulePlanInfos.add(schedulePlanInfo);
                 ttInfoMap.put(ttInfoDetail.getTtinfo().getId(), ttInfoDetail.getTtinfo().getName());
@@ -5,16 +5,18 @@
             <thead>
             <tr role="row" class="heading">
                 <th style="width: 50px;">序号</th>
-                <th style="width: 100px;">线路</th>
+                <th style="width: 80px;">线路</th>
                 <th style="width: 150px;">日期</th>
-                <th style="width: 60px;">路牌</th>
-                <th style="width: 150px;">车辆</th>
-                <th style="width: 150px;">驾驶员（工号）</th>
-                <th style="width: 150px;">售票员（工号）</th>
+                <th style="width: 50px;">路牌</th>
+                <th style="width: 120px;">车辆</th>
+                <th style="width: 120px;">驾驶员（工号）</th>
+                <th style="width: 120px;">售票员（工号）</th>
                 <th style="width: 80px;">班次类型</th>
                 <th style="width: 80px;">上下行</th>
                 <th style="width: 80px;">发车时间</th>
                 <th style="width: 100%">时刻表</th>
+                <th style="width: 90px;">修改人</th>
+                <th style="width: 90px;">修改时间</th>
  
                 <!-- TODO：还有其他的 -->
  
@@ -44,6 +46,8 @@
                 <td></td>
                 <td></td>
                 <td></td>
+                <td></td>
+                <td></td>
  
             </tr>
             </thead>
@@ -82,7 +86,13 @@
                     <span ng-bind="info.fcsj"></span>
                 </td>
                 <td>
-                    <abbr title="{{info.ttInfoName}}"><span>{{info.ttInfoName}}</span></abbr>
+                    <span ng-bind="info.ttInfoName"></span>
+                </td>
+                <td>
+                    <span ng-bind="info.updateBy.name"></span>
+                </td>
+                <td>
+                    <span ng-bind="info.updateDate | date: 'yyyy-MM-dd'"></span>
                 </td>
  
             </tr>
@@ -19,8 +19,9 @@
                 <th style="width: 100px;">驾2</th>
                 <th style="width: 100px;">售工2</th>
                 <th style="width: 100px;">售2</th>
-                <th style="width: 150px;">排班时间</th>
                 <th>时刻表</th>
+                <th style="width: 150px;">修改时间</th>
+                <th style="width: 100px;">修改人</th>
             </tr>
             <tr role="row" class="filter">
                 <td></td>
@@ -62,6 +63,7 @@
                 <td></td>
                 <td></td>
                 <td></td>
+                <td></td>
             </tr>
             </thead>
             <tbody>
@@ -134,11 +136,15 @@
                     </a>
                 </td>
                 <td>
-                    <span ng-bind="info.createDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
+                    <span ng-bind="info.ttInfoName"></span>
+                </td>
+                <td>
+                    <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
                 </td>
                 <td>
-                    <span ng-bind="info.ttinfoName"></span>
+                    <span ng-bind="info.updateByName"></span>
                 </td>
+
             </tr>
             </tbody>
         </table>