加油信息更改

廖磊
1 parent 31ad6156
Showing 8 changed files with 105 additions and 48 deletions
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/repository/oil/YlxxbRepository.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlxxbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/static/pages/oil/checkJyryList.html
@@ -37,6 +37,10 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	List<Ylb> obtainYl(String rq);
+	@Transactional
+	@Modifying
+	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and nbbm =?2 and fgsdm=?3 ",nativeQuery=true)
+	List<Ylb> queryListYlb(String rq,String nbbm);
 	/**
 	 * 查询当天总的加注量和总里程
 	 * @param rq
@@ -24,6 +24,11 @@ public interface YlxxbRepository extends BaseRepository&lt;Ylxxb, Integer&gt;{
 	@Transactional
 	@Modifying
+	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and ssgs=?2",nativeQuery=true)
+	List<Ylxxb> checkYlxx(String rq,String gs);
+	
+	@Transactional
+	@Modifying
 	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nbbm =?2 and jylx=1",nativeQuery=true)
 	List<Ylxxb> obtainYlxx2(String rq,String nbbm);
@@ -25,6 +25,7 @@ import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 import com.bsth.common.ResponseCode;
+import com.bsth.data.BasicData;
 import com.bsth.entity.oil.Cyl;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
@@ -435,6 +436,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	@Override
 	public Map<String, Object> checkYl(Map<String, Object> map) {
 		Map<String, Object> newMap=new HashMap<String,Object>();
+		String xlbm=map.get("xlbm_eq").toString();
 		// TODO Auto-generated method stub
 		try{
 			//获取车辆存油信息
@@ -460,7 +462,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					t.setJsy(y1.getJsy());
 					t.setJzl(y1.getJzl());
 					t.setSsgsdm(y1.getGsdm());
-					t.setXlbm("1024");
+					t.setXlbm(xlbm);
 					repository.save(t);
 					//设置存油量
 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;
@@ -10,9 +12,12 @@ import java.util.Map;
 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.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;
@@ -31,27 +36,23 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 	YlxxbRepository repository;
 	@Autowired
 	YlbRepository ylbRepository;
-	
+	@Autowired
+	JdbcTemplate jdbcTemplate;
 	@Override
 	public PageObject<Ylxxb> Pagequery(Map<String, Object> map) {
 		String rq=map.get("yyrq").toString();
-		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-		try {
-			map.put("yyrq_eq", sdf.parseObject(rq));
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+		String gsdm=map.get("gsdm_like").toString();
+		String fgsdm=map.get("fgsdm_like").toString();
+		
+		String sql=" select x.*,y.jsy as ldgh,y.fgsdm as fgsdm from bsth_c_ylxxb x "
+				+ " left join  bsth_c_ylb y  on  x.nbbm = y.nbbm and x.jsy !=y.jsy "
+				+ " where  DATE_FORMAT(y.rq,'%Y-%m-%d')='"+rq+"' and y.ssgsdm='"+gsdm+"' "
+				+ " and y.fgsdm='"+fgsdm+"' and DATE_FORMAT(x.yyrq,'%Y-%m-%d')='"+rq+"' "
+				+ " and x.gsdm='"+gsdm+"'";
+		
 		//根具条件查询指定日期Ylxxb的数据
-		List<Ylxxb> iterator=repository.findAll(new CustomerSpecs<Ylxxb>(map));
-		map.remove("yyrq_eq");
-		try {
-			map.put("rq_eq", sdf.parse(rq));
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+//		List<Ylxxb> iterator=repository.checkYlxx(rq,gsdm);
 		/*if(map.get("gsdm_in")!=null){
 			map.put("ssgsdm_in", map.get("gsdm_in"));
 			map.remove("gsdm_in");
@@ -62,30 +63,54 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 		}*/
 		//根具条件查询指定日期Ylb的数据
