Merge branch 'master' of http://git_xt.jsxt.jsjtyxt.com/wenhongquan/VisualInspection

# Conflicts:
#	VisualInspection/js/config.js

VisualInspection/css/statistics/road_manage_statistics.css

@@ -5,7 +5,7 @@
     border:1px solid #d9d9d9;
     font-family: '宋体';
     border-radius: 4px;
-    font-size: 12px;
+    font-size: 15px;
 }
 .row-1{
     width:100%;
@@ -41,14 +41,14 @@
     line-height: 50px;
 }
 .div-roadManage{
-    width:80px;
+    width:120px;
     height:50px;
     float:left;
     margin-left: 20px;
     line-height: 50px;
 }
 .div-roadManage select{
-    width:80px;
+    width:120px;
     height:30px;
     border: 1px solid #ccc;
     border-radius: 4px;

VisualInspection/css/statistics/toll_station_statistics.css

@@ -5,7 +5,7 @@
     border:1px solid #d9d9d9;
     font-family: '宋体';
     border-radius: 4px;
-    font-size: 12px;
+    font-size: 15px;
 }
 .row-1{
     width:100%;
@@ -249,4 +249,8 @@
     height: 442px;
     margin:15px auto;
     border:1px solid #328dc7;
+}
+span{
+    font-family: '宋体';
+    font-size:15px;
 }

VisualInspection/css/statistics/total_company_statistics.css

@@ -5,7 +5,7 @@
     border:1px solid #d9d9d9;
     font-family: '宋体';
     border-radius: 4px;
-    font-size: 12px;
+    font-size: 15px;
 }
 .row-1{
     width:100%;

VisualInspection/js/statistics/change_attendance.js

@@ -12,8 +12,15 @@ $(function(){
         });
     });
 
+
+    // 当初始化月份值
+    var months = month_method_2();
+    for(var i=0; i < months.length;i++){
+        $("#sel_month").append('<option value= "'+ months[i]  +'">'+ months[i] +'</option>');
+    }
+
     // 当前月份初始化
-    $("#sel_month").val(getM()-1);
+    $("#sel_month").val(months[months.length-1 ]);
 
     // 根据月份确定天数
     monthChange();
