chenrj-PC\chenrj 8 лет назад
Родитель
Сommit
9ab90e8acc

+ 2 - 2
VisualInspection/js/statistics/assess_ranking.js

@@ -89,8 +89,8 @@ function initQueryEmp(parent_dept_id,dept_id) {
     var endD = new Date();
     var now = new Date();
     var startD = new Date(now.getTime() - 7 * 24 * 3600 * 1000);
-    var start_time = startD.getFullYear() + "-" + (startD.getMonth() + 1) + "-" + startD.getDate();
-    var end_time = endD.getFullYear() + "-" + (endD.getMonth() + 1) + "-" + endD.getDate();
+    var start_time = startD.getFullYear() + "-" + (startD.getMonth()) + "-26";
+    var end_time = endD.getFullYear() + "-" + (endD.getMonth() + 1) + "-25" ;
     var start_score = $("#start-score").val();
     var end_score = $("#end-score").val();
     var start_num = $("#start-num").val()!=''? $("#start-num").val(): 0  ;

+ 2 - 2
VisualInspection/js/statistics/assess_situation.js

@@ -52,8 +52,8 @@ function initQuerySituation(){
     var endD = new Date();
     var now = new Date();
     var startD = new Date(now.getTime() - 7 * 24 * 3600 * 1000);
-    var start_time = startD.getFullYear()+"-"+(startD.getMonth()+1)+"-"+startD.getDate(); 
-    var end_time = endD.getFullYear()+"-"+(endD.getMonth()+1)+"-"+endD.getDate(); 
+    var start_time = startD.getFullYear()+"-"+(startD.getMonth()+1)+"-26"; 
+    var end_time = endD.getFullYear()+"-"+(endD.getMonth()+1)+"-25"; 
     //默认初始化时间页面回显
     $("#start-time").val(start_time);
     $("#end-time").val(end_time);

+ 2 - 2
VisualInspection/js/statistics/assess_type.js

@@ -55,8 +55,8 @@ function initQueryType(){
     var endD = new Date();
     var now = new Date();
     var startD = new Date(now.getTime() - 7 * 24 * 3600 * 1000);
-    var start_time = startD.getFullYear()+"-"+(startD.getMonth()+1)+"-"+startD.getDate(); 
-    var end_time = endD.getFullYear()+"-"+(endD.getMonth()+1)+"-"+endD.getDate(); 
+    var start_time = startD.getFullYear()+"-"+(startD.getMonth())+"-26";
+    var end_time = endD.getFullYear()+"-"+(endD.getMonth()+1)+"-25";
     // 默认初始化时间页面回显
     $("#start-time").val(start_time);
     $("#end-time").val(end_time);

+ 1 - 1
VisualInspection/js/statistics/change_work.js

@@ -29,7 +29,7 @@ $(function(){
     // $("#sel_month").val(getM()-1);
     // $("#month_name").html( $("#sel_month").find("option:selected").text());
     // 时间初始化
-    $("#start-time").val( new Date().getFullYear()+'-'+ (getM()-1) +"-25");
+    $("#start-time").val( new Date().getFullYear()+'-'+ (getM()-1) +"-26");
     $("#end-time").val( new Date().getFullYear()+'-'+ (getM()) +"-25");
 
     // 收费站中心选择

+ 2 - 5
VisualInspection/js/statistics/check_workload_statistics.js

@@ -1,6 +1,6 @@
 // 默认初始化日期一个月
-$(".div-start input").val(new Date().getFullYear()+"-"+new Date().getMonth()+"-"+new Date().getDate());
-$(".div-end input").val(new Date().getFullYear()+"-"+(new Date().getMonth()+1)+"-"+new Date().getDate());
+$(".div-start input").val(new Date().getFullYear()+"-"+new Date().getMonth()+"-26");
+$(".div-end input").val(new Date().getFullYear()+"-"+(new Date().getMonth()+1)+"-25");
 var start_date = $(".div-start input").val()+" 23:00:00";
 var end_date = $(".div-end input").val()+" 23:00:00";
 var user_id = $("#select-personal").val();      
@@ -198,7 +198,4 @@ $(function(){
 			return (num/num1).toFixed(2);
 		}
 	}
-	
-
-
 });

+ 3 - 3
VisualInspection/js/statistics/personal_data_statistics.js

@@ -9,8 +9,8 @@ var check_type;
 var cur_status;
 var hide = false;
 // 默认初始化日期一个月
-$(".div-start input").val(new Date().getFullYear()+"-"+new Date().getMonth()+"-"+new Date().getDate());
-$(".div-end input").val(new Date().getFullYear()+"-"+(new Date().getMonth()+1)+"-"+new Date().getDate());
+$(".div-start input").val(new Date().getFullYear()+"-"+new Date().getMonth()+"-26");
+$(".div-end input").val(new Date().getFullYear()+"-"+(new Date().getMonth()+1)+"-25");
 var start_date = $(".div-start input").val()+" 23:00:00";
 var end_date = $(".div-end input").val()+" 23:00:00";
 
@@ -107,7 +107,7 @@ $(function(){
 	 */
 	function init_personal_score_statistics(url,user_id){
 		var param = {
-			"start_date":(year-1)+"-"+new Date().getMonth()+"-25"+" 23:00:00",
+			"start_date":(year-1)+"-"+new Date().getMonth()+"-26"+" 23:00:00",
 			"end_date":year+"-"+new Date().getMonth()+"-25"+" 23:00:00",
 			"user_id":user_id
 		}

+ 1 - 1
VisualInspection/js/statistics/toll_station_statistics.js

@@ -387,7 +387,7 @@ $(function(){
 				min_five_back = eval("Math.min(" + array_five_score_back.toString() + ")").toFixed(0)-1;
 			}
 
-			// 给考核进步top5排名次
+			// 退步top5排名次
 			var rank = new Array();
 			rank[0] = 1 ;
 			for(var i=1; i<array_five_score_back.length; i++){

+ 5 - 1
VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/StatisticsServiceImpl.java

@@ -957,7 +957,11 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			return t_mthList.subList(0, 5);
 		} else if (obj.getOrder_type() == 1) {
 			// 反序
-			return t_mthList.subList(t_mthList.size() - 5, t_mthList.size());
+			List<StatisticsBean> reList = new ArrayList<>();
+			for(int j = t_mthList.size()-1; j>t_mthList.size()-6; j-- ){
+				reList.add( t_mthList.get(j) );
+			}
+			return reList;
 		}
 		return t_mthList;
 	}