查询昨天数据信息

BSTH
1 parent dc93313d
Showing 3 changed files with 53 additions and 0 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -74,4 +74,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
  
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2")
 	List<ScheduleRealInfo> scheduleByDateAndLine(String line,String date);
+	
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh) from ScheduleRealInfo s where (s.xlBm = ?1 or s.xlBm is not null) and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY xlBm,clZbh,jGh ORDER BY xlBm,clZbh,realExecDate,fcsjActual")
+	List<Map<String,Object>> yesterdayDataList(String line,String date);
 }
@@ -110,4 +110,6 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String,Object> scheduleDaily(String line,String date);
  
 	List<ScheduleRealInfo> realScheduleList(String line,String date);
+	
+	List<Map<String,Object>> yesterdayDataList(String line);
 }
@@ -1421,4 +1421,52 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
 		return rs;
 	}
+
+	public List<Map<String,Object>> yesterdayDataList(String line) {
+		//前一天日期
+		String date = sdfMonth.format(org.apache.commons.lang.time.DateUtils.addDays(new Date(), -1));
+		List<Map<String,Object>> yesterdayDataList = scheduleRealInfoRepository.yesterdayDataList(line, date);
+		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
+		for(ScheduleRealInfo scheduleRealInfo:list){
+			if(scheduleRealInfo != null){
+				for(int i=0;i<yesterdayDataList.size();i++){
+					if(scheduleRealInfo.getXlBm().equals(yesterdayDataList.get(i).get("xlBm")) && scheduleRealInfo.getClZbh().equals(yesterdayDataList.get(i).get("clZbh"))
+							&& scheduleRealInfo.getjGh().equals(yesterdayDataList.get(i).get("jGh"))){
+						//根据线路代码获取公司
+						Line li = lineRepository.findByLineCode(line);
+						yesterdayDataList.get(i).put("company", li.getCompany());
+						//计算总公里
+						Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+						//如果没有子任务，里程就是已执行（Status=2）;有子任务的，忽略主任务，子任务的烂班
+						if(childTaskPlans.isEmpty()){
+							if(scheduleRealInfo.getStatus() == 2){
+								yesterdayDataList.get(i).put("totalKilometers", scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc()+(double)(yesterdayDataList.get(i).get("totalKilometers")==null?0.0:yesterdayDataList.get(i).get("totalKilometers")));
+							}
+						}else{
+							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+							while(it.hasNext()){
+								ChildTaskPlan childTaskPlan = it.next();
+								if(!childTaskPlan.isDestroy()){
+									yesterdayDataList.get(i).put("totalKilometers", childTaskPlan.getMileage()==null?0.0:childTaskPlan.getMileage()+(double)(yesterdayDataList.get(i).get("totalKilometers")==null?0.0:yesterdayDataList.get(i).get("totalKilometers")));
+								}
+							}
+						}
+					}	
+				}
+			}
+		}
+		//增加顺序号
+		for(int i=0;i<yesterdayDataList.size();i++){
+			if(i == 0){
+				yesterdayDataList.get(i).put("seqNumber", 1);	
+			}else{
+				if(yesterdayDataList.get(i-1).get("clZbh").equals(yesterdayDataList.get(i).get("clZbh"))){
+					yesterdayDataList.get(i).put("seqNumber", 1+(int)yesterdayDataList.get(i-1).get("seqNumber"));
+				}else{
+					yesterdayDataList.get(i).put("seqNumber", 1);
+				}
+			}
+		}
+		return yesterdayDataList;
+	}
 }