潘钊 / bsth_control · Commits

Commit 89e0f69e7cb794daef5ac85ef0b5706b8f530874

Authored by 潘钊
1 parent bff0718a

update...

Inline Side-by-side
Showing 1 changed file with 2 additions and 8 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
  View file @89e0f69
1 package com.bsth.service.report.impl; 1 package com.bsth.service.report.impl;
2 import com.bsth.data.BasicData; 2 import com.bsth.data.BasicData;
3 -import com.bsth.entity.CarDevice;  
4 import com.bsth.entity.Line; 3 import com.bsth.entity.Line;
5 import com.bsth.entity.Personnel; 4 import com.bsth.entity.Personnel;
6 import com.bsth.entity.StationRoute; 5 import com.bsth.entity.StationRoute;
7 import com.bsth.entity.excep.ArrivalInfo; 6 import com.bsth.entity.excep.ArrivalInfo;
8 -import com.bsth.entity.mcy_forms.Daily;  
9 import com.bsth.entity.oil.Dlb; 7 import com.bsth.entity.oil.Dlb;
10 import com.bsth.entity.oil.Ylb; 8 import com.bsth.entity.oil.Ylb;
11 import com.bsth.entity.realcontrol.ChildTaskPlan; 9 import com.bsth.entity.realcontrol.ChildTaskPlan;
@@ -21,8 +19,6 @@ import com.bsth.util.ComparableChild; @@ -21,8 +19,6 @@ import com.bsth.util.ComparableChild;
21 import com.bsth.util.ComparableJob; 19 import com.bsth.util.ComparableJob;
22 import com.bsth.util.ReportUtils; 20 import com.bsth.util.ReportUtils;
23 import com.bsth.util.db.DBUtils_MS; 21 import com.bsth.util.db.DBUtils_MS;
24 -import com.google.protobuf.StringValue;  
25 -  
26 import org.apache.commons.lang.StringUtils; 22 import org.apache.commons.lang.StringUtils;
27 import org.slf4j.Logger; 23 import org.slf4j.Logger;
28 import org.slf4j.LoggerFactory; 24 import org.slf4j.LoggerFactory;
@@ -40,8 +36,6 @@ import java.text.ParseException; @@ -40,8 +36,6 @@ import java.text.ParseException;
40 import java.text.SimpleDateFormat; 36 import java.text.SimpleDateFormat;
41 import java.util.*; 37 import java.util.*;
42 38
43 -import javax.persistence.criteria.CriteriaBuilder.In;  
44 -  
45 @Service 39 @Service
46 public class ReportServiceImpl implements ReportService{ 40 public class ReportServiceImpl implements ReportService{
47 41
@@ -2183,8 +2177,8 @@ public class ReportServiceImpl implements ReportService{ @@ -2183,8 +2177,8 @@ public class ReportServiceImpl implements ReportService{
2183 Connection conn = null; 2177 Connection conn = null;
2184 PreparedStatement ps = null; 2178 PreparedStatement ps = null;
2185 ResultSet rs = null; 2179 ResultSet rs = null;
2186 - String year=date.substring(0,4);  
2187 - String sql = "select * from bsth_c_arrival_info_"+year+" where line_id=? AND weeks_year=? " 2180 + //String year=date.substring(0,4);
  2181 + String sql = "select * from bsth_c_arrival_info"+" where line_id=? AND weeks_year=? "
2188 + " AND ts >= ? AND ts <=? AND up_down=? order by device_id,ts"; 2182 + " AND ts >= ? AND ts <=? AND up_down=? order by device_id,ts";
2189 try{ 2183 try{
2190 conn = DBUtils_MS.getConnection(); 2184 conn = DBUtils_MS.getConnection();