tj

VisualInspection/js/statistics/assess_ranking.js

@@ -127,7 +127,7 @@ function initQueryEmp(parent_dept_id, dept_id) {
     var endD = new Date();
     var startD = new Date();
     // var startD = new Date(now.getTime() - 7 * 24 * 3600 * 1000);
-    var start_time = startD.getFullYear() + "-" + (startD.getMonth() > 10 ? startD.getMonth() : "0" + startD.getMonth()) + "-25";
+    var start_time = startD.getFullYear() + "-" + (startD.getMonth() > 10 ? startD.getMonth() : "0" + startD.getMonth()) + "-26";
     var end_time = endD.getFullYear() + "-" + (endD.getMonth() + 1 > 10 ? endD.getMonth() + 1 : "0" + (endD.getMonth() + 1)) + "-25";
     var start_score = $("#start-score").val();
     var end_score = $("#end-score").val();
@@ -140,7 +140,7 @@ function initQueryEmp(parent_dept_id, dept_id) {
     var start_date = start_time + " 23:00:00";
     var end_date = end_time + " 23:00:00";
 
-    var start = moment(start_date);
+    var start = moment(start_date).subtract(1, "day");
     //开始日期取前一天的23:00
 
     start_date = start.toDate().Format("yyyy-MM-dd HH:mm:ss");
@@ -152,7 +152,7 @@ function initQueryEmp(parent_dept_id, dept_id) {
         "end_date": end_date,
     }
 
-    console.log(param)
+
 
     var url = "statistics/employee/order";
     getEmployeeInfosClick(url, param, start_score, end_score, start_num, end_num);
@@ -165,6 +165,8 @@ function initQueryEmp(parent_dept_id, dept_id) {
 function getEmployeeInfosClick(url, param, start_score, end_score, start_num, end_num) {
     post_common_service(url, param, function(data) {
 
+        console.log(data)
+
         var strTbody = '';
         var count = 0;
         var start_date_time = moment(param.end_date + "Z");

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

@@ -211,11 +211,12 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 
 		for (int i = 0; i < lists.size(); i++) {
 			
-			if(lists.get(i).getChecked_num() == 0 ){
-				continue;
-			}
+
 
             StatisticsBo statisticsBo = lists.get(i);
+            if(statisticsBo.getChecked_num()+statisticsBo.getChecked_m_num() == 0 ){
+                continue;
+            }
 			//计算平均扣分
             DecimalFormat df = new DecimalFormat(".##");
             double count = statisticsBo.getChecked_num()+statisticsBo.getChecked_m_num();