no message

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -20,7 +20,7 @@
        
         calendarInit();
 
-        // 请求稽查人员排班数据
+        // 请求收费人员排班数据
         function calendarInit(data_param){
             var data = {
                 "dept_id": user_dept_id ,
@@ -34,6 +34,15 @@
             getTeamClass(data,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].start_time, end: data[i].end_time};
+                    newEvents.push(obj);
+                }
+               
+
                  // 这里轮训给每天都增加一个事件
                
                 var date = new Date();
@@ -51,12 +60,7 @@
                     }
                 }
 
-                // 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].start_time, end: data[i].end_time};
-                    newEvents.push(obj);
-                }
-               
+
                 calendar.addEvents(newEvents);
             })
         }
@@ -70,6 +74,30 @@
             })
         }
 
+        getStation();
+
+
+        var lans = 0;
+
+        // 获取收费站信息
+        function getStation(){
+            get_common_service( "dept/getFsByDept","",function(data){
+                if(data != null){
+                    $(".thread_charge").append("<th>"+data.name+"</th>");
+                    // $(".tr-1").append("<td>早班 6:00 - 12:00</td>");
+                    // $(".tr-2").append("<td>中班 12:00 - 20:00</td>");
+                    // $(".tr-3").append("<td>晚班 20:00 - 6:00</td>");
+                    lans = data.lanes_number;
+                    for(var i=0;i<data.lanes_number;i++){
+                        $(".thread_charge").append("<th>车道"+(i+1)+"</th>");
+                    }
+                }
+            },function(error){
+                return "" ;
+            })
+        }
+
+
         // 更新日历数据
         function updateCalendar(data){
             calendar.events = [];
@@ -129,6 +157,73 @@
             if(event.event.id == -1){
                 // 这边负责添加整个页面的数据 按车道排班
                 $('#add_fee_station').modal();
+                $(".modal-title").html("收费站排班表-"+event.event.start.format("yyyy-MM-dd"));
+
+
+                 var data = {
+                    "dept_id": user_dept_id ,
+                    "start_time":event.event.start.format("yyyy-MM-dd 00:00:00"),
+                    "end_time": event.event.start.format("yyyy-MM-dd 00:00:00"),
+                    'type':team_type
+                } 
+                post_common_service( "teamClass/getClassListAndUsers",data,function(data){
+
+                    $(".tr-1,.tr-2,.tr-3").empty();
+                    if(data.length ==0){
+                        $(".tr-1").append("<td>早班 6:00 - 12:00</td>");
+                        $(".tr-2").append("<td>中班 12:00 - 20:00</td>");
+                        $(".tr-3").append("<td>晚班 20:00 - 6:00</td>");
+                        for(var i=0;i<lans;i++){
+                             $(".tr-1,.tr-2,.tr-3").append("<td></td>");
+                        }
+                    }
+
+                    for(var i=0;i<data.length;i++){
+                        if(data[i].class_type == 1){
+                            $(".tr-1").append("<td>早班 6:00 - 12:00</td>");
+                            var selectv = "<select class='form-control'>"
+                            for(var j=0;j<data[i].users.length;j++){
+                                    var obj = data[i].users[j];
+                                    console.log(obj);
+                                    selectv += ("<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>");
+                            }
+                            selectv += "</select>";
+                            for(var z=0;z<lans;z++){
+                                 $(".tr-1").append("<td>"+ selectv +"</td>")
+                            }
+                        }else if(data[i].class_type == 2){
+                             $(".tr-2").append("<td>中班 12:00 - 20:00</td>");
+
+                            var selectv2 = "<select class='form-control'>"
+                            for(var j=0;j<data[i].users.length;j++){
+                                 if(data[i].users[j]!=null)
+                                selectv2 += ("<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>")
+                            }
+                            selectv2 += "</select>";
+
+                            for(var z=0;z<lans;z++){
+                                 $(".tr-2").append("<td>"+ selectv2 +"</td>")
+                            }
+                        }else if(data[i].class_type == 3){
+                            $(".tr-3").append("<td>晚班 20:00 - 6:00</td>");
+
+                            var selectv3 = "<select class='form-control'>"
+                            for(var j=0;j<data[i].users.length;j++){
+                                 if(data[i].users[j]!=null)
+                                selectv3 += "<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>"
+                            }
+                            selectv3 += "</select>";
+
+                            for(var z=0;z<lans;z++){
+                                 $(".tr-3").append("<td>"+ selectv3 +"</td>")
+                            }
+                        }
+                    }
+                },function(error){
+                    return "" ;
+                })
+
+
             }else{
                 click_function(event.event.start);
             }
@@ -239,8 +334,8 @@
             }
         })
 
