值机班长、收费班长

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -37,15 +37,22 @@
             }
             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};//都以开始时间的日期为准
+                    var obj = '' ;
+                    if(data[i].class_type == 1){
+                        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+":02", end: data[i].end_time+":03"};
+                    }else if(data[i].class_type == 2){
+                        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+":01", end: data[i].end_time+":02"};
+                    }else{
+                        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+":03", end: data[i].end_time+":04"};
+                    }
                     newEvents.push(obj);
                 }
-
-                 // 这里轮训给每天都增加一个事件
                
+                 // 这里轮训给每天都增加一个事件
                 var date = getMonthByCondition(date_cursor,'first');//new Date();
                 var end_date = getMonthByCondition(date_cursor,'last');//new Date(getCurrentMonthLast2()) ;
                 if(data_param != undefined){
@@ -53,15 +60,12 @@
                     end_date = new Date(data_param.end_time) ;
                 }
 
-
                 for(var i =0;i<31;i++){
                     if( date.setDate(i+1) < end_date ){
-                        var obj =  {id:-1 ,desc:'详细排班' ,title: '+详细排班',  start:date.Format('yyyy-MM-dd'), end: date.Format('yyyy-MM-dd'),color:'#bd7b46'};
+                        var obj =  {id:-1 ,desc:'详细排班' ,title: '+详细排班',  start:date.Format('yyyy-MM-dd 00:00:05'), end: date.Format('yyyy-MM-dd 00:00:06'),color:'#bd7b46'};
                         newEvents.push(obj);
                     }
                 }
-
-              
                 calendar.addEvents(newEvents);
             })
         }
@@ -236,12 +240,25 @@
 
             var dutyList = [];
             var work_date = $("#save_user_class").data("work_date")+"00:00:00";
+           
 
             for(var j=1;j<4;j++){
                 var cache = $(".tr-"+j).data("cache");
 
+                var zhiji_m_id = $(".c-"+j+"_0 select").val();
+                var station_m_id = $(".c-"+j+"_1 select").val();
+           
+                if(zhiji_m_id == ""||zhiji_m_id == null || typeof(zhiji_m_id)=="undefined"){
+                    zhiji_m_id = 0;
+                } 
+                if(station_m_id == ""||station_m_id == null || typeof(station_m_id)=="undefined"){
+                    station_m_id = 0;
+                } 
+                zhiji_m_id = parseInt(zhiji_m_id)
+                station_m_id = parseInt(station_m_id)
+
                 if(cache) {
-                    for(var i=0;i<lans+1;i++){
+                    for(var i=2;i<lans+1+2;i++){
                         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) {
@@ -251,17 +268,27 @@
                             }    
                             var end_time =  $("#save_user_class").data("work_date")+classCode[j].end_time+":00";
 
-                            // 这边需要
-                            // console.log("放辣椒"+$(".tr-"+j+" td select").eq(i).data("data"));
+                            var lane_id =  $(".tr-"+j+" td select").eq(i).parent().attr('tag');
+                            if(lane_id == null || typeof(lane_id)=="undefined"){
+                                continue;
+                            }     
+                            var m_id =  station_m_id   
+                            if(lane_id == 0){
+                               m_id =  zhiji_m_id;
+                            }
+              
+
                             var list = $(".tr-"+j+" td select").eq(i).data("data");
-                            var obj = {"list":list , "work_date":work_date,"dept_id":cache.dept_id,"user_id": $(".tr-"+j+" td select").eq(i).val() , "class_type":j,"team_id":cache.team_id,"start_time":start_time, "end_time":end_time,"lane":$(".tr-"+j+" td select").eq(i).parent().attr('tag') };
+                            var obj = {"list":list , "work_date":work_date,"dept_id":cache.dept_id,"user_id": $(".tr-"+j+" td select").eq(i).val() , "class_type":j,"team_id":cache.team_id,"start_time":start_time, "end_time":end_time,"lane":lane_id,"monitor_user_id":m_id };
+                            console.log(obj)
+
                             dutyList.push(obj);
+                            
                         }
                     }
                 }
             }
 