-		List<Ylb> ylbIterator=(List<Ylb>) ylbRepository.findAll(new CustomerSpecs<Ylb>(map));
-		List<Ylxxb> list=new ArrayList<Ylxxb>();
-		for (int i = 0; i < iterator.size(); i++) {
-			Ylxxb y1=iterator.get(i);
-			boolean fage=true;
-			String ldgh="";
-			for (int j = 0; j < ylbIterator.size(); j++) {
-				Ylb	 y2 = ylbIterator.get(j);
-				if(y1.getNbbm().equals(y2.getNbbm())){
-					if(y1.getJsy().equals(y2.getJsy())){
-						fage=false;
-					}
-					ldgh +=y2.getJsy()+"/";
-				}
-			}
-			if(fage){
-				y1.setLdgh(ldgh);
-				list.add(y1);
-			}
-		}
+//		List<Ylb> ylbIterator=ylbRepository.checkYl(rq,gsdm,fgsdm);
+		List<Ylxxb> list=jdbcTemplate.query(sql,  
+		        new RowMapper<Ylxxb>(){  
+            @Override  
+            public Ylxxb  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+            	Ylxxb s  = new Ylxxb(); 
+            	s.setId(rs.getInt("id"));
+            	s.setYyrq(rs.getDate("yyrq"));
+            	s.setNbbm(rs.getString("nbbm"));
+            	s.setGsdm(rs.getString("gsdm"));
+            	s.setFgsdm(rs.getString("fgsdm"));
+            	s.setJsy(rs.getString("jsy"));
+            	s.setJzl(rs.getDouble("jzl"));
+            	s.setStationid(rs.getString("stationid"));
+            	s.setNylx(rs.getInt("nylx"));
+            	s.setJyggh(rs.getString("jyggh"));
+            	s.setYj(rs.getDouble("yj"));
+            	s.setLdgh(rs.getString("ldgh"));
+            	s.setBz(rs.getString("bz"));
+                return s;  
+            }  
+		});  
+		
+		//正式使用用下面代码
+//		for (int i = 0; i < iterator.size(); i++) {
+//			Ylxxb y1=iterator.get(i);
+//			boolean fage=true;
+//			String ldgh="";
+//			for (int j = 0; j < ylbIterator.size(); j++) {
+//				Ylb	 y2 = ylbIterator.get(j);
+//				if(y1.getNbbm().equals(y2.getNbbm())){
+//					if(y1.getJsy().equals(y2.getJsy())){
+//						fage=false;
+//					}
+//					ldgh +=y2.getJsy()+"/";
+//				}
+//			}
+//			if(fage){
+//				y1.setLdgh(ldgh);
+//				list.add(y1);
+//			}
+//		}
+		
+		
 		PageHelper pageHelper = new PageHelper(list.size(), map);
 		pageHelper.getMap();
-		PageObject<Ylxxb> pageObject=pageHelper.getPageObject();
+		PageObject<Ylxxb> pageObject = pageHelper.getPageObject();
 		pageObject.setDataList(list);
 		return pageObject;
 	}
@@ -17,6 +17,7 @@ import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
+import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.LineConfig;
@@ -29,6 +30,7 @@ import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.entity.sys.DutyEmployee;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.LineRepository;
+import com.bsth.repository.oil.YlbRepository;
 import com.bsth.repository.oil.YlxxbRepository;
 import com.bsth.repository.realcontrol.ChildTaskPlanRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
@@ -116,6 +118,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Autowired
     YlxxbRepository ylxxbRepository;
