Commit c38714aaa9250990c2e588548cc0659b46c01784
1 parent
0406ed29
update
Showing
1 changed file
with
5 additions
and
3 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
| @@ -977,9 +977,11 @@ public class FormsServiceImpl implements FormsService { | @@ -977,9 +977,11 @@ public class FormsServiceImpl implements FormsService { | ||
| 977 | 977 | ||
| 978 | List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, startDate, endDate, company, subCompany); | 978 | List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, startDate, endDate, company, subCompany); |
| 979 | List<Line> lineList = lineRepository.findLineBygsBm(company, subCompany, line.length()==0?"%"+line+"%":line); | 979 | List<Line> lineList = lineRepository.findLineBygsBm(company, subCompany, line.length()==0?"%"+line+"%":line); |
| 980 | - | ||
| 981 | - String sql = "select * from bsth_c_s_sp_info where gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"' " | ||
| 982 | - + "and DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"+startDate+"' and '"+endDate+"' "; | 980 | + |
| 981 | + String sql = "select gs_name, fgs_name, cl_zbh, fcsj, bc_type, xl_bm, xl_name, schedule_date" | ||
| 982 | + + " from bsth_c_s_sp_info where gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"' " | ||
| 983 | + + "and DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' " | ||
| 984 | + + "and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"' "; | ||
| 983 | if(line.trim().length() != 0){ | 985 | if(line.trim().length() != 0){ |
| 984 | sql += "and xl_bm = '"+line+"' "; | 986 | sql += "and xl_bm = '"+line+"' "; |
| 985 | } | 987 | } |