路单数据,加车辆自编号和司机工号搜索。

yiming
1 parent 4cc73d53
Showing 3 changed files with 107 additions and 8 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/resources/static/pages/mforms/singledatas/singledata.html
@@ -9,6 +9,7 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import javax.transaction.Transactional;
@@ -110,7 +111,11 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
 	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2  order by s.xlBm,s.clZbh,s.jGh,s.realExecDate,s.fcsj")
 	List<ScheduleRealInfo> scheduleByDateAndLineTjrb(String line,String date);
-	
+
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr >= ?2 and s.scheduleDateStr <= ?3 order by s.xlBm,s.clZbh,s.jGh,s.realExecDate,s.fcsj")
+	List<ScheduleRealInfo> scheduleByDateStartEndAndLineTjrb(String line,String dateS,String dateE);
+
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
 	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDateStr = ?2 and s.xlDir=?3  and s.fcsjActual is not null and s.zdsjActual is not null  order by s.realExecDate,s.fcsjActual")
 	List<ScheduleRealInfo> scheduleByDateAndLineInOut(String line,String date,String zd);
@@ -261,4 +266,12 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
 	@Query("select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr=?1")
 	List<ScheduleRealInfo> findAllSchDate(String schDate);
+
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where gsBm like %:gsdm% and fgsBm like %:fgsdm%   and s.scheduleDateStr = :date and (:nbbm IS NULL OR s.clZbh = :nbbm) and (:jGh IS NULL OR s.jGh = :jGh) and (:sGh IS NULL OR s.sGh = :sGh) order by s.xlDir,s.realExecDate,s.fcsj, s.lpName")
+	List<ScheduleRealInfo> scheduleByDateAndLineByGs_(@Param("gsdm")String gsdm, @Param("fgsdm")String fgsdm, @Param("date")String date, @Param("nbbm") String nbbm, @Param("jGh") String jGh, @Param("sGh") String sGh);
+
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.xlBm =:line and s.scheduleDateStr = :date and (:nbbm IS NULL OR s.clZbh = :nbbm) and (:jGh IS NULL OR s.jGh = :jGh) and (:sGh IS NULL OR s.sGh = :sGh) order by s.lpName, s.realExecDate,s.fcsj")
+	List<ScheduleRealInfo> scheduleByDateAndLineQp(@Param("line")String line,@Param("date")String date,@Param("nbbm") String nbbm,@Param("jGh") String jGh,@Param("sGh") String sGh);
 }
