场外加油加油人员不符调度日报导出修正

廖磊
1 parent 6d3367ca
Showing 6 changed files with 146 additions and 46 deletions
src/main/java/com/bsth/repository/oil/CwjyRepository.java
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.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/oil/checkJyryList.html
@@ -27,4 +27,8 @@ public interface CwjyRepository extends BaseRepository&lt;Cwjy, Integer&gt;{
    " ) c on a.nbbm=c.nbbm  where  a.nbbm like %?2% ",nativeQuery=true)
 	List<Object[]> obtainCwjycl(String rq,String nbbm);
+	@Query(value="select * from bsth_c_cwjy where nbbm like %?1% and gsdm like %?2% and fgsdm like %?3%",nativeQuery=true)
+	List<Cwjy> selectAll(String nbbm,String gsdm,String fgsdm);
+	
+	
 }
@@ -26,6 +26,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.oil.Cwjy;
 import com.bsth.entity.oil.Cyl;
+import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
 import com.bsth.repository.oil.CwjyRepository;
 import com.bsth.repository.oil.YlxxbRepository;
@@ -280,7 +281,7 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 		String gsdm=map.get("gsdm_like").toString();
 		String fgsdm=map.get("fgsdm_like").toString();
-		String sql="SELECT a.gsdm as gsdm,a.fgsdm as fgsdm,a.nbbm as nbbm,"
+		/*String sql="SELECT a.gsdm as gsdm,a.fgsdm as fgsdm,a.nbbm as nbbm,"
 				+ "b.jyggh as jyggh,b.jzl as jzl ,b.stationid as stationid,b.jsy as jsy,"
 				+ "b.nylx as nylx,b.yj as yj,b.bz as bz,b.id as id ,c.jsy as ldgh  FROM  bsth_c_cwjy  a "+ 
 				   " left  join ("
@@ -293,7 +294,10 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 				  		+ " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"'  group by nbbm "+
 				   " ) c on a.nbbm=c.nbbm  "
 				   + "where  a.nbbm like '%"+nbbm+"%' and a.gsdm='"+gsdm+"' and a.fgsdm ='"+fgsdm+"'"
-				   		+ " order by a.nbbm";
+				   		+ " order by a.nbbm";*/
+		String sql= " select * from bsth_c_ylxxb b "
+				   + "where to_days(b.yyrq)=to_days('"+rq+"') and jylx=1  "
+				   		+ " and gsdm = '"+gsdm+"'";
 		List<Ylxxb> yList= jdbcTemplate.query(sql,
 				 new RowMapper<Ylxxb>(){
@@ -311,24 +315,67 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 				 t.setNylx(rs.getInt("nylx"));
 				 t.setYj(rs.getDouble("yj"));
 				 t.setBz(rs.getString("bz"));
-				 t.setLdgh(rs.getString("ldgh"));
 				 return t;
 			 }
 		});
-		/*List<Ylxxb> list= ylxxbRepository.checkYlxx(rq, gsdm);
-		for (int i = 0; i < yList.size(); i++) {
-			Ylxxb t=yList.get(i);
-			Double zjzl=0.0;
-			for (int j = 0; j < list.size(); j++) {
-				Ylxxb y=list.get(j);
-				if(t.getNbbm().equals(y.getNbbm())){
-					zjzl=Arith.add(zjzl, y.getJzl());
+		List<Cwjy> cwList=repository.selectAll(nbbm, gsdm, fgsdm);
+		String sql_ylb="SELECT nbbm,group_concat(jsy) AS jsy FROM bsth_c_ylb WHERE "
+				+ " to_days(rq) = to_days('"+rq+"') AND ssgsdm = '"+gsdm+"' AND "
+				+ " fgsdm = '"+fgsdm+"' GROUP BY nbbm";
+		
+		List<Map<String, String>> ylbList= jdbcTemplate.query(sql_ylb,
+				 new RowMapper<Map<String, String>>(){
+			 @Override
+			 public Map<String, String>  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+				 Map<String, String> maps =new HashMap<String, String>();
+				 maps.put("nbbm", rs.getString("nbbm"));
+				 maps.put("ldgh", rs.getString("jsy"));
+				 return maps;
+			 }
+		});
+		
+		List<Ylxxb> ylxxbList= new ArrayList<Ylxxb>();
+		Ylxxb y=null;
+		for (int i = 0; i < cwList.size(); i++) {
+			Cwjy cwjy=cwList.get(i);
+			if(cwjy.getNbbm().equals("W7B-092")){
+				System.out.println();
+			}
+			y=new Ylxxb();
+			y.setNylx(0);
+			y.setId(0);
+			y.setJzl(0.0);
+			y.setGsdm(cwjy.getGsdm());
+			y.setFgsdm(cwjy.getFgsdm());
+			y.setNbbm(cwjy.getNbbm());
+			for (int j = 0; j < yList.size(); j++) {
+				Ylxxb ylxxb=yList.get(j);
+				if(y.getNbbm().equals(ylxxb.getNbbm())){
+					y.setId(ylxxb.getId());
+					y.setJyggh(ylxxb.getJyggh());
+				    y.setJsy(ylxxb.getJsy());
+				    y.setJzl(ylxxb.getJzl());
+				    y.setStationid(ylxxb.getStationid());
+				    y.setNylx(ylxxb.getNylx());
+				    y.setYj(ylxxb.getYj());
+				    y.setBz(ylxxb.getBz());
+				    break;
+				}
+			}
+			for (int j = 0; j < ylbList.size(); j++) {
+				Map<String, String> m=ylbList.get(j);
+				if(m.get("nbbm").toString().equals(cwjy.getNbbm())){
+					y.setLdgh(m.get("ldgh").toString());
+					break;
 				}
 			}
-			t.setZjzl(zjzl);
-		}*/
-		return yList;
+			
+			ylxxbList.add(y);
+			
+		}
+		
+		return ylxxbList;
 	}
 	@Override
