收费排班

.gitignore

@@ -12,3 +12,4 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
+jicha/

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -93,7 +93,7 @@
                 if(data != null){
                     $(".thread_charge").append("<th>"+data.name+"</th>");
                     $(".thread_charge").append("<th>值班室</th>");
-                    console.log(data);
+                    // console.log(data);
                     lans = data.lanes_number;
                     entrance_number = data.entrance_numer ;
                     exit_number = data.exit_numer ;
@@ -112,6 +112,28 @@
             })
         }
 
+        getClassCode();
+
+        var classCode = {};
+
+
+        /**
+         * 获取班组信息
+         */
+        function getClassCode(){
+            var data = {} ;
+            post_common_service( "teamClass/getClassCode",data,function(data){
+                for(var i=0;i<data.length;i++){
+                    classCode[data[i].code] = data[i];
+                }
+                console.log(classCode);
+                $(".class_type_1").html(classCode[1].class_name);
+                $(".class_type_2").html(classCode[2].class_name);
+                $(".class_type_3").html(classCode[3].class_name);
+            },function(error){
+                return "" ;
+            })
+        }
 
         // 更新日历数据
         function updateCalendar(data){
@@ -229,7 +251,8 @@
                     for(var i=0;i<data.length;i++){
                         if(data[i].class_type == 1){
                             $(".tr-1").data("cache",data[i]);
-                            $(".tr-1").append("<td>早班 6:00 - 12:00</td>");
+                            // $(".tr-1").append("<td>早班 6:00 - 12:00</td>");
+                             $(".tr-1").append("<td>"+ classCode["1"].class_name +" "+classCode["1"].start_time+" - "+classCode["1"].end_time +"</td>");
                             var selectv = "<select class='form-control'>"
                                     // console.log(data[i]);
                             selectv += ("<option value=''>请选择人员</option>");
@@ -251,7 +274,8 @@
 
 
                         }else if(data[i].class_type == 2){
-                             $(".tr-2").append("<td>中班 12:00 - 20:00</td>");
+                            //  $(".tr-2").append("<td>中班 12:00 - 20:00</td>");
+                            $(".tr-2").append("<td>"+ classCode[2].class_name +" "+classCode[2].start_time+" - "+classCode[2].end_time +"</td>");
                               $(".tr-2").data("cache",data[i]);
                             var selectv2 = "<select class='form-control'>"
                             selectv2 += ("<option value=''>请选择人员</option>");
@@ -272,7 +296,8 @@
                                $(".tr-2").append("<td class='c-2--"+(z+1)+"' tag='-"+(z+1)+"'>"+ selectv2 +"</td>")
                             }
                         }else if(data[i].class_type == 3){
-                            $(".tr-3").append("<td>晚班 20:00 - 6:00</td>");
+                            // $(".tr-3").append("<td>晚班 20:00 - 6:00</td>");
+                             $(".tr-3").append("<td>"+ classCode[3].class_name +" "+classCode[3].start_time+" - "+classCode[3].end_time +"</td>");
                              $(".tr-3").data("cache",data[i]);
                             var selectv3 = "<select class='form-control'>"
                             selectv3 += ("<option value=''>请选择人员</option>");
@@ -296,9 +321,9 @@
                         }
                     }
                      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>");
+                        $(".tr-1").append("<td>"+ classCode["1"].class_name +" "+classCode["1"].start_time+" - "+classCode["1"].end_time +"</td>");
+                        $(".tr-2").append("<td>"+ classCode[2].class_name +" "+classCode[2].start_time+" - "+classCode[2].end_time +"</td>");
+                        $(".tr-3").append("<td>"+ classCode[3].class_name +" "+classCode[3].start_time+" - "+classCode[3].end_time +"</td>");
                         for(var i=0;i<lans+1;i++){
                              $(".tr-1,.tr-2,.tr-3").append("<td></td>");
                         }
@@ -417,8 +442,8 @@
                         "class_type":i+1,
                         "team_id":$("select[id*='_term']").eq(i).val(),
                         "work_date": $("#save_term_class").data("date")+" 00:00:00",
-                        "start_time": $("#save_term_class").data("date")+" 00:00:00",
-                        "end_time": $("#save_term_class").data("date")+" 00:00:00",
+                        "start_time": $("#save_term_class").data("date")+" "+ classCode[i+1].start_time+":00" ,
+                        "end_time": $("#save_term_class").data("date")+" "+classCode[i+1].end_time+":00",
                         "dept_id":user_dept_id
                     };
                     data.push(obj);