+    
+    @Autowired
+    YlbRepository ylbRepository;
     Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -457,12 +462,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Override
     public List<ScheduleRealInfo> queryUserInfoPx(String line, String date, String state,String type) {
 //    	List<ScheduleRealInfo> list=new ArrayList<ScheduleRealInfo>();
+    	state=state+"";
     	String sqlPlan="select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh,"
     			+ " s.lp_Name as lpName,s.j_Name as jName,s.s_Gh as sGh,s.s_Name as sName"
     			+ " from bsth_c_s_sp_info_real s "
     			+ " where s.xl_Bm = '"+line+"' and DATE_FORMAT(s.schedule_Date,'%Y-%m-%d') ='"+date+"' "
     			+ " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name,s.s_Gh,"
-    			+ " s.s_Name order by "+state+" "+type;
+    			+ " s.s_Name order by ("+state+") "+type;
     	List<ScheduleRealInfo> list= jdbcTemplate.query(sqlPlan, 
 				new RowMapper<ScheduleRealInfo>(){
 			 @Override
@@ -1662,7 +1668,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     jhbc_a++;
                     jhbc_aZ++;
                 }
-                if (scheduleRealInfo.getStatus() == 2) {
+                if (scheduleRealInfo.getStatus() != -1) {
                     sjbc++;
                     sjbcZ++;
                     if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) {
@@ -2982,7 +2988,22 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					Ylxxb y=listYlxxb.get(t);
 					jzl += y.getJzl();
 				}
+				
+				List<Ylb> listYlb=ylbRepository.queryListYlb(s.getClZbh(), fcrq);
+				Double ccyl=0.0;
+				Double jcyl=0.0;
+				Double yh=0.0;
+				for (int i = 0; i < listYlb.size(); i++) {
+					Ylb y=listYlb.get(i);
+					ccyl +=y.getCzyl();
+					jcyl+= y.getJzyl();
+					yh+=y.getYh();
+					
+				}
 				map.put("jzl", jzl);
+				map.put("yh", yh);
+				map.put("ccyl", ccyl);
+				map.put("jcyl", jcyl);
 				map.put("xlName", s.getXlName());
 				map.put("clZbh", s.getClZbh());
 				map.put("fcsjActual", s.getFcsjActual());
@@ -273,7 +273,7 @@
 			day = "0" + day;
 		$("#date").val(year + "-" + month + "-" + day);
-		$("#ddrbBody").height($(window).height()-250);
+		$("#ddrbBody").height($(window).height()-280);
 		$.get('/basic/lineCode2Name',function(result){
 			var data=[];
@@ -232,7 +232,7 @@
 			});
 			jName = params[0].split("\\")[0];
 			var id = $("#"+params[1]).val();
-			$get('/realSchedule/'+id,null,function(result){
+			$get('/realSchedule/MapById',{id:id},function(result){
 			    result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
 				var ludan_1 = template('ludan_1',result);
 				// 把渲染好的模版html文本追加到表格中
@@ -330,11 +330,11 @@
           <td colspan="14">路别:{{xlName}}   路牌:{{lpName}}   车号:{{clZbh}}   出场时间:{{fcsjActual}}   到达站名:{{zdzName}}   当班调派:&nbsp;   日期:{{scheduleDate}}</td>
       </tr>
       <tr>
-          <td colspan="2">出场存油 &nbsp;升</td>
-          <td colspan="2">加注油量 &nbsp;升</td>
-          <td colspan="2">进场存油 &nbsp;升</td>
+          <td colspan="2">出场存油 {{map.ccyl}};升</td>
+          <td colspan="2">加注油量 {{map.jzl}}升</td>
+          <td colspan="2">进场存油 {{map.jcyl}}升</td>
           <td colspan="4">加注机油 &nbsp;升</td>
-          <td colspan="4">本日耗油 &nbsp;升</td>
+          <td colspan="4">本日耗油 {{map.yh}}升</td>
       </tr>
       <tr>
           <td rowspan="2">调度章</td>
@@ -58,8 +58,8 @@
 								<th width="10%">日期</th>
 								<th width="10%">公司</th>
 								<th width="10%">分公司</th>
-								<th width="6%">车辆</th>
-								<th width="10%">驾驶员</th>
+								<th width="4%">车辆</th>
+								<th width="12%">驾驶员</th>
 								<th width="2%">加注量</th>
 								<th width="4%">加油站</th>
 								<th width="4%">加油类型</th>