update...

潘钊
1 parent 4308447b
Showing 1 changed file with 7 additions and 1 deletions
src/main/java/com/bsth/server_ws/park_station/CompanyServiceSoap.java
 package com.bsth.server_ws.park_station;
 import com.bsth.entity.OilInfo;
+import com.bsth.entity.SchedulePlanInfo;
 import com.bsth.entity.ScheduleRealInfo;
 import com.bsth.server_ws.util.Constants;
 import com.bsth.server_ws.util.ControlHttpUtils;
@@ -122,12 +123,17 @@ public class CompanyServiceSoap implements CompanyService {
             jdbcTemplate.query("select * from bsth_c_s_sp_info_real where gs_bm='"+company+"' and j_gh='"+workId+"' and schedule_date_str like '"+month+"-%'",
                     BeanPropertyRowMapper.newInstance(ScheduleRealInfo.class));
+            //计划排班
+            List<SchedulePlanInfo> planList =
+                    jdbcTemplate.query("select * from bsth_c_s_sp_info where gs_bm='"+company+"' and j_gh='"+workId+"' and schedule_date>sysdate() and schedule_date like '"+month+"-%' order by bcs",
+                            BeanPropertyRowMapper.newInstance(SchedulePlanInfo.class));
+
             //油耗
             List<OilInfo> oilList =
                     jdbcTemplate.query("select * from bsth_c_ylb where jsy='"+workId+"' and rq like '"+month+"-%'",
                             BeanPropertyRowMapper.newInstance(OilInfo.class));
-            result.value = WSDataConver.to_getLSLC_PB(month, schList, oilList);
+            result.value = WSDataConver.to_getLSLC_PB(month, schList, oilList, planList);
         }catch(Exception e){
             fError.value = e.getMessage();
             logger.error("", e);