@@ -871,15 +871,48 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			List<Ylb> ylListBe=repository.listMaxRqJcsx(rq, gsbm, fgsbm, xlbm, nbbm);
 			List<Ylb> ylbList=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
 //					repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
-			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,0,gsbm);
+//			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,0,gsbm);
+			String sql="select * from bsth_c_ylxxb where yyrq='"+rq+"' "
+					+ " and gsdm ='"+gsbm+"' and nylx ='0' and nbbm "
+					+ " not in ( select nbbm  from bsth_c_ylb "
+					+ " where  DATE_FORMAT(rq,'%Y-%m-%d')='"+rq+"' "
+					+ " and ssgsdm='"+gsbm+"' and fgsdm ='"+fgsbm+"')"
+					+ " and nbbm in (select inside_code from "
+					+ " bsth_c_cars where business_code ='"+gsbm+"' "
+					+ " and branche_company_code='"+fgsbm+"')";
+			
+			List<Ylxxb> ylxxbList=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 < ylxxbList.size(); i++) {
-				Boolean fage=true;
+				Boolean fage=false;
 				Ylxxb y1=ylxxbList.get(i);
-				for(int y=0;y<ylbList.size();y++){
-					Ylb y2=ylbList.get(y);
-					if(y1.getNbbm().equals(y2.getNbbm())){
-						fage=false;
-						break;
+				Line line=BasicData.nbbm2LineMap.get(y1.getNbbm());
+				if(null !=line){
+					if(!xlbm.equals("")){
+						if(line.getLineCode().equals(xlbm)){
+							fage=true;
+						}
+					}else{
+						fage=true;
 					}
 				}
@@ -896,7 +929,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					}
 					t.setFgsdm(fgsdm);
 					t.setJcsx(1);
-					Line line= BasicData.nbbm2LineMap.get(y1.getNbbm());
 					if(null !=line){
 						t.setXlbm(line.getLineCode());
 					}else{
@@ -929,12 +961,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								logger.info("核对有存油没里程：存在相同数据,数据已经过滤");
 							}
 						}
-						
-						/*if(null!=cyl){
-							cyl.setCyl(Arith.add(t.getJzl(), t.getCzyl()));
-							cyl.setUpdatetime(y1.getYyrq());
-							cylRepository.save(cyl);
-						}*/
 					}
 				}
 			}
@@ -49,14 +49,20 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 		String rq=map.get("yyrq").toString();
 		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+"'";*/
-		String sql= "select v.*,u.jsy as ldgh  from "
+	String sql="	select * from ("
+			+ "select *,CONCAT(nbbm,jsy)  as nj "
+			+ " from bsth_c_ylxxb where yyrq='"+rq+"' "
+			+ " and gsdm ='"+gsdm+"') x where x.nj not in ("
+			+ " select CONCAT(nbbm,jsy)  from bsth_c_ylb "
+			+ " where  DATE_FORMAT(rq,'%Y-%m-%d')='"+rq+"'"
+			+ " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"')"
+			+ " and x.nbbm in (select nbbm  from bsth_c_ylb "
+			+ " where  DATE_FORMAT(rq,'%Y-%m-%d')='"+rq+"'"
+			+ " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"')";
+		
+		
+		/*String sql= "select v.*,u.jsy as ldgh  from "
 				+ " ( select *  from   bsth_c_ylxxb x  where  "
 				+ " DATE_FORMAT(x.yyrq,'%Y-%m-%d')='"+rq+"'  and x.gsdm='"+gsdm+"'"
 				+ " and x.jsy not  in  ("
@@ -69,7 +75,7 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 				+ " left join (select * from  bsth_c_ylb "
 				+ " where DATE_FORMAT(rq,'%Y-%m-%d')='"+rq+"'"
 				+ " and ssgsdm='"+gsdm+"'  and fgsdm='"+fgsdm+"' )  u "
-				+ " on  v.nbbm=u.nbbm ";
+				+ " on  v.nbbm=u.nbbm ";*/
 		//根具条件查询指定日期Ylxxb的数据
 //		List<Ylxxb> iterator=repository.checkYlxx(rq,gsdm);