@@ -470,9 +495,9 @@
        if(class_type == 1){
            return "早班";
        }else if(class_type == 2){
-            return "中班";
+            return  "中班";
        }else if(class_type == 3){
-           return "晚班";
+           return  "晚班";
        }else if(class_type == 4){
            return "全班";
        }

VisualInspection/view/term_management/charge_stuff_schedule.html

@@ -21,7 +21,7 @@
             <div class="container-fluid ">
                 <div class="form-horizontal">
                     <div class="form-group">
-                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">早班</label>
+                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2 class_type_1"></label>
                         <div class="col-md-6 col-sm-8">
                             <select id="mooring_term" type="text" class="form-control class_team_1" >
                                 <option value=''>请选择班组</option>
@@ -29,7 +29,7 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">中班</label>
+                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2 class_type_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>
@@ -37,7 +37,7 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">晚班</label>
+                        <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2 class_type_3"></label>
                         <div class="col-md-6 col-sm-8">
                             <select id="night_term" type="text" class="form-control class_team_3" >
                                 <option value=''>请选择班组</option>

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

@@ -0,0 +1,28 @@
+package com.xintong.visualinspection.bean;
+
+import lombok.Data;
+
+/**
+ * 文件名：ScoreDeducting
+ * 版本信息：日期：2017/4/18 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Data
+public class ClassCode {
+    //编号
+    private Long id;
+  
+    //上班时间
+
+    private String start_time;
+   
+    private String end_time;
+    
+    private String class_name ;
+    
+
+    
+    private Integer position_id ;
+    
+    private Integer code ;
+    
+}

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

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.xintong.system.err.BusinessException;
+import com.xintong.visualinspection.bean.ClassCode;
 import com.xintong.visualinspection.bean.TeamClass;
 import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.service.TeamClassService;
@@ -158,4 +159,18 @@ public class TeamClassController extends BaseController {
     	return super.returnSuccessResult(tcList);
     }
     
+    /**
+     * 获取team_class 信息
+     * @param teamClass
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/getClassCode")
+    public String getClassCodeInfo(@RequestBody ClassCode classCode){
+    	
+    	List<TeamClass> tcList = teamClassService.getClassCode(classCode);
+    	return super.returnSuccessResult(tcList);
+    }
+    
+    
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/TeamClassDao.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Mapper;
 
+import com.xintong.visualinspection.bean.ClassCode;
 import com.xintong.visualinspection.bean.TeamClass;
 
 /**
@@ -18,5 +19,7 @@ public interface TeamClassDao  {
     public void update(TeamClass teamClass);
     public void delete(Long id);
     public void deleteByDeptWorkdate(TeamClass teamClass);
+    
+    public List<TeamClass> getClassCode(ClassCode teamClass);
    
 }

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

@@ -71,4 +71,11 @@
         work_date =#{work_date} and dept_id=#{dept_id}
     </delete>
     
+    <select id="getClassCode" parameterType="com.xintong.visualinspection.bean.ClassCode" resultType="com.xintong.visualinspection.bean.ClassCode">
+    	SELECT * FROM sys_class_type where 1=1 
+    	<if test="position_id!=null">
+    		AND position_id = #{position_id}
+    	</if>
+    </select>
+    
 </mapper>

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

@@ -2,7 +2,7 @@ package com.xintong.visualinspection.service;
 
 import java.util.List;
 
-import com.xintong.visualinspection.bean.Constant;
+import com.xintong.visualinspection.bean.ClassCode;
 import com.xintong.visualinspection.bean.TeamClass;
 
 /**
@@ -25,4 +25,6 @@ public interface TeamClassService {
     public void update(TeamClass teamClass);
     public void delete(Long id);
     public void updateList(List<TeamClass> teamClasses);
+    
+    public List<TeamClass> getClassCode(ClassCode teamClass);
 }

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

@@ -7,6 +7,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.xintong.visualinspection.bean.ClassCode;
 import com.xintong.visualinspection.bean.TeamClass;
 import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.dao.master.TeamClassDao;
@@ -93,4 +94,10 @@ public class TeamClassServiceImpl extends BaseService implements TeamClassServic
 		teamClassDao.delete(id);
 	}
 
+	@Override
+	public List<TeamClass> getClassCode(ClassCode teamClass) {
+		// TODO Auto-generated method stub
+		return teamClassDao.getClassCode(teamClass);
+	}
+
 }