修改bug

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -38,14 +38,11 @@
             getTeamClass(datap,function(data){
                 var newEvents = [];
 
-                
-
                 // console.log(data);
                 for(var i=0;i<data.length;i++){
                     var obj = {id:data[i].id ,desc:data[i].team_name ,title: data[i].team_name+"-"+getTeamName(data[i].class_type),  start: data[i].end_time, end: data[i].end_time};//都以开始时间的日期为准
                     newEvents.push(obj);
                 }
-               
 
                  // 这里轮训给每天都增加一个事件
                
@@ -207,6 +204,13 @@
         }
 
         $("#save_user_class").click(function(){
+
+            var now_date = new Date();
+            if(now_date.Format('yyyy-MM-dd') > $("#save_user_class").data("work_date") ){
+                tip("不能生成过期的排班");
+                return ;
+            }
+
             var dutyList = [];
             var work_date = $("#save_user_class").data("work_date")+"00:00:00";
 
@@ -460,8 +464,14 @@
                                         data[i].list[j].id = data[i].list[j].user_id ; 
                                     }
 
-                                   $(".c-"+data[i].class_type+"-"+data[i].lane+" select").val(data[i].user_id);
-                                    // $(".table .tr-"+data[i].class_type+" select").eq(i%(lans+1)).val(data[i].user_id);
+                                    var aim_selector =  $(".c-"+data[i].class_type+"-"+data[i].lane+" select") ;
+
+                                  aim_selector.val(data[i].user_id);
+
+                                  if(aim_selector.find("option:selected").text() == ''){
+                                       aim_selector.append("<option selected='selected'>"+ data[i].user_name +"</option>")
+                                  }
+                                  // $(".table .tr-"+data[i].class_type+" select").eq(i%(lans+1)).val(data[i].user_id);
                                 }
                             },function(error){
                                 return "" ;
@@ -545,6 +555,13 @@
         });
 
         $("#save_term_class").click(function(){
+            // 判断当前时间和待添加班组时间判断
+            var now_date = new Date();
+            if(now_date.Format('yyyy-MM-dd') > $("#save_term_class").data("date") ){
+                tip("不能生成过期的排班");
+                return ;
+            }
+
             var data = [];
             for(var i=0;i<$("select[id*='_term']").length;i++){
                 if($("select[id*='_term']").eq(i).val()!=""){

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:"hh:mm:00", isTime:true,festival: true,isinitVal: true,zIndex:99999999});
+        jeDate({ dateCell:"#end_time", format:"hh:mm:00", isTime:true,festival: true,isinitVal: true,zIndex:99999999 });
   
     })
 </script>

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

@@ -44,6 +44,8 @@ public class UserClass {
     //班次类型（早、中、晚、全天）
     private Integer class_type;
     
+    private String user_name ;
+    
     private Integer lane;
     
     private Integer class_flag ;

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

@@ -163,7 +163,12 @@ public class UserClassServiceImpl extends BaseService implements UserClassServic
 
 	@Override
 	public List<UserClass> selectList(UserClass obj) {
-		return userClassDao.selectList(obj);
+		// 这边需要处理一下 user_name
+		List<UserClass> list = userClassDao.selectList(obj);
+		for(UserClass userClass : list){
+			userClass.setUser_name( CacheUtil.userMap.get(userClass.getUser_id()).getTruename());
+		}
+		return list ;
 	}
 
 	@Override