Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

# Conflicts: # src/main/java/com/bsth/service/oil/impl/YlxxbServiceImpl.java # src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java

Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
# Conflicts: # src/main/java/com/bsth/service/oil/impl/YlxxbServiceImpl.java # src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
潘钊
2 parents f95dc66b 43e2f0b1
Showing 4 changed files with 59 additions and 45 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/oil/impl/YlxxbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
@@ -139,19 +139,19 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	//去掉了 xlBm is not null 
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.xlDir,s.realExecDate,s.dfsj, (s.lpName+1)")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.xlDir,s.realExecDate,s.fcsj, lpName")
 	List<ScheduleRealInfo> scheduleByDateAndLine(String line,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm =?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by (s.lpName+1), s.realExecDate,s.dfsj")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm =?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.lpName, s.realExecDate,s.fcsj")
 	List<ScheduleRealInfo> scheduleByDateAndLineQp(String line,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where gsBm like %?1% and fgsBm like %?2%   and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?3 and s.bcType not in ('in','out','ldks') order by s.xlDir,s.realExecDate,s.dfsj, (s.lpName+1)")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where gsBm like %?1% and fgsBm like %?2%   and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?3 and s.bcType not in ('in','out','ldks') order by s.xlDir,s.realExecDate,s.fcsj, s.lpName")
 	List<ScheduleRealInfo> scheduleByDateAndLineByGs(String gsdm,String fgsdm,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.xlDir,s.realExecDate,s.dfsj, (s.lpName+1)")
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.xlDir,s.realExecDate,s.fcsj, s.lpName")
 	List<ScheduleRealInfo> scheduleByDateAndLineQp2(String line,String date);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
 package com.bsth.service.oil.impl;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.transaction.Transactional;
+
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
+import com.bsth.entity.excep.Offline;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
+import com.bsth.entity.search.CustomerSpecs;
 import com.bsth.repository.oil.YlbRepository;
 import com.bsth.repository.oil.YlxxbRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.oil.YlxxbService;
 import com.bsth.util.PageHelper;
 import com.bsth.util.PageObject;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-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 javax.transaction.Transactional;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 @Service
 public class YlxxbServiceImpl extends BaseServiceImpl<Ylxxb,Integer> implements YlxxbService
@@ -185,4 +192,4 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 		return newMap;
 	}
-}
+}
 \ No newline at end of file
@@ -4077,7 +4077,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             	 Long zdsjActual_=Long.parseLong(zdsjActual_s[0])*60+Long.parseLong(zdsjActual_s[1]);
             	 if((zdsj_-zdsjActual_)>0){
             		 zdsjk =String.valueOf(zdsj_-zdsjActual_);
-            	 }else{
+            	 }
+            	 if(((zdsj_-zdsjActual_)<0)){
             		 zdsjm =String.valueOf(zdsjActual_-zdsj_);
             	 }
              }
@@ -4104,7 +4105,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             	 Long fcsjActural_=Long.parseLong(fcsjActural_s[0])*60+Long.parseLong(fcsjActural_s[1]);
             	 if((zdsj_-fcsjActural_)>0){
             		 fcsjk =String.valueOf(zdsj_-fcsjActural_);
-            	 }else{
+            	 }
+            	 if((zdsj_-fcsjActural_)<0){
             		 fcsjm =String.valueOf(fcsjActural_-zdsj_);
             	 }
              }
@@ -4,6 +4,7 @@ import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.excep.ArrivalInfo;
+import com.bsth.entity.mcy_forms.Daily;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
@@ -19,6 +20,8 @@ import com.bsth.util.ComparableChild;
 import com.bsth.util.ComparableJob;
 import com.bsth.util.ReportUtils;
 import com.bsth.util.db.DBUtils_MS;