-           console.log(dutyList);
             $("#save_user_class").attr("disabled","disabled");
 
             if($("#save_user_class").data("modify_flag")){
@@ -458,11 +485,11 @@
                     for(var i=0;i<data.length;i++){
                             var ct = data[i].class_type ;
                             $(".tr-"+ct ).data("cache",data[i]);
-                            $(".tr-"+ct).append("<td vertical-align='middle' align='center' style='width:100px;'><span style='font-weight:bold;'>"+ classCode[ct].class_name +"<br></span><span>"+classCode[ct].start_time+"</span> - <span>"+classCode[ct].end_time +"</span></td>");
+                            $(".tr-"+ct).append("<td vertical-align='middle' align='center' style='width:140px;'><span style='font-weight:bold;'>"+ classCode[ct].class_name +"<br></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;'>"
+                            var selectv = "<select class='form-control select-self' style='width:100px;'>"
                             selectv += ("<option value=''>请选择</option>");
                              selectv += ("<option value='0'>临时开道</option>");
                             for(var j=0;j<data[i].users.length;j++){
@@ -470,19 +497,23 @@
                                     selectv += ("<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>");
                             }
                             selectv += "</select>";
+
+                            var selectv1 = selectv;
+                            selectv1 =selectv1.replace("<option value='0'>临时开道</option>","");
+                            selectv1 =selectv1.replace("<option value=''>请选择</option>","<option value='0'>请选择</option>");
               
-                            $(".tr-"+ct).append("<td style='vertical-align:top;width:107px;padding:2px;' class='c-"+ct+"_0' tag='0'>"+ selectv +"</td>")
-                            $(".tr-"+ct).append("<td style='vertical-align:top;width:107px;padding:2px;' class='c-"+ct+"_1' tag='0'>"+ selectv +"</td>")
+                            $(".tr-"+ct).append("<td style='vertical-align:top;width:137px;padding:2px;' class='c-"+ct+"_0' tag='0'>"+ selectv1 +"</td>")
+                            $(".tr-"+ct).append("<td style='vertical-align:top;width:137px;padding:2px;' class='c-"+ct+"_1' tag='0'>"+ selectv1 +"</td>")
                          
                             selectv += "<i title='顶班详情' alt='顶班详情' class='icon icon-tags i-self' style='float:right;margin-top:7px;'></i>";
                             selectv += "<ul style='padding:0px;'></ul>"
 
-                            $(".tr-"+ct).append("<td style='vertical-align:top;width:107px;padding:2px;' class='c-"+ct+"-0' tag='0'>"+ selectv +"</td>")
+                            $(".tr-"+ct).append("<td style='vertical-align:top;width:137px;padding:2px;' class='c-"+ct+"-0' tag='0'>"+ selectv1 +"</td>")
                             for(var z=0;z<entrance_number;z++){
-                                $(".tr-"+ct).append("<td style='vertical-align:top;width:107px;padding:2px;' class='c-"+ct+"-"+(z+1)+"' tag='"+(z+1)+"'>"+ selectv +"</td>")
+                                $(".tr-"+ct).append("<td style='vertical-align:top;width:137px;padding:2px;' class='c-"+ct+"-"+(z+1)+"' tag='"+(z+1)+"'>"+ selectv +"</td>")
                             }
                             for(var z=0;z<exit_number;z++){
-                               $(".tr-"+ct).append("<td style='vertical-align:top;width:107px;padding:2px;' class='c-"+ct+"--"+(z+1)+"' tag='-"+(z+1)+"'>"+ selectv +"</td>")
+                               $(".tr-"+ct).append("<td style='vertical-align:top;width:137px;padding:2px;' class='c-"+ct+"--"+(z+1)+"' tag='-"+(z+1)+"'>"+ selectv +"</td>")
                             }
                     }
                      if(data.length ==0){
@@ -513,6 +544,8 @@
                                 for(var i=0;i<data.length;i++){
                                     // console.log(data[i].list)
                                     // 这边需要把id转换成user_id
+                                    var m_id = data[i].monitor_user_id;
+                                    m_id = m_id<=0?0:m_id;
                                     
                                     if(data[i].list != null)
                                         $(".c-"+data[i].class_type+"-"+data[i].lane+" select").data("data",data[i].list);
@@ -527,6 +560,14 @@
                                     }
 
                                     var aim_selector =  $(".c-"+data[i].class_type+"-"+data[i].lane+" select") ;
+                                    var zhiji_m_id = $(".c-"+data[i].class_type+"_0 select") ;
+                                    var station_m_id = $(".c-"+data[i].class_type+"_1 select") ;
+
+                                    if(data[i].lane==0){
+                                        zhiji_m_id.val(m_id);
+                                    }else{
+                                        station_m_id.val(m_id);
+                                    }
 
                                   aim_selector.val(data[i].user_id);
 
@@ -659,7 +700,7 @@
                         "dept_id":user_dept_id,
                         "user_type":1//表示收费站
                     };
-                    // console.log(obj);
+           
                     data.push(obj);
                 }
             }
@@ -721,4 +762,6 @@
        $(".modal-title").html("添加班组-"+title);
    }
 
+   
+
    

VisualInspection/view/term_management/charge_stuff_schedule.html

@@ -61,7 +61,7 @@
 <!--对话框 结束-->
 
 
-<div class="modal fade" id="add_fee_station">
+<div class="modal fade" id="add_fee_station" >
     <div class="modal-dialog modal-lg" style="width:1200px;" >
         <div class="modal-content">
     <div class="modal-header">
@@ -70,9 +70,15 @@
     </div>
     <div class="modal-body">
             <!-- 添加对话框 -->
-            <div class="container-fluid ">
-                    <div>
-                        <table class="table">
+            <div class="container-fluid" style="margin:0px;padding:0px;">
+                    <div class="row scrollbar" style="width:1180px;overflow:scroll;margin:0px;padding-bottom:10px;margin-bottom:10px;">
+                        <style>
+                           th{
+                               text-align: center;
+                           }
+
+                        </style>
+                        <table class="table" style="margin:0px;text-align:center;width:1550px;">
                             <thead class="thread_charge" style="padding:3px;font-size:14px;background:#F8F8F8;">
                                
                             </thead>

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

