加油模块

廖磊
1 parent c6cdf717
Showing 5 changed files with 50 additions and 22 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/impl/PersonnelServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/oil/list_ph.html
@@ -28,14 +28,8 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.id,s.jGh,s.clZbh,s.lpName order by (lpName+1)")
 	List<ScheduleRealInfo> queryUserInfo(String line,String date);
-	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName,s.sGh,s.sName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName,s.sGh,s.sName order by (lpName+1)")
+	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName order by (lpName+1)")
 	List<ScheduleRealInfo> queryUserInfo2(String line,String date);
-	
-	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName,s.sGh,s.sName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName,s.sGh,s.sName order by ?3 desc")
-	List<ScheduleRealInfo> queryUserInfoPxDesc(String line,String date,String state);
-	
-	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName,s.sGh,s.sName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName,s.sGh,s.sName order by ?3 asc")
-	List<ScheduleRealInfo> queryUserInfoPxAsc(String line,String date,String state);
 	@Query(value="select min(s.id), s.clZbh from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.clZbh ")
 	List<ScheduleRealInfo> queryUserInfo3(String line,String date);
@@ -34,8 +34,9 @@ public class PersonnelServiceImpl extends BaseServiceImpl&lt;Personnel, Integer&gt; im
 			per=perIterator.next();
 			if(per.getJobCode().indexOf(jobCode)!=-1){
 				Map<String, String> jobCodeMap= new HashMap<>();
-				jobCodeMap.put("id",per.getJobCode());
-				jobCodeMap.put("text", per.getJobCode()+"/"+per.getPersonnelName());
+				String jboCode=per.getJobCode().substring(per.getJobCode().indexOf("-")+1);
+				jobCodeMap.put("id",jboCode);
+				jobCodeMap.put("text", jboCode+"/"+per.getPersonnelName());
 				jobCodeMap.put("gs", per.getCompanyCode());
 				list.add(jobCodeMap);
 			}
@@ -36,6 +36,7 @@ import com.bsth.repository.oil.YlxxbRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.oil.YlbService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.util.BatchSaveUtils;
 import com.github.abel533.echarts.code.Y;
 @Service
@@ -183,9 +184,10 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		List<Cyl> clyList=cylRepository.obtainCyl();
 		//从排班表中计算出行驶的总里程
 		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList(line,rq);
-		
+		List<Ylb> addList=new ArrayList<Ylb>();
+		List<Ylb> updateList=new ArrayList<Ylb>();
 		for(int x=0;x<listpb.size();x++){
-			
+			String type="add";
 			Map<String, Object> map=listpb.get(x);
 			//判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
@@ -197,6 +199,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						&&t1.getXlbm().equals(map.get("xlBm").toString()))
 				{
 					t=t1;
+					type="update";
 				}
 			}
 			try {
@@ -238,6 +241,11 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
 				t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
 				t.setRq(sdf.parse(rq));
+				/*if(type.equals("add")){
+					addList.add(t);
+				}else{
+					updateList.add(t);
+				}*/
 				repository.save(t);
 				newMap.put("status", ResponseCode.SUCCESS);
 			} catch (ParseException e) {
@@ -246,7 +254,20 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				e.printStackTrace();
 			}
 		}
-		
+	/*	try {
+			if(addList.size()>0){
+				new BatchSaveUtils<Ylb>().saveList(addList, Ylb.class);
+			}
+			
+			if(updateList.size()>0){
+				
+			}
+			newMap.put("status", ResponseCode.SUCCESS);
+		}
+		catch (Exception e) {
+			// TODO: handle exception
+			newMap.put("status", ResponseCode.ERROR);
+		}*/
 		return newMap;
 	}
@@ -476,11 +476,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             type = "asc";
         }
         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"
+                + " s.lp_Name as lpName,s.j_Name as jName"
                 + " 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;
+                + " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name"
+                + " order by (" + state + ") " + type;
         List<ScheduleRealInfo> list = jdbcTemplate.query(sqlPlan,
                 new RowMapper<ScheduleRealInfo>() {
                     @Override
@@ -491,8 +491,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         t.setClZbh(rs.getString("clZbh"));
                         t.setLpName(rs.getString("lpName"));
                         t.setjName(rs.getString("jName"));
-                        t.setsGh(rs.getString("sGh"));
-                        t.setsName(rs.getString("sName"));
                         return t;
                     }
                 });
@@ -3173,6 +3171,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("fcsjActual", s.getFcsjActual());
         map.put("zdzName", s.getZdzName());
         map.put("scheduleDate", s.getScheduleDateStr());
+        map.put("lpName", s.getLpName());
         String zdp = "", zwdp = "", wdp = "";
         String zdpT = "", zwdpT = "", wdpT = "";
@@ -82,7 +82,8 @@
                                	 线路:
                             </td>
                             <td colspan="3">
-                                <select class="form-control" name="xlbm_like" id="xlbm" style="width: 120px;"></select>
+                                <select class="form-control" name="xlbm_eq" id="xlbm" style="width: 120px;"></select>
+                                <input type="hidden" name="xlbm_like" value=""/>
                                 &nbsp;
                             </td>
                             <td >
@@ -234,7 +235,7 @@
                 var i = layer.load(2);
                 $get('/ylb/checkYl', params, function () {
                 	layer.close(i);
-                    jsDoQuery(null, true);
+                    jsDoQuery(params, true);
                 });
             } else {
                 layer.msg('请选择日期.');
@@ -260,7 +261,7 @@
                 var i = layer.load(2);
                 $get('/ylb/outAndIn', params, function () {
                 	layer.close(i);
-                    jsDoQuery(null, true);
+                    jsDoQuery(params, true);
                 });
             } else {
                 layer.msg('请选择日期.');
@@ -283,7 +284,19 @@
                     var i = layer.load(2);
                     $get('/ylb/sort', params, function () {
                     	layer.close(i);
-                        jsDoQuery(null, true);
+                    	var cells = $('tr.filter')[0].cells
+                        , params1 = {}
+                        , name;
+		                $.each(cells, function (i, cell) {
+		                    var items = $('input,select', cell);
+		                    for (var j = 0, item; item = items[j++];) {
+		                        name = $(item).attr('name');
+		                        if (name) {
+		                            params1[name] = $(item).val();
+		                        }
+		                    }
+		                });
+                        jsDoQuery(params1, true);
                     });
                 }
@@ -537,7 +550,7 @@
         //搜索线路
        	$.get('/basic/lineCode2Name',function(result){
 			var data=[];
-			data.push({id: " ", text: "全部线路"});
+// 			data.push({id: " ", text: "全部线路"});
 			for(var code in result){
 				data.push({id: code, text: result[code]});
 			}