1、顶班时间不显示秒；

2、调整车道排班表显示，单元格和顶班详情按钮在同一行
3、稽查办排班用户ID从前台取，收费站从后台班组表取

VisualInspection/fis-conf.js

@@ -35,4 +35,4 @@ fis.media('dev')
     });
 
 // extends GLOBAL config
-fis.media('production');
+fis.media('prod');

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -343,8 +343,8 @@
                 bind_data = [] ;
             }
             var id = $("#team_info_ti").val();
-            var start_time = $("#start_time").val();
-            var end_time = $("#end_time").val() ;
+            var start_time = $("#start_time").val()+":00";
+            var end_time = $("#end_time").val()+":00";
             var name = $("#team_info_ti").find("option:selected").text(); 
             
             if(start_time >end_time){
@@ -358,7 +358,7 @@
             if(start_time_interval > end_time_interval){
                 var prev_date = new Date((start_time_interval+':00').replace(/-/,"/"));
                 prev_date.setDate(prev_date.getDate()-1) ;          
-                start_time_interval = prev_date.Format("yyyy-MM-dd HH:mm:00") ;
+                start_time_interval = prev_date.Format("yyyy-MM-dd HH:mm:ss") ;
             }
             if(!(start_time >= start_time_interval && end_time <= end_time_interval)){
                 tip("不是当前值班时间段");
@@ -408,20 +408,21 @@
                     for(var i=0;i<data.length;i++){
                             var ct = data[i].class_type ;
                             $(".tr-"+ct ).data("cache",data[i]);
-                            $(".tr-"+ct).append("<td><span>"+ classCode[ct].class_name +"</span> <span>"+classCode[ct].start_time+"</span> - <span>"+classCode[ct].end_time +"</span></td>");
-                            var selectv = "<select class='form-control select-self'>"
+                            $(".tr-"+ct).append("<td valign='middle'><span>"+ classCode[ct].class_name +"</span> <span>"+classCode[ct].start_time+"</span> - <span>"+classCode[ct].end_time +"</span></td>");
+                            var selectv = "<select class='form-control select-self' style='width:78px;'>"
                             selectv += ("<option value=''>请选择</option>");
                             for(var j=0;j<data[i].users.length;j++){
                                     var obj = data[i].users[j];
                                     selectv += ("<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>");
                             }
-                            selectv += "</select> <i title='顶班详情' alt='顶班详情' class='icon icon-tags i-self'></i>";
-                            $(".tr-"+ct).append("<td class='c-"+ct+"-0' tag='0'>"+ selectv +"</td>")
+                            selectv += "</select> <i title='顶班详情' alt='顶班详情' class='icon icon-tags i-self' style='float:right;margin-top:7px;'></i>";
+                            selectv += "<label>"+ct+"</label>"
+                            $(".tr-"+ct).append("<td style='vertical-align:middle;width:107px;padding:2px;' class='c-"+ct+"-0' tag='0'>"+ selectv +"</td>")
                             for(var z=0;z<entrance_number;z++){
-                                $(".tr-"+ct).append("<td class='c-"+ct+"-"+(z+1)+"' tag='"+(z+1)+"'>"+ selectv +"</td>")
+                                $(".tr-"+ct).append("<td style='vertical-align:middle;width:107px;padding:2px;' class='c-"+ct+"-"+(z+1)+"' tag='"+(z+1)+"'>"+ selectv +"</td>")
                             }
                             for(var z=0;z<exit_number;z++){
-                               $(".tr-"+ct).append("<td class='c-"+ct+"--"+(z+1)+"' tag='-"+(z+1)+"'>"+ selectv +"</td>")
+                               $(".tr-"+ct).append("<td style='vertical-align:middle;width:107px;padding:2px;' class='c-"+ct+"--"+(z+1)+"' tag='-"+(z+1)+"'>"+ selectv +"</td>")
                             }
                     }
                      if(data.length ==0){
@@ -562,7 +563,8 @@
                         "work_date": $("#save_term_class").data("date")+" 00:00:00",
                         "start_time": start_time,
                         "end_time": $("#save_term_class").data("date")+" "+classCode[i+1].end_time+":00",
-                        "dept_id":user_dept_id
+                        "dept_id":user_dept_id,
+                        "user_type":1//表示收费站
                     };
                     // console.log(obj);
                     data.push(obj);

VisualInspection/js/teamClass/check_team_schedule.js

@@ -239,7 +239,8 @@
                         "start_time": $("#save_term_class").data("date")+" 00:00:00",
                         "end_time": $("#save_term_class").data("date")+" 00:00:00",
                         "dept_id": user_dept_id,
-                        "user_ids":  str_user_ids    
+                        "user_ids":  str_user_ids,
+                        "user_type":2//表示稽查办   
                     };
                     data.push(obj);
                 }

