Update

徐烜
1 parent 7f04b456
Showing 12 changed files with 142 additions and 25 deletions
src/main/java/com/bsth/controller/schedule/core/SchedulePlanInfoController.java
src/main/java/com/bsth/entity/schedule/temp/SchedulePlanRuleResult.java
src/main/java/com/bsth/service/schedule/PeopleCarPlanServiceImpl.java
src/main/java/com/bsth/service/schedule/SchedulePlanInfoService.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/resources/rules/validplan.drl
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/list.html
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/module.js
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/service.js
src/test/resources/testdata/problem.properties
@@ -39,6 +39,23 @@ public class SchedulePlanInfoController extends BController&lt;SchedulePlanInfo, Lo
         return resultMap;
     }
+    @RequestMapping(value = "/lastestsd/{xlid}", method = RequestMethod.GET)
+    public Map<String, Object> findLastestPlanDate(
+            @PathVariable(value = "xlid") Integer xlid) {
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            resultMap.put("status", ResponseCode.SUCCESS);
+            resultMap.put("data", schedulePlanInfoService.findLastestPlanDate(xlid));
+
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            resultMap.put("status", ResponseCode.ERROR);
+            resultMap.put("msg", exp.getLocalizedMessage());
+        }
+
+        return resultMap;
+    }
+
 // ------------------------ 老版本 ----------------------//
     @RequestMapping(value = "/groupinfos/{xlid}/{date}", method = RequestMethod.GET)
@@ -81,8 +81,8 @@ public class SchedulePlanRuleResult {
                 "(xl_id,xl_name,rule_id,cc_id,cc_zbh," +
                 "gids,gnames,gidindex,ecids,ecdbbms,ecindex," +
                 "ttinfo_id,ttinfo_name,schedule_date," +
-                "sysuser_id,sysuser_name,create_date) " +
-                "values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+                "sysuser_id,sysuser_name,create_date, qyrq) " +
+                "values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
         return sql;
     }
@@ -105,6 +105,8 @@ public class SchedulePlanRuleResult {
         ps.setString(15, this.getSysuserId());
         ps.setString(16, this.getSysuserName());
         ps.setTimestamp(17, new java.sql.Timestamp(this.getCreateDate().getTime()));
+        ps.setDate(18, new java.sql.Date(this.getQyrq().getTime()));
+
     }
 package com.bsth.service.schedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import com.bsth.util.ReportUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
 import java.math.BigDecimal;
-import java.net.URLEncoder;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Service;
-
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
-import com.bsth.util.ReportUtils;
+import java.util.*;
 @Service
 public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
@@ -760,7 +750,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		return modelMap;
 	}
-	@Override
+//	@Override
 	public Map<String, Object> scheduleAnaly_sum(Map<String, Object> map) {
 		DecimalFormat df = new DecimalFormat("00");
 		NumberFormat nf = NumberFormat.getNumberInstance();
@@ -1294,7 +1284,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		return resList;
 	}