+import com.google.protobuf.StringValue;
+
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,6 +39,8 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import javax.persistence.criteria.CriteriaBuilder.In;
+
 @Service
 public class ReportServiceImpl implements ReportService{
@@ -66,16 +71,16 @@ public class ReportServiceImpl implements ReportService{
 		List<ScheduleRealInfo> list=scheduleRealInfoRepository.findByDate2(line,date,clzbh);
 //				jdbcTemplate.query("select * from bsth_c_s_sp_info_real where line=?1  "
-//				+ "and  DATE_FORMAT(schedule_date,'%Y-%m-%d')=?2 and cl_zbl=?3",   
-//                new Object[]{line,date,clzbh},   
-//                new RowMapper(){  
-//                    @Override  
-//                    public Object mapRow(ResultSet rs, int rowNum) throws SQLException {  
-//                    	ScheduleRealInfo s  = new ScheduleRealInfo();  
+//				+ "and  DATE_FORMAT(schedule_date,'%Y-%m-%d')=?2 and cl_zbl=?3",
+//                new Object[]{line,date,clzbh},
+//                new RowMapper(){
+//                    @Override
+//                    public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
+//                    	ScheduleRealInfo s  = new ScheduleRealInfo();
 ////                    	s.
-//                        return s;  
-//                    }  
-//        });  
+//                        return s;
+//                    }
+//        });
 		return list;
 	}
@@ -283,11 +288,11 @@ public class ReportServiceImpl implements ReportService{
 				+ " group by equipment_code ) ";
 		Map<String, Object> map=new HashMap<String,Object>();
-		
+
 		/*List<Map<String, Object>> listPc= jdbcTemplate.query(sqlPc,
 				 new RowMapper<Map<String, Object>>(){
 			 @Override
-			 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+			 public Map<String, Object>  mapRow(ResultSet rs, int rowNum) throws SQLException {
 				 Map<String, Object> m=new HashMap<String,Object>();
 				 m.put("zbh", rs.getString("cl_zbh"));
 				 return m;
@@ -1453,7 +1458,7 @@ public class ReportServiceImpl implements ReportService{
 				keyMap.get("18:01——(末)").add(ttMap);
 			}
 		}
-		
+
 		for(String key : keyMap.keySet()){
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			List<Map<String, Object>> list2 = keyMap.get(key);
@@ -1472,7 +1477,7 @@ public class ReportServiceImpl implements ReportService{
 				}else{
 					String[] split = m.get("fcsj").toString().split(":");
 					int fcsj = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
-					
+
 					int xlDir = Integer.valueOf(m.get("dir").toString());
 					int bcsj = Integer.valueOf(m.get("bcsj").toString());
 					if(temp >= fcsj){
@@ -1493,17 +1498,17 @@ public class ReportServiceImpl implements ReportService{
 									}
 								}
 								lpname=m.get("lp").toString();
-								
+
 							}
 							sxtsbc++;
 						}
-						
+
 					} else {
-						
+
 						fcsj_x.add(fcsj);
 						xxsj += bcsj;
 						xxbc ++;
-						
+
 						if(!ists){
 							if(lpname.equals("")){
 								lpname=m.get("lp").toString();
@@ -1517,7 +1522,7 @@ public class ReportServiceImpl implements ReportService{
 							}
 							xxtsbc++;
 						}
-						
+
 					}
 					if(temp < fcsj){
 						cjs.add(fcsj - temp);
@@ -1539,7 +1544,7 @@ public class ReportServiceImpl implements ReportService{
 					cjs.add(fcsj_s.get(i)-fcsjs);
 					fcsjs=fcsj_s.get(i);
 				}
-				
+
 			}
 			Collections.sort(fcsj_x);
 			int fcsjx=0;
@@ -1550,7 +1555,7 @@ public class ReportServiceImpl implements ReportService{
 					cjs.add(fcsj_x.get(i)-fcsjx);
 					fcsjx =fcsj_x.get(i);
 				}
-				
+
 			}
 			Collections.sort(cjs);
 			for(int i : cjs){
@@ -1849,7 +1854,7 @@ public class ReportServiceImpl implements ReportService{
 //	                while (it.hasNext()) {
 //	                    ChildTaskPlan childTaskPlan = it.next();
 //	                    if (childTaskPlan.isDestroy()) {
-//	                    } 
+//	                    }
 //	                }
 //				}
 			}
@@ -2218,7 +2223,7 @@ public class ReportServiceImpl implements ReportService{
 					, (i+1));
 		}
 		inoutList.add(map1);
-		
+
 			/*for (int j = 0; j < listStation.size(); j++) {
 				 map2=new HashMap<String,Object>();
 				StationRoute s=listStation.get(j);
@@ -2230,7 +2235,7 @@ public class ReportServiceImpl implements ReportService{
 					}
 				}
 				Map<String, String> m=this.strInOut(arrivalList,lzsj);
-				
+
 				map2.put(s.getStationCode()+"in", m.get("in"));
 				map2.put(s.getStationCode()+"out", m.get("out"));
 				map2.put(s.getStationCode(), m.get("type"));
@@ -3233,4 +3238,4 @@ class ComparableAcuals implements Comparator&lt;ScheduleRealInfo&gt;{
 		return o1.getFcsjActualTime().compareTo(o2.getFcsjActualTime());
 	}
-}
+}
 \ No newline at end of file