VisualInspection/view/term_management/charge_stuff_schedule.html

@@ -179,8 +179,8 @@
     $(document).ready(function() {
         initChargeTeamSchedule();
 
-        jeDate({ dateCell:"#start_time", format:"YYYY-MM-DD hh:mm:00", isTime:true,festival: true,isinitVal: true,zIndex:99999999});
-        jeDate({ dateCell:"#end_time", format:"YYYY-MM-DD hh:mm:00", isTime:true,festival: true,isinitVal: true,zIndex:99999999 });
+        jeDate({ dateCell:"#start_time", format:"YYYY-MM-DD hh:mm", isTime:true,festival: true,isinitVal: true,zIndex:99999999});
+        jeDate({ dateCell:"#end_time", format:"YYYY-MM-DD hh:mm", isTime:true,festival: true,isinitVal: true,zIndex:99999999 });
   
     })
 </script>

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/TeamClass.java

@@ -51,4 +51,6 @@ public class TeamClass {
     
     private List<User> users;
     
+    private Integer user_type ;//1:收费站；2:稽查办
+    
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/TeamClassController.java

@@ -58,7 +58,7 @@ public class TeamClassController extends BaseController {
     		TeamClass teamClass = teamClasses.get(i);
     		teamClasses.get(i).setDept_id(u.getOrganid()+0L);
     		//直接从后台获取当班的人员
-    		if(teamClass.getTeam_id()!=null){
+    		if(teamClass.getUser_type()!=null && teamClass.getUser_type()==1 && teamClass.getTeam_id()!=null){
     			Team t = teamService.getById(teamClass.getTeam_id());
     			teamClass.setUser_ids(t.getUser_ids());
     		}
@@ -95,7 +95,7 @@ public class TeamClassController extends BaseController {
     			teamClass.setDept_id(u.getOrganid()+0L);
     		}
     		//直接从后台获取当班的人员
-    		if(teamClass.getTeam_id()!=null){
+    		if(teamClass.getUser_type()!=null && teamClass.getUser_type()==1 && teamClass.getTeam_id()!=null){
     			Team t = teamService.getById(teamClass.getTeam_id());
     			teamClass.setUser_ids(t.getUser_ids());
     		}

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/TeamClassServiceImpl.java

@@ -41,10 +41,14 @@ public class TeamClassServiceImpl extends BaseService implements TeamClassServic
 			StringBuffer user_names = new StringBuffer();
 			String[] user_ids = obj.getUser_ids().split(",");
 			for(int i=0;i<user_ids.length;i++){
-				User user = CacheUtil.userMap.get(Long.valueOf(user_ids[i]));
-				String userNames = user!=null?user.getTruename():"";
-				user_names.append(userNames);
-				user_names.append(",");
+				try {
+					User user = CacheUtil.userMap.get(Long.valueOf(user_ids[i]));
+					String userNames = user!=null?user.getTruename():"";
+					user_names.append(userNames);
+					user_names.append(",");
+				}catch(Exception e) {
+					System.out.println("user_ids错误");
+				}
 			}
 			obj.setUser_ids_name(user_names.toString());
 		}