BUG修复

娄高锋
1 parent 6a67fd6b
Showing 4 changed files with 40 additions and 11 deletions
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
src/main/java/com/bsth/service/forms/impl/BudgetServiceImpl.java
src/main/resources/static/pages/forms/budget/timeAnaly.html
src/main/resources/static/pages/forms/budget/timeSum.html
@@ -163,7 +163,7 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
  
     @Query(value="select s from SchedulePlanInfo s where s.xlBm = ?1 and s.ttInfo = ?2 "
     		+ "and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?3 order by s.lpName,bcs")
-	List<SchedulePlanInfo> findPlanByTTinfo(String xlBm, String ttInfo, String scheduleDate);
+	List<SchedulePlanInfo> findPlanByTTinfo(String xlBm, Long ttInfo, String scheduleDate);
  
     @Query(value="select s from SchedulePlanInfo s where s.xlBm = ?1 "
     		+ "and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.lpName,bcs")
@@ -39,6 +39,7 @@ import com.bsth.entity.forms.Budget;
 import com.bsth.entity.forms.Revenue;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.entity.schedule.TTInfoBxDetail;
+import com.bsth.entity.sys.Dictionary;
 import com.bsth.repository.calc.CalcStatisticsRepository;
 import com.bsth.repository.form.BudgetRepository;
 import com.bsth.repository.form.RevenueRepository;
@@ -50,6 +51,7 @@ import com.bsth.repository.schedule.TTInfoBxDetailRepository;
 import com.bsth.service.LineService;
 import com.bsth.service.forms.BudgetService;
 import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.sys.DictionaryService;
 import com.bsth.util.ReportUtils;
  
 @Service
@@ -83,6 +85,9 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 	private TTInfoBxDetailRepository ttInfoBxDetailRepository;
  
 	@Autowired
+	private DictionaryService dictionaryService;
+	
+	@Autowired
 	JdbcTemplate jdbcTemplate;
  
 	Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -2897,11 +2902,19 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
  
 		if(model.trim().length() > 0){
-			planList = schedulePlanRepository.findPlanByTTinfo(line, date, model);
+			planList = schedulePlanRepository.findPlanByTTinfo(line, Long.valueOf(model), date);
 		} else {
 			planList = schedulePlanRepository.findPlanByXlAndDate(line, date);
 		}
  
+		Map<String, Object> dMap=new HashMap<>();
+		dMap.put("dGroup_eq", "ScheduleBxType");
+		Iterator<Dictionary> it= dictionaryService.list(dMap).iterator();
+		while (it.hasNext()) {
+			Dictionary d=it.next();
+			dMap.put(d.getdCode(), d.getdName());
+		}
+		
 		for(SchedulePlanInfo plan : planList){
 			String gsBm = plan.getGsBm();
 			String fgsBm = plan.getFgsBm();
@@ -3095,18 +3108,28 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 			m.put("yybc", yybc);
 			m.put("yylc", yylc);
 			m.put("yy", yybc + "/" + yylc);
-			m.put("yygs", yssj_all/60 + "." + yssj_all%60);
-			m.put("zgs", zgs/60 + "." + zgs%60);
+			m.put("yygs", yssj_all/60 + "." + (yssj_all%60>9?"":"0") + yssj_all%60);
+			m.put("zgs", zgs/60 + "." + (zgs%60>9?"":"0") + zgs%60);
  
 			String bx = "";
 			List<TTInfoBxDetail> findBxDetail = ttInfoBxDetailRepository.findBxDetail(ttInfo, xl, lp);
 			if(findBxDetail.size() > 0){
 				for(TTInfoBxDetail b : findBxDetail){
-					if(b.getBxType1() != null && b.getBxType1().getDicDesc() != null){
-						bx += bx.length() > 0 ? "/" + b.getBxType1().getDicDesc() : b.getBxType1().getDicDesc();
+					if(b.getBxType1() != null && b.getBxType1().getDicDesc() != null
+							&& !("null".equals(b.getBxType1().getDicDesc()))){
+						String dic = b.getBxType1().getDicDesc();
+						if(dMap.containsKey(dic)){
+							dic = dMap.get(dic).toString();
+						}
+						bx += bx.length() > 0 ? "/" + dic : dic;
 					}
-					if(b.getBxType2() != null && b.getBxType2().getDicDesc() != null){
-						bx += bx.length() > 0 ? "/" + b.getBxType2().getDicDesc() : b.getBxType2().getDicDesc();
+					if(b.getBxType2() != null && b.getBxType2().getDicDesc() != null
+							&& !("null".equals(b.getBxType2().getDicDesc()))){
+						String dic = b.getBxType2().getDicDesc();
+						if(dMap.containsKey(dic)){
+							dic = dMap.get(dic).toString();
+						}
+						bx += bx.length() > 0 ? "/" + dic : dic;
 					}
 				}
 			}
@@ -96,8 +96,12 @@
 									<th>平均停站时间</th>
 									<th>空驶班次/空驶里程</th>
 									<th>运营班次/运营里程</th>
-									<th>营运工时<br/>(小时.分钟)</th>
-									<th>总工时<br/>(小时.分钟)</th>
+									<th title="营运工时：营运班次运送时间总和，不包括停站时间">
+										营运工时<br/>(小时.分钟)
+									</th>
+									<th title="总工时：报道例保时间15分钟+出场到回场总时长，期间有再出场的加10分钟复驶时间">
+										总工时<br/>(小时.分钟)
+									</th>
 								</tr>
 							</thead>
 							<tbody>
@@ -69,7 +69,9 @@
 							<td style="min-width: 90px">司最高配档数</td>
 							<td style="min-width: 90px">售最高配档数</td>
 							<td style="min-width: 90px">病缺勤比例%</td>
-							<td style="min-width: 90px">人均营运工时(小时)</td>
+							<td style="min-width: 90px" title="营运工时：营运班次运送时间总和，不包括停站时间">
+								人均营运工时(小时)
+							</td>
 						</tr>
  
 					</thead>