tj

VisualInspection/js/statistics/assess_ranking.js

@@ -50,8 +50,8 @@ function queryEmpClick() {
     var end_date = $("#end-time").val();
     var start_score = $("#start-score").val();
     var end_score = $("#end-score").val();
-    var start_num = $("#start-num").val();
-    var end_num = $("#end-num").val();
+    var start_num = $("#start-num").val()!=''? $("#start-num").val(): 0  ;
+    var end_num = $("#end-num").val()!=''?$("#end-num").val() : 100 ;
     var flag = param_method(start_score, end_score);
     if (flag == false) {
         return;
@@ -93,8 +93,8 @@ function initQueryEmp(parent_dept_id,dept_id) {
     var end_time = endD.getFullYear() + "-" + (endD.getMonth() + 1) + "-" + endD.getDate();
     var start_score = $("#start-score").val();
     var end_score = $("#end-score").val();
-    var start_num = $("#start-num").val();
-    var end_num = $("#end-num").val();
+    var start_num = $("#start-num").val()!=''? $("#start-num").val(): 0  ;
+    var end_num = $("#end-num").val()!=''?$("#end-num").val() : 100 ;
     setJobSelect("#jobSelect");
     //默认初始化时间页面回显
     $("#start-time").val(start_time);
@@ -139,8 +139,8 @@ function getEmployeeInfosClick(url, param, start_score, end_score,start_num,end_
 
                 strTbody += "<tr><td width='4%;'>" + (count + 1) + "</td><td width='6%;'>" + data[i].user.fee_station_name + "</td>"
                     + "<td width='6%;'>" + data[i].user.truename + "</td><td width='6%;'>" + data[i].user.position_name + "</td>"
-                    + "<td width='6%;'>" + data[i].user.workno + "</td><td width='4%;'>" + data[i].company_ranking + "</td>"
-                    + "<td width='4%;'>" + data[i].center_ranking + "</td><td width='4%;'>" + data[i].fee_station_ranking
+                    + "<td width='6%;'>" + data[i].user.workno + "</td><td width='4%;'>" +filter( data[i].company_ranking,'/') + "</td>"
+                    + "<td width='4%;'>" + filter(data[i].center_ranking,'/') + "</td><td width='4%;'>" + filter(data[i].fee_station_ranking ,'/')
                     + "</td><td width='4%;'>" + getItemScore(data[i], '环境') + "</td>"
                     + "<td width='4%;'>" + getItemScore(data[i], '仪容仪表') + "</td><td width='4%;'>" + getItemScore(data[i], '表情') + "</td>"
                     + "<td width='4%;'>" + getItemScore(data[i], '动作') + "</td><td width='4%;'>" + getItemScore(data[i], '文明用语') + "</td>"

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

@@ -168,6 +168,10 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		}
 
 		for (int i = 0; i < lists.size(); i++) {
+			
+			if(lists.get(i).getChecked_num() == 0 ){
+				continue;
+			}
 			// 累计道管排名
 			String centerId = lists.get(i).getUser().getParent_organid().toString();
 			if (i > 0 && center_ranking2.get(centerId) != null