@@ -100,12 +106,28 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
             	s.setNylx(rs.getInt("nylx"));
             	s.setJyggh(rs.getString("jyggh"));
             	s.setYj(rs.getDouble("yj"));
-            	s.setLdgh(rs.getString("ldgh"));
+//            	s.setLdgh(rs.getString("ldgh"));
             	s.setBz(rs.getString("bz"));
                 return s;  
             }  
 		});  
+		
+		List<Ylb> listylb=ylbRepository.obtainYl(rq, gsdm, fgsdm, "", "", "nbbm");
+		for (int i = 0; i < list.size(); i++) {
+			String ldgh="";
+			for (int j = 0; j < listylb.size(); j++) {
+				Ylb ylb =listylb.get(j);
+				if(list.get(i).getNbbm().equals(ylb.getNbbm())){
+					if(ldgh.equals(""))
+						ldgh +=ylb.getJsy();
+					else
+					    ldgh += ","+ylb.getJsy();
+				}
+			}
+			list.get(i).setLdgh(ldgh);
+			
+		}
 		//正式使用用下面代码
 //		for (int i = 0; i < iterator.size(); i++) {
 //			Ylxxb y1=iterator.get(i);
@@ -2783,6 +2783,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 if(reamrks2.length()>5){
                 	t2.setRemarks(reamrks2.substring(0, 5));
                 	t2.setRemark(reamrks2);
+                }else{
+                	t2.setRemark(reamrks2);
                 }
                 if (t1.getId() == t2.getId()) {
                     t1 = t2;
@@ -4064,9 +4066,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             	 Long zdsj_=Long.parseLong(zdsj_s[0])*60+Long.parseLong(zdsj_s[1]);
             	 Long zdsjActual_=Long.parseLong(zdsjActual_s[0])*60+Long.parseLong(zdsjActual_s[1]);
             	 if((zdsj_-zdsjActual_)>0){
-            		 zdsjm =String.valueOf(zdsj_-zdsjActual_);
-            	 }else{
             		 zdsjk =String.valueOf(zdsj_-zdsjActual_);
+            	 }else{
+            		 zdsjm =String.valueOf(zdsj_-zdsjActual_);
             	 }
              }
              tempMap.put("zdsjk" + x, zdsjk);
@@ -4077,9 +4079,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
              String fcsjActuralstr="";
              if(bcType.equals("in")){
             	 fcsjActuralstr=fcsjActural+"(进)";
-             }
-             if(bcType.equals("out")){
+             }else if(bcType.equals("out")){
             	 fcsjActuralstr=fcsjActural+"(出)";
+             }else{
+            	 fcsjActuralstr=fcsjActural;
              }
              tempMap.put("fcsjActual" + x, fcsjActuralstr);
              String fcsjk="";
@@ -4090,9 +4093,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             	 Long zdsj_=Long.parseLong(zdsj_s[0])*60+Long.parseLong(zdsj_s[1]);
             	 Long fcsjActural_=Long.parseLong(fcsjActural_s[0])*60+Long.parseLong(fcsjActural_s[1]);
             	 if((zdsj_-fcsjActural_)>0){
-            		 fcsjm =String.valueOf(zdsj_-fcsjActural_);
-            	 }else{
             		 fcsjk =String.valueOf(zdsj_-fcsjActural_);
+            	 }else{
+            		 fcsjm =String.valueOf(zdsj_-fcsjActural_);
             	 }
              }
              tempMap.put("fcsjk" + x, fcsjk);
@@ -168,7 +168,6 @@ $(function(){
     	})
     	var params = {};
         	params['ylbList']=JSON.stringify(ylArray);
-        	console.log(params);
         	 var i = layer.load(2);
         	 $post('/ylxxb/check', params, function(){
         		 layer.close(i);
@@ -287,7 +286,6 @@ $(function(){
 		params['yyrq']=$("#yyrq").val();
 // 		var i = layer.load(2);
-		var i = 2;
 		/* var jyryGsdm=$("#jyryListGsdmId").val();
 		var jyryFgsdm=$("#jyryListFgsdmId").val();
 		if(jyryGsdm=="" || jyryGsdm==null){
@@ -307,7 +305,7 @@ $(function(){
 				params['fgsdm_in']=fgsqx1;
 			}
 		}  */
-		
+		var i = layer.load(2);
 		$get('/ylxxb/pagequery' ,params, function(data){
 			$.each(data.dataList, function(i, obj) {
                 obj.yyrq = moment(obj.yyrq).format("YYYY-MM-DD");