-	@Override
+//	@Override
 	public List<Map<String, Object>> firstAndLastBus_sum(Map<String, Object> map) {
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		Map<String, List<ScheduleRealInfo>> keyMap = new HashMap<String, List<ScheduleRealInfo>>();
@@ -17,6 +17,13 @@ import java.util.List;
 public interface SchedulePlanInfoService extends BService<SchedulePlanInfo, Long> {
     /**
+     * 查找最近的排班的日期。
+     * @param xlId 线路Id
+     * @return
+     */
+    List<Date> findLastestPlanDate(Integer xlId);
+
+    /**
      * 查找排班计划汇总数据。
      * @param xlId 线路Id
      * @param scheduleDate 排班时间
@@ -5,6 +5,7 @@ import com.bsth.repository.schedule.SchedulePlanInfoRepository;
 import com.bsth.service.schedule.SchedulePlanInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowCallbackHandler;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,6 +26,26 @@ public class SchedulePlanInfoServiceImpl extends BServiceImpl&lt;SchedulePlanInfo, 
     private JdbcTemplate jdbcTemplate;
     @Override
+    public List<Date> findLastestPlanDate(Integer xlId) {
+        String sql = "select max(schedule_date) as sd from bsth_c_s_sp_info " +
+                "where xl = ?";
+
+        final List<Date> ld = new ArrayList<>();
+
+        jdbcTemplate.query(sql, new Object[]{xlId}, new RowCallbackHandler() {
+            @Override
+            public void processRow(ResultSet rs) throws SQLException {
+                if (rs != null && rs.getDate("sd") != null) {
+                    ld.add(new Date(rs.getDate("sd").getTime()));
+                }
+            }
+        });
+
+        return ld;
+
+    }
+
+    @Override
     public List<SchedulePlanGroupInfo> findSchedulePlanGroupInfo(Integer xlId, Date scheduleDate) {
         String sql = SchedulePlanGroupInfo.generateSelectSql();
         List<SchedulePlanGroupInfo> schedulePlanGroupInfos = jdbcTemplate.query(sql, new Object[]{xlId, scheduleDate}, new RowMapper<SchedulePlanGroupInfo>() {
@@ -28,6 +28,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 import java.util.*;
@@ -318,6 +321,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     }
+    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
     public SchedulePlan save(SchedulePlan schedulePlan) {
         // pre、如果排班的数据之前已经有了，删除之前的数据
         Date startpre = new Date();
+// TODO：
 \ No newline at end of file
@@ -548,6 +548,24 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanInfoManageService_g&#39;, [&#39;$reso
                     }
                 }
             }
+        ),
+        latestsd: $resource(
+            '/spic/lastestsd/:xlid',
+            {},
+            {
+                list: {
+                    method: 'GET',
+                    isArray: true,
+                    transformResponse: function(rs) {
+                        var dst = angular.fromJson(rs);
+                        if (dst.status == 'SUCCESS') {
+                            return dst.data;
+                        } else {
+                            return dst; // 业务错误留给控制器处理
+                        }
+                    }
+                }
+            }
         )
 <!-- ui-route employeeInfoManage.list -->
 <div ng-controller="SchedulePlanReportExtManageListCtrl as ctrl">
+
+    <div class="portlet">
+        <div class="portlet-title">
+            <div class="caption caption-subject font-red-sunglo bold uppercase">
+                最近排班至
+                <span ng-bind="ctrl.lsd | date: 'yyyy年MM月dd日'">
+        </span>
+            </div>
+        </div>
+    </div>
+
     <div class="fixDiv">
         <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column"
                style="width: 1800px; min-height: 500px;">
@@ -46,6 +46,15 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 },
                 /**
+                 * 查询线路最近排班日期。
+                 * @param xlid
+                 */
+                getLastestsd: function() {
+                    var params = currentSearchCondition; // 查询条件
+                    return service.latestsd.list(params).$promise;
+                },
+
+                /**
                  * 批量保存排班明细。
                  * @param rs
                  */
@@ -168,6 +177,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 return service.resetSearchCondition();
             };
+            self.lsd;
+
             // 监控条件变化，触发查询
             $scope.$watch(
                 function() {
@@ -175,6 +186,22 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 },
                 function(newValue, oldValue) {
                     if (newValue) {
+                        if (newValue.xlid) {
+                            service.getLastestsd().then(
+                                function(result) {
+                                    if (result.length > 0) {
+                                        self.lsd = new Date();
+                                        self.lsd.setTime(result[0]);
+                                    } else {
+                                        self.lsd = "暂无排班";
+                                    }
+
+                                },
+                                function() {
+                                }
+                            );
+                        }
+
                         if (newValue.xlid && newValue.sdate) {
                             self.pageChanaged();
                         }
@@ -126,6 +126,24 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanInfoManageService_g&#39;, [&#39;$reso
                     }
                 }
             }
+        ),
+        latestsd: $resource(
+            '/spic/lastestsd/:xlid',
+            {},
+            {
+                list: {
+                    method: 'GET',
+                    isArray: true,
+                    transformResponse: function(rs) {
+                        var dst = angular.fromJson(rs);
+                        if (dst.status == 'SUCCESS') {
+                            return dst.data;
+                        } else {
+                            return dst; // 业务错误留给控制器处理
+                        }
+                    }
+                }
+            }
         )
@@ -14,7 +14,7 @@
 14=路牌编号自动生成
 15=时刻表导入的时候表头后面不需要加数字
 ##16=时间框中文
-17=人员工号前公司编码自动加
+##17=人员工号前公司编码自动加
 18=排班计划明细可以修改（修改到每个班次）
 19=线路运营概览
 20=排班规则备注
@@ -31,3 +31,4 @@
 ##30=时刻表公里数 三位数
 31=规则修改，路牌范围，人员范围可以拖动
+32=人员配置不存在的情况下，导入规则ktr，找不到的人员不添加，人员范围不存在的，规则不导入