@@ -92,4 +92,6 @@ public class Task{
     private Long appeal_id;
     
     private String score_details;
+    
+    private Long monitor_user_id;
 }

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

@@ -51,4 +51,6 @@ public class UnregularUserClass {
     // sys_user_class id
     private Long class_id ;
     
+    private Long monitor_user_id;
+    
 }

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

@@ -50,6 +50,8 @@ public class UserClass {
     
     private Integer class_flag ;
     
+    private Long monitor_user_id;
+    
     private List<UnregularUserClass> list ;
     
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/TaskMapper.xml

@@ -22,6 +22,8 @@
         <result column="check_period" property="check_period" jdbcType="VARCHAR" />
         <result column="class_type" property="class_type" jdbcType="INTEGER" />
         <result column="period_id" property="period_id" jdbcType="INTEGER" />
+        <result column="monitor_user_id" property="monitor_user_id" jdbcType="INTEGER" />
+        
     </resultMap>
     <resultMap id="taskStatusMap" type="com.xintong.visualinspection.bean.TaskStatus">
         <id property="id" column="ID"/>

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/UserClassMapper.xml

@@ -13,36 +13,38 @@
    		<result property="end_time" column="end_time"/>
    		<result property="lane" column="lane"/>
    		<result property="class_flag" column="class_flag"/>
+   		<result property="monitor_user_id" column="monitor_user_id"/>
    		<collection property="list" ofType="com.xintong.visualinspection.bean.UnregularUserClass">
    			<id property="id" column="ids" />
    			<result property="start_time" column="start_time_u"/>
    			<result property="end_time" column="end_time_u"/>
    			<result property="user_name" column="user_name"/>
    			<result property="user_id" column="user_id_u"/>
+   			<result property="monitor_user_id" column="monitor_user_id_u"/>
    		</collection>
    </resultMap>
    
    <insert id="insert" parameterType="com.xintong.visualinspection.bean.UserClass" useGeneratedKeys="true" keyProperty="id">
    		INSERT INTO
         sys_user_class
-        (work_date,dept_id,user_id,class_type,team_id,start_time,end_time,lane,class_flag)
+        (work_date,dept_id,user_id,class_type,team_id,start_time,end_time,lane,class_flag,monitor_user_id)
         VALUES
-        (#{work_date},#{dept_id},#{user_id},#{class_type},#{team_id},#{start_time},#{end_time},#{lane},#{class_flag})
+        (#{work_date},#{dept_id},#{user_id},#{class_type},#{team_id},#{start_time},#{end_time},#{lane},#{class_flag},#{monitor_user_id})
    </insert>
    
    
    <insert id="insert_detail" parameterType="java.util.List" >
    		INSERT INTO
         sys_user_class_unregular
-        (work_date,dept_id,user_id,class_type,team_id,start_time,end_time,lane,class_id,user_name)
+        (work_date,dept_id,user_id,class_type,team_id,start_time,end_time,lane,class_id,user_name,monitor_user_id)
         VALUES
         <foreach collection="list" item="item" index="index" separator="," > 
-			(#{item.work_date},#{item.dept_id},#{item.user_id},#{item.class_type},#{item.team_id},#{item.start_time},#{item.end_time},#{item.lane},#{item.class_id},#{item.user_name})
+			(#{item.work_date},#{item.dept_id},#{item.user_id},#{item.class_type},#{item.team_id},#{item.start_time},#{item.end_time},#{item.lane},#{item.class_id},#{item.user_name},#{item.monitor_user_id})
 		</foreach> 
    </insert>
    
    <select id="selectList" parameterType="com.xintong.visualinspection.bean.UserClass" resultMap="userClassMap" >
-   		SELECT su.*,t.start_time AS start_time_u,t.end_time AS end_time_u,t.user_name , t.user_id AS user_id_u , t.id AS ids FROM sys_user_class su LEFT JOIN sys_user_class_unregular t ON su.id = t.class_id 
+   	   SELECT su.*,t.start_time AS start_time_u,t.end_time AS end_time_u,t.user_name , t.user_id AS user_id_u , t.id AS ids,t.monitor_user_id AS monitor_user_id_u FROM sys_user_class su LEFT JOIN sys_user_class_unregular t ON su.id = t.class_id 
    		 WHERE su.work_date = #{work_date} AND su.dept_id=#{dept_id} order by t.start_time asc,class_type asc , lane asc
    </select>
    

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

@@ -142,6 +142,7 @@ public class UserClassServiceImpl extends BaseService implements UserClassServic
 					obj.get(j).setUser_id(obj.get(j).getId());
 					obj.get(j).setTeam_id(list.get(i).getTeam_id());
 					obj.get(j).setClass_id(list.get(i).getId());
+					obj.get(j).setMonitor_user_id(list.get(i).getMonitor_user_id());
 				}
 				userClassDao.insert_detail(obj);
 			}