@@ -899,12 +899,27 @@ public class FormsServiceImpl implements FormsService {
 			String tjtype=map.get("tjtype").toString();
 			String xlbm=map.get("line").toString().trim();
 			startDate = map.get("startDate").toString();
+
+			String nbbm = null;
+			if(map.get("nbbm")!=null && !map.get("nbbm").equals("")){
+				nbbm=map.get("nbbm").toString();
+			}
+
+			String jGh = null;
+			if(map.get("gh")!=null && !map.get("gh").equals("") && tjtype.equals("jsy")){
+				jGh=map.get("gh").toString();
+			}
+
+			String sGh = null;
+			if(map.get("gh")!=null && !map.get("gh").equals("") && tjtype.equals("spy")){
+				sGh=map.get("gh").toString();
+			}
 			List<ScheduleRealInfo> listReal=new ArrayList<ScheduleRealInfo>();
 			if(xlbm.equals("")){
-				listReal=scheduleRealInfoRepository.scheduleByDateAndLineByGs_(gsdm, fgsdm, startDate);
+				listReal=scheduleRealInfoRepository.scheduleByDateAndLineByGs_(gsdm, fgsdm, startDate, nbbm,jGh,sGh);
 			}else{
-				listReal=scheduleRealInfoRepository.scheduleByDateAndLineQp(xlbm, startDate);
+				listReal=scheduleRealInfoRepository.scheduleByDateAndLineQp(xlbm, startDate, nbbm,jGh,sGh);
 			}
 			List<Singledata> list=new ArrayList<Singledata>();
 			List<Singledata> list_=new ArrayList<Singledata>();
@@ -922,10 +937,14 @@ public class FormsServiceImpl implements FormsService {
 				if(fgsdm.length() != 0){
 					sql += " and r.fgs_bm ='"+fgsdm+"'";
 				}
+				if(nbbm!=null){
+					sql += " and r.cl_zbh ='"+nbbm+"'";
+				}
+				if(jGh!=null){
+					sql += " and r.j_gh ='"+jGh+"'";
+				}
 			    sql += " group by r.fgs_bm,r.j_gh,r.xl_bm,r.cl_zbh " +
 			    		"order by r.xl_bm,r.cl_zbh";
-			     
-			    
 			    list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
 					@Override
 					public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
@@ -951,6 +970,12 @@ public class FormsServiceImpl implements FormsService {
 			    if(!fgsdm.equals("")){
 			    	linesql +=" and fgsdm ='"+fgsdm+"' ";
 			    }
+				if(nbbm!=null){
+					linesql += " and nbbm ='"+nbbm+"'";
+				}
+				if(jGh!=null){
+					linesql += " and jsy ='"+jGh+"'";
+				}
 				String nysql="SELECT id,xlbm,nbbm,jsy,jzl as jzl,yh as yh,sh as sh,fgsdm FROM bsth_c_ylb"
 						+ " WHERE rq = '"+startDate+"'"
 						+ linesql
@@ -1094,6 +1119,12 @@ public class FormsServiceImpl implements FormsService {
 				if(!fgsdm.equals("")){
 					sql += " and r.fgs_bm = '"+fgsdm+"'";
 				}
+				if(nbbm!=null){
+					sql += " and r.cl_zbh ='"+nbbm+"'";
+				}
+				if(sGh!=null){
+					sql += " and r.s_gh ='"+sGh+"'";
+				}
 			    sql += " group  by  r.s_gh,r.s_name,"
 			       		+ " r.xl_bm,r.cl_zbh,r.gs_bm,r.fgs_bm order by r.xl_bm,r.cl_zbh";
@@ -40,6 +40,15 @@
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 140px;"></select>
                     </div>
+					<div style="display: inline-block;margin-left: 15px">
+						<span class="item-label" style="width: 140px;">内部编码： </span>
+						<select class="form-control" name="nbbm" id="nbbm" style="width: 140px;"></select>
+						<input class="btn btn-default" type="button" id="czcl" value="X"/>
+					</div>
+					<div style="display: inline-block;margin-left: 33px;">
+						<span class="item-label" style="width: 140px;">工号: </span>
+						<input class="form-control" type="text" id="gh" style="width: 140px;"/>
+					</div>
 					<div style="margin-top: 10px"></div>
 					<!-- <div style="display: inline-block; margin-left: 5px">
 						<span class="item-label" style="width: 80px;">是否营运: </span>
@@ -212,10 +221,12 @@
 		    var gsdmSing = $("#gsdmSing").val();
 		    var fgsdmSing = $("#fgsdmSing").val(); 
 		    var tjtype=$("#tjtype").val();
+			var nbbm=$("#nbbm").val();
+			var gh=$("#gh").val();
 		    var params = {};
 		    var i = layer.load(2);
 		    if(tjtype=='jsy'){
-		    	$get("/mcy_forms/singledatatj",{sfyy:sfyy,gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){		        
+		    	$get("/mcy_forms/singledatatj",{sfyy:sfyy,gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,lpName:lpName,tjtype:tjtype,nbbm:nbbm,gh:gh},function(result){
 			   		layer.close(i);
 			        var singledata = template('singledata',{list:result});
 	                // 把渲染好的模版html文本追加到表格中
@@ -223,7 +234,7 @@
 			    }); 
 		    }else{
-		    	$get("/mcy_forms/singledatatj2",{sfyy:sfyy,gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){		        
+		    	$get("/mcy_forms/singledatatj",{sfyy:sfyy,gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,lpName:lpName,tjtype:tjtype,nbbm:nbbm,gh:gh},function(result){
 			   		layer.close(i);
 			        var singledata = template('singledata',{list:result});
 	                // 把渲染好的模版html文本追加到表格中
@@ -246,9 +257,11 @@
 				var lineName = $('#line option:selected').text();
 				if(lineName == "全部线路")
 					lineName = $('#fgsdmSing option:selected').text();
+				var nbbm=$("#nbbm").val();
+				var gh=$("#gh").val();
 		    	var i = layer.load(2);
 // 			    if(tjtype=='jsy'){
-			    	$get('/mcy_export/singledataExportTj',{sfyy:sfyy,gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,type:'export',lineName:lineName},function(result){
+			    	$get('/mcy_export/singledataExportTj',{sfyy:sfyy,gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,type:'export',lineName:lineName,nbbm:nbbm,gh:gh},function(result){
 						window.open("/downloadFile/download?fileName="
 								+moment(startDate).format("YYYYMMDD")
 								+"-"+lineName+"-路单数据");
@@ -261,6 +274,48 @@
 // 			    }
 		});
+		$('#nbbm').select2({
+			ajax: {
+				url: '/realSchedule/sreachVehic',
+				dataType: 'json',
+				delay: 150,
+				data: function(params){
+					return{nbbm: params.term};
+				},
+				processResults: function (data) {
+					return {
+						results: data
+					};
+				},
+				cache: true
+			},
+			templateResult: function(repo){
+				if (repo.loading) return repo.text;
+				var h = '<span>'+repo.text+'</span>';
+				h += (repo.lineName?'&nbsp;<span class="select2-desc">'+repo.lineName+'</span>':'');
+				return h;
+			},
+			escapeMarkup: function (markup) { return markup; },
+			minimumInputLength: 1,
+			templateSelection: function(repo){
+				return repo.text;
+			},
+			language: {
+				noResults: function(){
+					return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>';
+				},
+				inputTooShort : function(e) {
+					return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>';
+				},
+				searching : function() {
+					return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
+				}
+			}
+		});
+		//重置
+		$('#czcl').on('click', function () {
+			$('#nbbm').val('').change();
+		});
 	});
 </script>
 <script type="text/html" id="singledata">