-        $("#close_btn").click(function(){
-            $('#myModal').modal('hide');
+        $(".close_btn").click(function(){
+            $('#myModal,#add_fee_station').modal('hide');
         })
 
         // 获取部门为1的班组信息

VisualInspection/view/term_management/charge_stuff_schedule.html

@@ -12,9 +12,6 @@
 <div class="modal fade" id="myModal">
     <div class="modal-dialog">
         <div class="modal-content">
-            
-        </div>
-        <div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
         <h4 class="modal-title">添加排班</h4>
@@ -58,7 +55,7 @@
                     <hr>
                     <div class="form-group">
                         <div class="col-sm-12">
-                            <button  style="float:right;margin-right:10px;" id="close_btn" class="btn btn">关闭</button>
+                            <button  style="float:right;margin-right:10px;" class="btn btn close_btn">关闭</button>
                             <button type="submit" style="float:right;margin-right:10px;" id="save_term_class" class="btn btn-info">生成今日排班</button>
                         </div>
                     </div>
@@ -73,47 +70,38 @@
 
 
 <div class="modal fade" id="add_fee_station">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            
-        </div>
+    <div class="modal-dialog modal-lg">
         <div class="modal-content">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
-        <h4 class="modal-title">添加排班</h4>
+        <h4 class="modal-title">收费站排班表</h4>
     </div>
     <div class="modal-body">
             <!-- 添加对话框 -->
             <div class="container-fluid ">
-                <div class="form-horizontal">
-                    <div class="form-group">
-                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">早班</label>
-                        <div class="col-md-6 col-sm-8">
-                            <select id="mooring_term" type="text" class="form-control class_team_1" >
-                                <option value=''>请选择班组</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">中班</label>
-                        <div class="col-md-6 col-sm-8">
-                            <select id="middle_term" type="text" class="form-control class_team_2" >
-                                <option value=''>请选择班组</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">晚班</label>
-                        <div class="col-md-6 col-sm-8">
-                            <select id="night_term" type="text" class="form-control class_team_3" >
-                                <option value=''>请选择班组</option>
-                            </select>
-                        </div>
+                    <div>
+                        <table class="table">
+                            <thead class="thread_charge">
+                               
+                            </thead>
+                            <tbody class="tbody">
+                                <tr class="tr-1">
+                                 
+                                </tr>
+                                <tr  class="tr-2">
+                                  
+                                </tr>
+                                <tr  class="tr-3">
+                                   
+                                </tr>
+                            </tbody>
+                        </table>
+
                     </div>
-                    <hr>
+                  
                     <div class="form-group">
                         <div class="col-sm-12">
-                            <button  style="float:right;margin-right:10px;" id="close_btn" class="btn btn">关闭</button>
+                            <button  style="float:right;margin-right:10px;" class="btn btn close_btn">关闭</button>
                             <button type="submit" style="float:right;margin-right:10px;" id="save_term_class" class="btn btn-info">生成今日排班</button>
                         </div>
                     </div>

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

@@ -1,6 +1,7 @@
 package com.xintong.visualinspection.bean;
 
 import java.util.Date;
+import java.util.List;
 
 import javax.validation.constraints.NotNull;
 
@@ -47,4 +48,6 @@ public class TeamClass {
     
     private Integer type ;
     
+    private List<User> users;
+    
 }

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

@@ -2,6 +2,8 @@ package com.xintong.visualinspection.controller;
 
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -15,6 +17,7 @@ import com.github.pagehelper.PageInfo;
 import com.xintong.system.err.BusinessException;
 import com.xintong.visualinspection.bean.FeeStation;
 import com.xintong.visualinspection.bean.Organ;
+import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.DepartmentService;
 
 /**
@@ -143,4 +146,11 @@ public class DepartmentController extends BaseController {
     	return returnResult(0, "获取成功", organs);
     }
     
+    @RequestMapping(value = "/getFsByDept",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getAFsByDeptId(HttpServletRequest request){
+    	User u = getCurrentUser(request);
+    	FeeStation feestation = departmentService.getFSByDeptId(u.getOrganid());
+    	return returnResult(0, "获取成功", feestation);
+    }
+    
 }

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

@@ -128,4 +128,26 @@ public class TeamClassController extends BaseController {
     	List<TeamClass> tcList = teamClassService.getClassList(teamClass);
     	return super.returnSuccessResult(tcList);
     }
+    /**
+     * 查询值班信息和班组内的人员
+     * @param teamClass
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/getClassListAndUsers")
+    public String getClassListAndUsers(@RequestBody TeamClass teamClass,HttpServletRequest request){
+    	if(teamClass.getDept_id()==null){
+    		User u = getCurrentUser(request);
+    		teamClass.setDept_id(u.getOrganid()+0L);
+    	}
+    	if(teamClass.getStart_time()==null){
+    		throw new BusinessException(20902);
+    	}
+    	if(teamClass.getEnd_time()==null){
+    		throw new BusinessException(20903);
+    	}
+    	List<TeamClass> tcList = teamClassService.getClassListAndUsers(teamClass);
+    	return super.returnSuccessResult(tcList);
+    }
+    
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/cluster/DepartmentDao.java

@@ -19,4 +19,5 @@ public interface DepartmentDao  {
     public void update(Organ organ);
     public void delete(Integer id);
     public List<FeeStation> getAllFS();
+    public FeeStation getFsBydeptId(Integer id);
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/DepartmentMapper.xml

@@ -21,7 +21,7 @@
         <result column="entrance_numer" property="entrance_numer" jdbcType="VARCHAR" />
         <result column="exit_etc" property="exit_etc" jdbcType="VARCHAR" />
         <result column="entrance_etc" property="entrance_etc" jdbcType="VARCHAR" />
-        <result column="deptid" property="deptid" jdbcType="VARCHAR" />
+        <result column="organ_id" property="deptid" jdbcType="VARCHAR" />
     </resultMap>
     <select id="getAll" resultMap="BaseResultMap"  >
         SELECT * 
@@ -37,6 +37,11 @@
     <select id="getAllFS" resultMap="FeeStationMap">
         SELECT * FROM t_br_layer_fee_station
     </select>
+    
+    <select id="getFsBydeptId" parameterType="java.lang.Integer" resultMap="FeeStationMap">
+        SELECT * FROM t_br_layer_fee_station where organ_id = #{id}
+    </select>
+    
     <select id="getOrgan" parameterType="com.xintong.visualinspection.bean.Organ" resultMap="BaseResultMap">
         SELECT 
         id,organname,remark,parentid,classtype,organcode,isshow,deptype,status

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

@@ -25,7 +25,7 @@
     </select>
     
     <select id="getClassList" parameterType="com.xintong.visualinspection.bean.TeamClass" resultMap="BaseResultMap" >
-        SELECT * FROM ( SELECT t.* ,st.name as team_name,st.type
+        SELECT * FROM ( SELECT t.id,t.work_date,t.dept_id,t.class_type,t.team_id,t.start_time,t.end_time,st.user_ids ,st.name as team_name,st.type
         FROM sys_team_class t left join sys_team st ON t.team_id = st.id
         WHERE 1=1
         <if test="dept_id != null">AND t.dept_id = #{dept_id}</if>

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/DepartmentService.java

@@ -20,4 +20,6 @@ public interface DepartmentService {
 	public void delete(Integer id);
 	
 	public List<FeeStation> getAllFS();
+	
+	public FeeStation getFSByDeptId(Integer dept_id);
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/TeamClassService.java

@@ -19,6 +19,7 @@ import com.xintong.visualinspection.bean.TeamClass;
  */
 public interface TeamClassService {
     public List<TeamClass> getClassList(TeamClass teamClass);
+    public List<TeamClass> getClassListAndUsers(TeamClass teamClass);
     public TeamClass getById(Long id);
     public void insert(TeamClass teamClass);
     public void update(TeamClass teamClass);

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

@@ -91,4 +91,9 @@ public class DepartmentServiceImpl extends BaseService implements DepartmentServ
 		return departmentDao.getAll();
 	}
 
+	@Override
+	public FeeStation getFSByDeptId(Integer id) {
+		return departmentDao.getFsBydeptId(id);
+	}
+
 }

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

@@ -1,5 +1,6 @@
 package com.xintong.visualinspection.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.slf4j.LoggerFactory;
@@ -7,9 +8,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.xintong.visualinspection.bean.TeamClass;
+import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.dao.master.TeamClassDao;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.TeamClassService;
+import com.xintong.visualinspection.util.CacheUtil;
 
 /**
  * 文件名：UserServiceImpl
@@ -31,6 +34,26 @@ public class TeamClassServiceImpl extends BaseService implements TeamClassServic
 		return teamClassDao.getClassList(teamClass);
 	}
 
+	@Override
+	public List<TeamClass> getClassListAndUsers(TeamClass teamClass) {
+		List<TeamClass> lists = teamClassDao.getClassList(teamClass);
+		for(TeamClass obj : lists){
+			String[] user_ids = obj.getUser_ids().split(",");
+			List<User> userList = new ArrayList<>();
+			for(int i=0;i<user_ids.length;i++){
+				User u = CacheUtil.userMap.get(Integer.valueOf(user_ids[i]) +0L); 
+				if( u != null){
+					User user =new User();
+					user.setId(u.getId());
+					user.setTruename(u.getTruename());
+					userList.add(user);
+				}
+			}
+			obj.setUsers(userList);
+		}
+		return lists;
+	}
+	
 
 	@Override
 	public TeamClass getById(Long id) {
@@ -69,4 +92,5 @@ public class TeamClassServiceImpl extends BaseService implements TeamClassServic
 		// TODO Auto-generated method stub
 		teamClassDao.delete(id);
 	}
+
 }