@@ -59,8 +66,8 @@ $(function(){
 function getFsWorkInfo(){
 
     var param = {
-        "start_time": "2017-"+(GV("#sel_month")-1)+"-25 23:00:00" ,
-        "end_time": "2017-"+GV("#sel_month")+"-25 23:00:00"
+           "start_time": timeTranslate( GV("#sel_month") ) ,
+            "end_time": (GV("#sel_month")+"/25 23:00:00").replace("/","-").replace("/","-")
     }
     
     if(GV("#fs_employee")!=''){
@@ -92,7 +99,7 @@ function getFsWorkInfo(){
  * @param {*} seq 
  */
 function getTableContent(obj,seq){
-    var days = getDays(GV("#sel_month")-1);
+    var days = getDaysByDate(GV("#sel_month")+"/01");
     var map_class = {};
     for(var z=0; z < obj.subStatisticsFsWork.length ;z++){
         if(obj.subStatisticsFsWork[z].check_id !=undefined){
@@ -146,5 +153,5 @@ function getTableContent(obj,seq){
  */
 function monthChange(){
     $(".m28").show();
-    $(".m"+getDays(GV("#sel_month")-1)).hide();
+    $(".m"+getDaysByDate(GV("#sel_month")+"/01")).hide();
 }

VisualInspection/js/statistics/change_work.js

@@ -13,10 +13,11 @@ $(function(){
     });
 
     // 当前月份初始化
-    $("#sel_month").val(getM()-1);
-
-    $("#month_name").html( $("#sel_month").find("option:selected").text());
-
+    // $("#sel_month").val(getM()-1);
+    // $("#month_name").html( $("#sel_month").find("option:selected").text());
+    // 时间初始化
+    $("#start-time").val( new Date().getFullYear()+'-'+ (getM()-1) +"-25");
+    $("#end-time").val( new Date().getFullYear()+'-'+ (getM()) +"-25");
 
     // 收费站中心选择
     $("#fs_station").change(function(){
@@ -44,7 +45,7 @@ $(function(){
 
     // 查询
     $("#searchBtn").click(function(){        
-        $("#month_name").html( $("#sel_month").find("option:selected").text()  )
+        // $("#month_name").html( $("#sel_month").find("option:selected").text()  )
         getFsWorkInfo();
     })
     // end
@@ -56,9 +57,13 @@ $(function(){
  */
 function getFsWorkInfo(){
 
+    // var param = {
+    //     "start_time": "2017-"+(GV("#sel_month")-1)+"-25 23:00:00" ,
+    //     "end_time": "2017-"+GV("#sel_month")+"-25 23:00:00"
+    // }
     var param = {
-        "start_time": "2017-"+(GV("#sel_month")-1)+"-25 23:00:00" ,
-        "end_time": "2017-"+GV("#sel_month")+"-25 23:00:00"
+        "start_time": GV("#start-time")+" 23:00:00" ,
+        "end_time": GV("#end-time")+" 23:00:00"
     }
     
     if(GV("#fs_employee")!=''){

VisualInspection/js/statistics/common_attendance.js

@@ -12,8 +12,15 @@ $(function(){
         });
     });
 
+    // 当初始化月份值
+    var months = month_method_2();
+    for(var i=0; i < months.length;i++){
+        $("#sel_month").append('<option value= "'+ months[i]  +'">'+ months[i] +'</option>');
+    }
+
+
     // 当前月份初始化
-    $("#sel_month").val(getM()-1);
+    $("#sel_month").val(months[months.length-1 ]);
 
     // 根据月份确定天数
     monthChange();
@@ -50,6 +57,7 @@ $(function(){
         getFsWorkInfo();
     })
     // end
+
     /**
      * 检索出勤明细数据
      * @param {*} param 
@@ -57,8 +65,8 @@ $(function(){
     function getFsWorkInfo(){
 
         var param = {
-            "start_time": "2017-"+(GV("#sel_month")-1)+"-25 23:00:00" ,
-            "end_time": "2017-"+GV("#sel_month")+"-25 23:00:00"
+            "start_time": timeTranslate( GV("#sel_month") ) ,
+            "end_time": (GV("#sel_month")+"/25 23:00:00").replace("/","-").replace("/","-")
         }
         
         if(GV("#fs_employee")!=''){
@@ -92,7 +100,7 @@ $(function(){
  * @param {*} seq 
  */
 function getTableContent(obj,seq){
-    var days = getDays(GV("#sel_month")-1);
+    var days = getDaysByDate(GV("#sel_month")+"/01");
     var map_class = {};
     for(var z=0; z < obj.subStatisticsFsWork.length ;z++){
         if(obj.subStatisticsFsWork[z].check_id !=undefined){
@@ -146,5 +154,5 @@ function getTableContent(obj,seq){
  */
 function monthChange(){
     $(".m28").show();
-    $(".m"+getDays(GV("#sel_month")-1)).hide();
+    $(".m"+getDaysByDate(GV("#sel_month")+'/01')).hide();
 }

VisualInspection/js/statistics/common_statistic.js

@@ -136,6 +136,33 @@ function getDays(mouth,datet){
     return days ;
 }
 
+/**
+ * 根据月份，判断当前月份天数
+ * param： datet String 年份
+ * return：days（ 28,29,30,31 ）
+ */
+function getDaysByDate(datet){
+    //构造当前日期对象
+    var date = new Date(datet);
+    //获取年份
+    var year = date.getFullYear();
+    var mouth = date.getMonth() +1 ;
+    //定义当月的天数；
+    var days ;
+    //当月份为二月时，根据闰年还是非闰年判断天数
+    if(mouth == 2){
+            days= year % 4 == 0 ? 29 : 28;
+    }
+    else if(mouth == 1 || mouth == 3 || mouth == 5 || mouth == 7 || mouth == 8 || mouth == 10 || mouth == 12){
+        //月份为：1,3,5,7,8,10,12 时，为大月.则天数为31；
+        days= 31;
+    }
+    else{
+        days= 30;   
+    }
+    return days ;
+}
+
 
 var months = new Array();
 var m = new Date().getMonth();
@@ -200,4 +227,22 @@ function month_method_2(){
 // 数字前面补0
 function PrefixInteger(num, length) {
     return (Array(length).join('0') + num).slice(-length);
+}
+
+/**
+ * 
+ * @param {*} str  ep:2017/06
+ * returns 2017-05-25 23:00:00
+ */
+function timeTranslate(str){
+    var strs = str.split("/") ;
+    var year = strs[0];
+    var month = strs[1];
+    var month2 = month - 1 ;
+    var year2 = year ;
+    if( month2 == 0 ){
+        year2 = year2 - 1 ;
+        month2 = 12 ;
+    }
+    return year2 + "-"+month2 + "-25 23:00:00" ;
 }

VisualInspection/js/statistics/common_work.js

@@ -13,10 +13,11 @@ $(function(){
     });
 
     // 当前月份初始化
-    $("#sel_month").val(getM()-1);
-
-    $("#month_name").html( $("#sel_month").find("option:selected").text());
+    // $("#sel_month").val(getM()-1);
 
+    // $("#month_name").html( $("#sel_month").find("option:selected").text());
+     $("#start-time").val( new Date().getFullYear()+'-'+ (getM()-1) +"-25");
+     $("#end-time").val( new Date().getFullYear()+'-'+ (getM()) +"-25");
 
     // 收费站中心选择
     $("#fs_station").change(function(){
@@ -44,7 +45,7 @@ $(function(){
 
     // 查询
     $("#searchBtn").click(function(){        
-        $("#month_name").html( $("#sel_month").find("option:selected").text()  )
+        // $("#month_name").html( $("#sel_month").find("option:selected").text()  )
         getFsWorkInfo();
     })
     // end
@@ -56,9 +57,13 @@ $(function(){
  */
 function getFsWorkInfo(){
 
+    // var param = {
+    //     "start_time": "2017-"+(GV("#sel_month")-1)+"-25 23:00:00" ,
+    //     "end_time": "2017-"+GV("#sel_month")+"-25 23:00:00"
+    // }
     var param = {
-        "start_time": "2017-"+(GV("#sel_month")-1)+"-25 23:00:00" ,
-        "end_time": "2017-"+GV("#sel_month")+"-25 23:00:00"
+        "start_time": GV("#start-time")+" 23:00:00" ,
+        "end_time": GV("#end-time")+" 23:00:00"
     }
     
     if(GV("#fs_employee")!=''){

VisualInspection/js/statistics/personal_data_statistics.js

@@ -308,7 +308,7 @@ $(function(){
                     }
                     },
 					grid:{
-                    width:"80%"
+                    width:"75%"
                     },
 					legend: {
 						data:['平均分']
@@ -404,14 +404,14 @@ $(function(){
 					{
 						name:'访问来源',
 						type:'pie',
-						radius : '65%',
+						radius : '55%',
 						center: ['50%', '50%'],
 						data:array_check_type,
 						itemStyle:{ 
 						normal:{ 
 							label:{ 
 								show: true, 
-								formatter: '{b} : {c}分 ({d}%)'  
+								formatter: '{b} :\n{c}分 ({d}%)'  
 							}, 
 							labelLine :{show:true} 
 							} 

VisualInspection/js/statistics/road_manage_statistics.js

@@ -31,6 +31,7 @@
 		var min_suff;
 		var flag = true;
 $(function(){
+	setVisit();
     // 公用方法，根据当前年月动态将13个月push数组
 	month_method();
 	// 公用方法，月份下拉框
@@ -38,8 +39,14 @@ $(function(){
 	// 回显当前年月份
 	$(".div-month select").val(initDate);
 
+	var road_manager;
+	if(roleContains("STATION")){
+        road_manager = getCurrentUser().road_manager_id;     
+    }
+	setRoadManagerSelect(".div-roadManage select",road_manager);
 	$(".div-button button").click(function(){	
 		var select_month = $(".div-month select").val();
+		console.log("fffffff"+select_month);
 		var select_road = $(".div-roadManage select").val();
 		if(flag ==true ){
 			init_company_year_assess("statistics/score/year/info",select_road);
@@ -256,7 +263,6 @@ $(function(){
 			array_allStation.length=0;
 			if(data!='' && data.length!=0){
 				for(var i=0;i<data.length;i++){
-					array_allStation.push(data[i].feeStationName.substr(0,data[i].feeStationName.length-3));
 					array_allStation_score.push((1000-(filter_handler(data[i].all_check_score,data[i].checked_num,data[i].people_num,0))));
 				}
 			}else{
@@ -267,6 +273,20 @@ $(function(){
 				min_station = 0;
 				else
 				min_station = 	eval("Math.min(" + array_allStation_score.toString() + ")").toFixed(0)-10;
+
+				// 给道管下的收费站排名次
+				var rank = new Array();
+				rank[0] = 1 ;
+				for(var i=1; i<array_allStation_score.length; i++){
+					if(array_allStation_score[i-1] == array_allStation_score[i]  ){
+						rank[i] = rank[i-1];
+					}else{
+						rank[i] = i + 1;
+					}				
+				}
+				for(var i=0;i<array_allStation_score.length;i++){
+					array_allStation.push(data[i].feeStationName.substr(0,data[i].feeStationName.length-3)+"\n"+ (rank[i]));
+				}
 		}else if(type == 4){
 			array_score_order.length=0;
 			array_score_data.length=0;
@@ -288,7 +308,6 @@ $(function(){
 			array_get_score.length=0;
 				if(data!='' && data.length!=0){
 					for(var i=0;i<data.length;i++){
-						array_score_last.push(data[i].user.truename+"\n"+"("+data[i].user.fee_station_name.substr(0,data[i].user.fee_station_name.length-3)+")");
 						array_get_score.push((1000-filter(data[i].all_check_score,data[i].checked_num,0)));
 				    }
 				 }else{
@@ -299,6 +318,21 @@ $(function(){
 				min_suff = 0;
 				else
 				min_suff = eval("Math.min(" + array_get_score.toString() + ")").toFixed(0)-10;
+
+				// 给道管中心人员考核得分后20名
+				var rank = new Array();
+				rank[0] = 1 ;
+				for(var i=1; i<array_get_score.length; i++){
+					if(array_get_score[i-1] == array_get_score[i]  ){
+						rank[i] = rank[i-1];
+					}else{
+						rank[i] = i +1;
+					}				
+				}
+				for(var i=0;i<array_get_score.length;i++){
+					array_score_last.push(data[i].user.truename+"\n"+"("+data[i].user.fee_station_name.substr(
+						0,data[i].user.fee_station_name.length-3)+")"+"\n"+ (rank[i]));
+				}
 	    }else if(type == 6){
 			array_check_type.length=0;
                 if(data.length != 0){
@@ -552,14 +586,14 @@ $(function(){
 					{
 						name:'访问来源',
 						type:'pie',
-						radius : '65%',
+						radius : '55%',
 						center: ['50%', '50%'],
 						data:array_points,
 						itemStyle:{ 
 						normal:{ 
 							label:{ 
 								show: true, 
-								formatter: '{b} : {c}人 ({d}%)'  
+								formatter: '{b} :\n{c}人 ({d}%)'  
 							}, 
 							labelLine :{show:true} 
 							} 
@@ -595,12 +629,15 @@ $(function(){
                     }
                 },
 				grid:{
-                    width:"80%",	
+                    width:"75%",	
                 },
 				calculable : true,
 				xAxis : [
 					{
 						type : 'category',
+						axisLabel :{  
+                           interval:0  // 显示x轴所有信息，不隐藏部分  
+                        },
 						data : array_allStation
 					}
 				],
@@ -844,7 +881,7 @@ $(function(){
 						normal:{ 
 							label:{ 
 								show: true, 
-								formatter: '{b} : {c}分 ({d}%)'  
+								formatter: '{b} :\n{c}分 ({d}%)' 
 							}, 
 							labelLine :{show:true} 
 							} 
@@ -927,8 +964,10 @@ $(function(){
 			]
 		};					
 					return option;
-			}
-			
-	
-   
-});
+		}  
+});
+function setVisit(){
+	if(roleContains("ROAD_MANAGER") || roleContains("STATION")){
+		$(".div-roadManage select").attr("disabled","disabled");
+	}
+}

VisualInspection/js/statistics/toll_station_statistics.js

@@ -31,9 +31,9 @@
 $(function(){     
 	setVisit();
     // 公用方法，根据当前年月动态将13个月push数组
-	month_method();
+	// month_method();
 	// 公用方法，月份下拉框
-    select_option();	
+    // select_option();	
 	$.jeDate("#month_date",{
 		isinitVal:true,
 		format: 'YYYY/MM' // 分隔符可以任意定义，该例子表示只显示年月
@@ -282,7 +282,6 @@ $(function(){
 			array_five_score.length=0;
 			if(data!='' &&　data.length!=0){
 				for(var i=0;i<data.length;i++){
-					array_five_name.push(data[i].user.truename);
 					array_five_score.push(data[i].ranking_change);
 				}
 			}else{
@@ -293,13 +292,26 @@ $(function(){
 			min_five = 0;
 			else
 			min_five = 	eval("Math.min(" + array_five_score.toString() + ")").toFixed(0)-1;	
+
+			// 给考核进步top5排名次
+			var rank = new Array();
+			rank[0] = 1 ;
+			for(var i=1; i<array_five_score.length; i++){
+				if(array_five_score[i-1] == array_five_score[i]  ){
+					rank[i] = rank[i-1];
+				}else{
+					rank[i] = i + 1;
+				}				
+			}
+			for(var i=0;i<array_five_score.length;i++){
+				array_five_name.push(data[i].user.truename+"\n"+ (rank[i]));
+			}
 		}else if(type == 4){
 			array_score_order.length=0;
 			array_score_data.length=0;
 			var m = 1;	
 			if(data!='' && data.length!=0){
 				for(var i=0;i<data.length;i++){
-					//array_score_order.push(data[i].user.truename +"\n"+ (i+1));
 					array_score_data.push((1000-filter(data[i].all_check_score,data[i].checked_num,0)));
 				}
 			}else{
@@ -350,7 +362,6 @@ $(function(){
 			array_five_score_back.length=0;
 			if(data!=''){
 				for(var i=0;i<data.length;i++){
-					array_five_name_back.push(data[i].user.truename);
 					if(data[i].ranking_change<0){
 					array_five_score_back.push((data[i].ranking_change+'').substr(1));
 				}else{
@@ -367,6 +378,20 @@ $(function(){
 			}else{
 				min_five_back = eval("Math.min(" + array_five_score_back.toString() + ")").toFixed(0)-1;
 			}
+
+			// 给考核进步top5排名次
+			var rank = new Array();
+			rank[0] = 1 ;
+			for(var i=1; i<array_five_score_back.length; i++){
+				if(array_five_score_back[i-1] == array_five_score_back[i]  ){
+					rank[i] = rank[i-1];
+				}else{
+					rank[i] = i + 1;
+				}				
+			}
+			for(var i=0;i<array_five_score_back.length;i++){
+				array_five_name_back.push(data[i].user.truename+"\n"+ (rank[i]));
+			}
 		}
 	}
   
@@ -712,14 +737,14 @@ $(function(){
 				{
 					name:'访问来源',
 					type:'pie',
-					radius : '65%',
+					radius : '55%',
 					center: ['50%', '50%'],
 					data:array_points,
 					itemStyle:{ 
 					normal:{ 
 						label:{ 
 							show: true, 
-							formatter: '{b} : {c}人 ({d}%)'  
+							formatter: '{b} :\n{c}人 ({d}%)'  
 						}, 
 						labelLine :{show:true} 
 						} 
@@ -981,7 +1006,7 @@ $(function(){
 					normal:{ 
 						label:{ 
 							show: true, 
-							formatter: '{b} : {c}分 ({d}%)'  
+							formatter: '{b} :\n{c}分 ({d}%)'  
 						}, 
 						labelLine :{show:true} 
 						} 
@@ -1072,4 +1097,7 @@ function setVisit(){
 		$("#first").attr("disabled","disabled");
 		$("#second").attr("disabled","disabled");
 	}
+	if(roleContains("ROAD_MANAGER")){
+		$("#first").attr("disabled","disabled");
+	}
 }

VisualInspection/js/statistics/total_company_statistics.js

@@ -210,7 +210,6 @@ $(function(){
 					array_road_score.length=0;
 			for(var i=0;i<data.length;i++){
 				if(data!=''){
-					array_road.push(data[i].feeStationName);
 					array_road_score.push((1000-(filter_handler(data[i].all_check_score,data[i].checked_num,data[i].people_num,0))));
 		        }else{
 					array_road.length=0;
@@ -221,12 +220,25 @@ $(function(){
 				min_road = 0;
 				else
 				min_road = 	eval("Math.min(" + array_road_score.toString() + ")").toFixed(0)-10;
+
+				// 给道管中心排名次
+				var rank = new Array();
+				rank[0] = 1 ;
+				for(var i=1; i<array_road_score.length; i++){
+					if(array_road_score[i-1] == array_road_score[i]  ){
+						rank[i] = rank[i-1];
+					}else{
+						rank[i] = i +1;
+					}				
+				}
+				for(var i=0;i<array_road_score.length;i++){
+					array_road.push(data[i].feeStationName+"\n"+ (rank[i]));
+				}
 		}else if(type == 4){
 			array_allStation_score.length=0;
 			array_allStation.length=0;
             for(var i=0;i<data.length;i++){
 				if(data!='' && data.length!=0){
-					//array_allStation.push(data[i].feeStationName.substr(0,data[i].feeStationName.length-3));
 					array_allStation_score.push((1000-(filter_handler(data[i].all_check_score,data[i].checked_num,data[i].people_num,0))));
 				}else{
 					array_allStation_score.length=0;
@@ -248,7 +260,6 @@ $(function(){
 						rank[i] = i +1;
 					}				
 				}
-				//console.log(rank);
 				for(var i=0;i<array_allStation_score.length;i++){
 					array_allStation.push(data[i].feeStationName.substr(0,data[i].feeStationName.length-3)+"\n"+ (rank[i]));
 				}
@@ -500,14 +511,14 @@ $(function(){
 					{
 						name:'访问来源',
 						type:'pie',
-						radius : '65%',
+						radius : '55%',
 						center: ['50%', '50%'],
 						data:array_points,
 						itemStyle:{ 
 						normal:{ 
 							label:{ 
 								show: true, 
-							    formatter: '{b} : {c}人 ({d}%)'
+							    formatter: '{b} :\n{c}人 ({d}%)'
 							}, 
 							labelLine :{show:true} 
 							} 
@@ -543,7 +554,7 @@ $(function(){
 				}
 				},
 				grid:{
-                    width:"80%",
+                    width:"75%",
 					
                 },
 				calculable : true,
@@ -709,7 +720,7 @@ $(function(){
 						normal:{ 
 							label:{ 
 								show: true, 
-								formatter: '{b} : {c}分 ({d}%)'  
+								formatter: '{b} :\n{c}分 ({d}%)' 
 							}, 
 							labelLine :{show:true} 
 							} 

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -38,7 +38,7 @@
             getTeamClass(datap,function(data){
                 var newEvents = [];
                 
-                console.log(data);
+              
 
                 for(var i=0;i<data.length;i++){
                     var obj = '' ;
@@ -91,7 +91,10 @@
             get_common_service( "dept/getFsByDept","",function(data){
                 if(data != null){
                     $(".thread_charge").append("<th>"+data.name+"</th>");
+                    $(".thread_charge").append("<th>值班班长</th>");
+                    $(".thread_charge").append("<th>收费班长</th>");
                     $(".thread_charge").append("<th>值班室</th>");
+                    
                     // console.log(data);
                     lans = data.lanes_number;
                     entrance_number = data.entrance_numer ;
@@ -237,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) {
@@ -252,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")){
@@ -459,29 +485,45 @@
                     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>");
-                            var selectv = "<select class='form-control select-self' style='width:78px;'>"
+                            $(".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:100px;'>"
                             selectv += ("<option value=''>请选择</option>");
                              selectv += ("<option value='0'>临时开道</option>");
                             for(var j=0;j<data[i].users.length;j++){
                                     var obj = data[i].users[j];
                                     selectv += ("<option value='"+data[i].users[j].id+"'>"+ data[i].users[j].truename  +"</option>");
                             }
-                            selectv += "</select> <i title='顶班详情' alt='顶班详情' class='icon icon-tags i-self' style='float:right;margin-top:7px;'></i>";
+                            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: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>")
+                          
+                            var selectv2 = selectv;
+                            selectv2 =selectv2.replace("<option value='0'>临时开道</option>","");
+
+                            $(".tr-"+ct).append("<td style='vertical-align:top;width:137px;padding:2px;' class='c-"+ct+"-0' tag='0'>"+ selectv2 +"</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){
                         $(".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++){
+                        for(var i=0;i<lans+1+2;i++){
                              $(".tr-1,.tr-2,.tr-3").append("<td></td>");
                         }
                     }else{
@@ -505,6 +547,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);
@@ -519,6 +563,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);
 
@@ -651,7 +703,7 @@
                         "dept_id":user_dept_id,
                         "user_type":1//表示收费站
                     };
-                    // console.log(obj);
+           
                     data.push(obj);
                 }
             }

VisualInspection/js/util/util.js

@@ -178,7 +178,7 @@ function setRoadManagerSelect(div,selectId){
      setRoadManagerValue(rmList,div,selectId);
 }
 function setRoadManagerValue(data,div,selectId){
-    var optStr = '<option value="">全部</option>';
+    var optStr = '';//<option value="">全部</option>';
     for(var i in data) {
         if(data[i].deptid==selectId)
             optStr += '<option value="'+data[i].deptid+'" selected="selected">'+data[i].name+'</option>';

VisualInspection/view/statistics/assess_type.html

@@ -29,7 +29,7 @@
                  <thead>
                         <tr>
                         <th rowspan="2" width="67px">道管整体排名</th><th rowspan="2" width="67px">单位</th><th rowspan="2" width="67px">管道内收费站排名</th>
-                        <th rowspan="2" width="85px">单位</th><th rowspan="2" width="67px">收费值机岗位人数</th><th rowspan="2" width="67px">被检查人数</th>
+                        <th rowspan="2" width="85px">单位</th><th rowspan="2" width="67px">收费值机岗位人数</th><th rowspan="2" width="67px">受检人数</th>
                         <th rowspan="2" width="67px">受检次数</th><th colspan="9" height="40px">存在问题扣分详情</th>
                         <th rowspan="2" width="67px">受检人平均每人次扣分（千分制）</th><th rowspan="2" width="67px">管道中心受检人平均每人次扣分（千分制）</th>
                         </tr>

VisualInspection/view/statistics/change_attendance.html

@@ -8,7 +8,7 @@
                 <label for="exampleInputAccount1" class="col-sm-1">月份</label>
                 <div class="col-sm-2">
                     <select class="form-control" id="sel_month">
-                        <option value="1">一月</option>
+                        <!--<option value="1">一月</option>
                         <option value="2">二月</option>
                         <option value="3">三月</option>
                         <option value="4">四月</option>
@@ -19,7 +19,7 @@
                         <option value="9">九月</option>
                         <option value="10">十月</option>
                         <option value="11">十一月</option>
-                        <option value="12">十二月</option>
+                        <option value="12">十二月</option>-->
                     </select>
                 </div>
                 <label for="exampleInputAccount1" class="col-sm-1">部门</label>
@@ -50,7 +50,7 @@
 
 
 
-    <div class="table-title"><span id="month_name"></span><span>份机动人员顶岗明细统计表</span></div>
+    <div class="table-title"><span id="month_name"></span><span>月份机动人员顶岗明细统计表</span></div>
 
     <div class="row">
           

VisualInspection/view/statistics/change_work.html

@@ -5,9 +5,9 @@
     <div class="row">
         <form  class="form-horizontal">
             <div class="form-group">
-                <label for="exampleInputAccount1" class="col-sm-1">月份</label>
-                <div class="col-sm-2">
-                    <select class="form-control" id="sel_month">
+                <label for="exampleInputAccount1" class="col-sm-1">日期</label>
+                <!--<div class="col-sm-2">-->
+                    <!--<select class="form-control" id="sel_month">
                         <option value="1">一月</option>
                         <option value="2">二月</option>
                         <option value="3">三月</option>
@@ -20,8 +20,17 @@
                         <option value="10">十月</option>
                         <option value="11">十一月</option>
                         <option value="12">十二月</option>
-                    </select>
+                    </select>-->
+                <!--</div>-->
+
+                <div class="col-sm-1">
+                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始日期">
+                </div>
+                <div class="col-sm-1">
+                    <input type="text" id="end-time" class="form-control form-date" placeholder="结束日期">
                 </div>
+
+
                 <label for="exampleInputAccount1" class="col-sm-1">部门</label>
                 <div class="col-sm-2">
                     <select class="form-control" id="center_manage">
@@ -50,25 +59,22 @@
 
 
 
-    <div class="table-title"><span id="month_name"></span><span>份机动人员出勤统计</span></div>
+    <div class="table-title"><span id="month_name"></span><span>机动人员出勤统计</span></div>
 
     <div class="row">
           
               <div class="table-head" ><table  width="100%" min-height="190px" align="center" >
                   <thead>
                     <tr>
-                        <th rowspan="2" width="80px">序号</th>
-                        <th rowspan="2" width="120px">站名</th>
-                        <th rowspan="2" width="120px">姓名</th>
-                        <th rowspan="2" width="120px">岗位</th>
-                        <th width="120px" colspan="3">月份出勤统计（上月26 ~ 本月25）</th>
-                        <th  rowspan="2"  min-width="120px">合计</th>
-                        <th  rowspan="2" >备注</th>
-                    </tr>
-                    <tr> 
+                        <th  width="80px">序号</th>
+                        <th width="120px">站名</th>
+                        <th  width="120px">姓名</th>
+                        <th  width="120px">岗位</th>
                         <th>夜</th>
                         <th>早</th>
                         <th>中</th>
+                        <th  min-width="120px">合计</th>
+                        <th   >备注</th>
                     </tr>
                   </thead>
                   <tbody class="table-tbody" style="background:white" align="center" height="500px">
@@ -81,6 +87,18 @@
 </div>
 <script>
     $(document).ready(function() {
-
+        // 仅选择日期 开始 ，结束时间
+        $("#start-time,#end-time").datetimepicker(
+        {
+            language:  "zh-CN",
+            weekStart: 1,
+            todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
+        });
     });
 </script>

VisualInspection/view/statistics/common_attendance.html

@@ -8,7 +8,7 @@
                 <label for="exampleInputAccount1" class="col-sm-1">月份</label>
                 <div class="col-sm-2">
                     <select class="form-control" id="sel_month">
-                        <option value="1">一月</option>
+                        <!--<option value="1">一月</option>
                         <option value="2">二月</option>
                         <option value="3">三月</option>
                         <option value="4">四月</option>
@@ -19,7 +19,7 @@
                         <option value="9">九月</option>
                         <option value="10">十月</option>
                         <option value="11">十一月</option>
-                        <option value="12">十二月</option>
+                        <option value="12">十二月</option>-->
                     </select>
                 </div>
                 <label for="exampleInputAccount1" class="col-sm-1">部门</label>
@@ -50,7 +50,7 @@
 
 
 
-    <div class="table-title"><span id="month_name"></span><span>份正常出勤明细统计表</span></div>
+    <div class="table-title"><span id="month_name"></span><span>月份正常出勤明细统计表</span></div>
 
     <div class="row">
           

VisualInspection/view/statistics/common_work.html

@@ -5,8 +5,8 @@
     <div class="row">
         <form  class="form-horizontal">
             <div class="form-group">
-                <label for="exampleInputAccount1" class="col-sm-1">月份</label>
-                <div class="col-sm-2">
+                <label for="exampleInputAccount1" class="col-sm-1">日期</label>
+                <!--<div class="col-sm-2">
                     <select class="form-control" id="sel_month">
                         <option value="1">一月</option>
                         <option value="2">二月</option>
@@ -21,6 +21,12 @@
                         <option value="11">十一月</option>
                         <option value="12">十二月</option>
                     </select>
+                </div>-->
+                <div class="col-sm-1">
+                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始日期">
+                </div>
+                <div class="col-sm-1">
+                    <input type="text" id="end-time" class="form-control form-date" placeholder="结束日期">
                 </div>
                 <label for="exampleInputAccount1" class="col-sm-1">部门</label>
                 <div class="col-sm-2">
@@ -57,18 +63,15 @@
               <div class="table-head" ><table  width="100%" min-height="190px" align="center" >
                   <thead>
                     <tr>
-                        <th rowspan="2" width="80px">序号</th>
-                        <th rowspan="2" width="120px">站名</th>
-                        <th rowspan="2" width="120px">姓名</th>
-                        <th rowspan="2" width="120px">岗位</th>
-                        <th width="120px" colspan="3">月份出勤统计（上月26 ~ 本月25）</th>
-                        <th  rowspan="2"  min-width="120px">合计</th>
-                        <th  rowspan="2" >备注</th>
-                    </tr>
-                    <tr> 
+                        <th  width="80px">序号</th>
+                        <th  width="160px">站名</th>
+                        <th  width="160px">姓名</th>
+                        <th  width="160px">岗位</th>
                         <th>夜</th>
                         <th>早</th>
                         <th>中</th>
+                        <th  min-width="160px">合计</th>
+                        <th  >备注</th>
                     </tr>
                   </thead>
                   <tbody class="table-tbody" style="background:white" align="center" height="500px">

VisualInspection/view/statistics/personal_data_statistics.html

@@ -63,8 +63,8 @@
     
   <div class="border-line">
     <div class="row-7">
-        <div class="col-1"><span>个人得分统计</span></div><div class="line-2"></div>
-        <div class="col-1"><span>个人温馨服务检查问题类别占比</span></div>
+        <div class="col-1"><span style="font-family: '宋体';font-size:15px;">个人得分统计</span></div><div class="line-2"></div>
+        <div class="col-1"><span style="font-family: '宋体';font-size:15px;">个人温馨服务检查问题类别占比</span></div>
     </div>
     <div class="row-8">
         <div id="personal-score-statistics" style="width:49%;height:400px;float:left;"></div>

VisualInspection/view/statistics/road_manage_statistics.html

@@ -7,7 +7,8 @@
     <!--<div class="line-1"></div>-->
     <div class="row-2">
         <div>
-            <div class="div-month"><select>
+            <div class="div-month">
+                <select>
                 <!--<option value="1">一月</option>
                 <option value="2">二月</option>
                 <option value="3">三月</option>
@@ -20,11 +21,13 @@
                 <option value="10">十月</option>
                 <option value="11">十一月</option>
                 <option value="12">十二月</option>-->
-                </select></div>
+                </select>
+                
+            </div>
         <div class="div-roadManage"><select>
-            <option value="30">连云港</option>
+            <!--<option value="30">连云港</option>
             <option value="31">盐城</option>
-            <option value="32">南通</option>
+            <option value="32">南通</option>-->
             </select></div>
         <div class="div-button"><button>查询</button></div></div>
     </div>
@@ -43,7 +46,7 @@
     <div class="row-5">
         <div id="roadManager-points-assess" style="width:49%;height:400px;float:left;"></div>
         <div class="line-3"></div>
-        <div id="tollStation-score-rank" style="width:49%;height:400px;float:left;"></div>
+        <div id="tollStation-score-rank" style="width:49%;height:400px;float:left;padding-right:0px;"></div>
     </div>
     </div>
 
@@ -61,7 +64,7 @@
 
   <div class="border-line">
     <div class="row-3"><div><span>人员考核得分后20名</span></div></div>
-    <div id="people-rank-suf" style="height: 100%;height:400px;"></div>
+    <div id="people-rank-suf" style="height: 100%;height:400px;padding-right:10px;"></div>
     </div>
 
   <div class="border-line">

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:1750px;">
                             <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/StatisticsServiceImpl.java

@@ -1241,9 +1241,18 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			int seq = 1 ;
 			for(StatisticsBean sta : list){
 				sta.setId(seq++);
-				sta.setCheckman_name( CacheUtil.getUserFromMap(sta.getCheckman_id()+0L).getTruename()  ); 
-				sta.setChecked_name( CacheUtil.getUserFromMap(sta.getUser_id()+0L).getTruename());
-				sta.setFeeStationName( CacheUtil.getOrganFromMap(sta.getDept_id()).getOrganname() );
+				User user = CacheUtil.getUserFromMap(sta.getCheckman_id()+0L) ;
+				if(user != null){
+					sta.setCheckman_name(user.getTruename()); 					
+				}
+				user = CacheUtil.getUserFromMap(sta.getUser_id()+0L) ;
+				if(user != null ){
+					sta.setChecked_name( user.getTruename());					
+				}
+				Organ organ = CacheUtil.getOrganFromMap(sta.getDept_id());
+				if(organ != null){
+					sta.setFeeStationName( organ.getOrganname() );					
+				}
 				SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 				SimpleDateFormat formatter2 = new SimpleDateFormat("- HH:mm");
 				sta.setCheck_task_time_name( formatter.format(sta.getStart_date())+formatter2.format(sta.getEnd_date()));

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);
 			}