bug

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -206,16 +206,16 @@
           * 顶班日期
           */
          function date_time(){
-         $.jeDate("#start_time",{
-            format:"hh:mm:00",
-            isinitVal:true,
-            zIndex:99999999 
-        });
-        $.jeDate("#end_time",{
-            format:"hh:mm:00",
-            isinitVal:true,
-            zIndex:99999999 
-        });
+            $.jeDate("#start_time",{
+                format:"hh:mm:00",
+                isinitVal:true,
+                zIndex:99999999 
+            });
+            $.jeDate("#end_time",{
+                format:"hh:mm:00",
+                isinitVal:true,
+                zIndex:99999999 
+            });
          }
         date_time();
         $("#save_user_class").click(function(){
@@ -234,7 +234,7 @@
 
                 if(cache) {
                     for(var i=0;i<lans+1;i++){
-                        if($(".tr-"+j+" td select").eq(i).val()!='' ){
+                        if($(".tr-"+j+" td select").eq(i).val()!='' && $(".tr-"+j+" td select").eq(i).val()!=null ){
                             var start_time = $("#save_user_class").data("work_date")+ classCode[j].start_time+":00" ;
                             if(j==3) {
                                 var date = new Date($("#save_user_class").data("work_date").replace(/-/,"/"));
@@ -252,6 +252,8 @@
                     }
                 }
             }
+
+           console.log(dutyList);
             $("#save_user_class").attr("disabled","disabled");
 
             if($("#save_user_class").data("modify_flag")){
@@ -343,6 +345,9 @@
             $("#team_info_ti").val("");
             $("#lists").hide();
             $("#add_update").show();
+
+            $("#start_time").val(time_interval_obj.eq(1).html());
+            $("#end_time").val(time_interval_obj.eq(2).html());
         })
 
         // 保存班组信息
@@ -362,24 +367,41 @@
             if(bind_data == null){
                 bind_data = [] ;
             }
+            // 判断时间区间 
+            // $(".modal-title span").html()
+            var start_time_interval = $(".modal-title span").html() +' ' + time_interval_obj.eq(1).html()+":00";
+            var end_time_interval = $(".modal-title span").html() +' ' + time_interval_obj.eq(2).html()+":00";
+
             var id = $("#team_info_ti").val();
-            var start_time = $("#start_time").val();
-            var end_time = $("#end_time").val() ;
+            var start_time = $(".modal-title span").html() +' ' + $("#start_time").val();
+            var end_time =  $(".modal-title span").html() +' ' + $("#end_time").val() ;
             var name = $("#team_info_ti").find("option:selected").text(); 
-            
-            if(start_time >end_time){
-                tip("时间设置不合理，开始时间不能大于结束时间");
-                return ;
-            }
-            // 判断时间区间 
-            var start_time_interval = $(".modal-title span").html()+" "+ time_interval_obj.eq(1).html();
-            var end_time_interval = $(".modal-title span").html()+" "+ time_interval_obj.eq(2).html();
 
-            if(start_time_interval > end_time_interval){
-                var prev_date = new Date((start_time_interval+':00').replace(/-/,"/"));
+           if(start_time_interval > end_time_interval){
+                var prev_date = new Date((start_time_interval).replace(/-/,"/"));
                 prev_date.setDate(prev_date.getDate()-1) ;          
                 start_time_interval = prev_date.Format("yyyy-MM-dd HH:mm:00") ;
+
+                if( $("#start_time").val() > '23:00:00'){
+                    prev_date = new Date((start_time).replace(/-/,"/"));
+                    prev_date.setDate(prev_date.getDate()-1) ;          
+                    start_time = prev_date.Format("yyyy-MM-dd HH:mm:00") ;
+                }
+                
+                if( $("#end_time").val() > '23:00:00'){
+                    prev_date = new Date((end_time).replace(/-/,"/"));
+                    prev_date.setDate(prev_date.getDate()-1) ;          
+                    end_time = prev_date.Format("yyyy-MM-dd HH:mm:00") ;
+                }
             }
+           
+//            alert( 'start_time:'+start_time + 'end_time:'+end_time  + 'start_time_i:'+start_time_interval +'end_time_i:'+end_time_interval   );
+
+            if(start_time >end_time){
+                tip("时间设置不合理，开始时间不能大于结束时间");
+                return ;
+            }
+            
             if(!(start_time >= start_time_interval && end_time <= end_time_interval)){
                 tip("不是当前值班时间段");
                 return ;
@@ -485,7 +507,7 @@
                                   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>")
+                                       aim_selector.append("<option value='"+ data[i].user_id +"' selected='selected'>"+ data[i].user_name +"</option>")
                                   }
                                   // $(".table .tr-"+data[i].class_type+" select").eq(i%(lans+1)).val(data[i].user_id);
                                 }

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

@@ -36,6 +36,10 @@ public class UserClassServiceImpl extends BaseService implements UserClassServic
 	@Override
 	public void insertList(List<UserClass> list) {
 		// TODO Auto-generated method stub
+		if(list.size() >0 ){
+			userClassDao.delete(list.get(0));
+			userClassDao.deleteDetail(list.get(0));			
+		}
 		StringBuffer nightClassStuff = new StringBuffer();
 		StringBuffer middleClassStuff = new StringBuffer();
 		StringBuffer mooringClassStuff = new StringBuffer();