Revert "收费更改"

This reverts commit befe66efc6baa353b3aba508d2d99ea5cce2cb16.

VisualInspection/js/config.js

@@ -1,6 +1,6 @@
-// var base_ui_url = "http://192.168.68.126:8081/";
-// var base_server_url = "http://192.168.68.126:8089/";
+var base_ui_url = "http://192.168.68.126:8081/";
+var base_server_url = "http://192.168.68.126:8089/";
 var base_image_server_url = "http://192.168.68.126:8080/";
 
-var base_ui_url = "http://localhost:8080/";
-var base_server_url = "http://localhost:8089/";
+// var base_ui_url = "http://localhost:8081/";
+// var base_server_url = "http://localhost:8089/";

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -8,10 +8,8 @@
    function initChargeTeamSchedule(){
          $("#main_content_title").html("收费人员排班")
 
-        var user = $.zui.store.get("user") ;  // 缓存用户信息，取出dept_id
-
         // 用户的dept_id
-        var user_dept_id = user.organid ;
+        var user_dept_id = '' ;
         
         // 收费小组type
         var team_type = 1 ;
@@ -19,7 +17,8 @@
         // 日期游标
         var date_cursor = 0 ;
 
-       
+        // var user = $.zui.store.get("user") ;  // 缓存用户信息，取出dept_id
+        // console.log(user); 
 
         $('#calendar').calendar();
         var calendar = $('#calendar').data('zui.calendar');
@@ -90,10 +89,12 @@
             get_common_service( "dept/getFsByDept","",function(data){
                 if(data != null){
                     $(".thread_charge").append("<th>"+data.name+"</th>");
-                    $(".thread_charge").append("<th>值班室</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>");
+                        $(".thread_charge").append("<th>车道"+(i+1)+"</th>");
                     }
                 }
             },function(error){
@@ -164,40 +165,28 @@
                 var cache = $(".tr-"+j).data("cache");
 
                 if(cache) {
-                    for(var i=0;i<lans+1;i++){
-                        var obj = { "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":work_date, "end_time":work_date,"lane":i };
+                    for(var i=0;i<lans;i++){
+                        var obj = { "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":work_date, "end_time":work_date,"lane":i+1 };
                         dutyList.push(obj);
                     }
                 }
-            }
-            $("#save_user_class").attr("disabled","disabled");
 
-            if($("#save_user_class").data("modify_flag")){
-                $("#save_user_class").data("modify_flag",false);
-                post_common_service( "userClass/updateList",dutyList,function(data){
-                    tip("修改成功");
-                    $('#add_fee_station').modal('hide');
-                     $("#save_user_class").attr("disabled",false );
-                },function(error){
-                    return "" ;
-                })
-                return ;
             }
-
+            $("#save_user_class").attr("disabled","disabled");
             post_common_service( "userClass/addList",dutyList,function(data){
-                tip("添加成功");
+               tip("添加成功");
                 $('#add_fee_station').modal('hide');
-                $("#save_user_class").attr("disabled",false );
             },function(error){
                 return "" ;
             })
+
+        
         })
 
         $('#calendar').calendar().on("clickEvent.zui.calendar", function(event) {
             // console.log(event。event.id);
             if(event.event.id == -1){
-
-                // 这边负责添加整个页面的数据 按车道排班 
+                // 这边负责添加整个页面的数据 按车道排班
                 $('#add_fee_station').modal();
                 $(".modal-title").html("收费站排班表-"+event.event.start.format("yyyy-MM-dd"));
 
@@ -210,7 +199,7 @@
                     'type':team_type
                 } 
                 post_common_service( "teamClass/getClassListAndUsers",data,function(data){
-                    $("#save_user_class").html("生成今日值班");
+
                     $(".tr-1,.tr-2,.tr-3").empty();
 
                     for(var i=0;i<data.length;i++){
@@ -224,7 +213,7 @@
                                     selectv += ("<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>");
                             }
                             selectv += "</select>";
-                            for(var z=0;z<lans+1;z++){
+                            for(var z=0;z<lans;z++){
                                  $(".tr-1").append("<td>"+ selectv +"</td>")
                             }
                         }else if(data[i].class_type == 2){
@@ -237,7 +226,7 @@
                             }
                             selectv2 += "</select>";
 
-                            for(var z=0;z<lans+1;z++){
+                            for(var z=0;z<lans;z++){
                                  $(".tr-2").append("<td>"+ selectv2 +"</td>")
                             }
                         }else if(data[i].class_type == 3){
@@ -250,7 +239,7 @@
                             }
                             selectv3 += "</select>";
 
-                            for(var z=0;z<lans+1;z++){
+                            for(var z=0;z<lans;z++){
                                  $(".tr-3").append("<td>"+ selectv3 +"</td>")
                             }
                         }
@@ -259,7 +248,7 @@
                         $(".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+1;i++){
+                        for(var i=0;i<lans;i++){
                              $(".tr-1,.tr-2,.tr-3").append("<td></td>");
                         }
                     }else{
@@ -271,25 +260,9 @@
                         }
 
                         post_common_service( "userClass/getList",param,function(data){
-                                // 这边将值班数据检索出来，初始化收费站车道排班中
                                 // console.log(data);
-                                if(data.length > 0){
-                                    $("#save_user_class").data("modify_flag",true);
-                                    $("#save_user_class").html("修改今日值班");
-                                }else{
-                                     $("#save_user_class").html("生成今日值班");
-                                      $("#save_user_class").data("modify_flag",false);
-                                }
-                                console.log(data);
                                 for(var i=0;i<data.length;i++){
-                                    // if(data[i].class_type == 1){
-
-                                    // }else if(data[i].class_type == 2){
-
-                                    // }else if(data[i].class_type == 3){
-
-                                    // }
-                                    $(".table .tr-"+data[i].class_type+" select").eq(i%(lans+1)).val(data[i].user_id);
+                                    $(".table select").eq(i).val(data[i].user_id);
                                 }
                             },function(error){
                                 return "" ;

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

@@ -42,15 +42,4 @@ public class UserClassController extends BaseController {
     	return super.returnSuccessResult(list);
     }
     
-    /**
-     * 更新收费站车道值班
-     * @param list
-     * @return
-     */
-    @RequestMapping(value = "/updateList")
-    public String updateList(@RequestBody List<UserClass> list){
-    	userClassService.updateList(list);
-    	return super.returnSuccessResult("修改成功");
-    }
-    
 }

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

@@ -15,11 +15,4 @@
    		SELECT * from sys_user_class where work_date = #{work_date} and dept_id=#{dept_id} order by class_type asc , lane asc
    </select>
    
-   <delete id="delete" parameterType="com.xintong.visualinspection.bean.UserClass">
-   		DELETE FROM
-        sys_user_class
-        WHERE
-        work_date =#{work_date} and dept_id=#{dept_id}
-   </delete>
-   
 </mapper>

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

@@ -33,10 +33,8 @@ public class UserClassServiceImpl extends BaseService implements UserClassServic
 
 	@Override
 	public void updateList(List<UserClass> list) {
-		userClassDao.delete(list.get(0));
-		for(int i=0;i<list.size();i++){
-			userClassDao.insert(list.get(i));
-		}
+		// TODO Auto-generated method stub
+		
 	}
 
 	@Override