修改bug

VisualInspection/fis-conf.js

@@ -34,7 +34,8 @@ fis.set('date', new Date);
 fis.match('*.{js,css,png}', {
     query: '?time=' + (fis.get('date').getYear() + 1900) 
                  + (fis.get('date').getMonth() + 1) 
-                 + (fis.get('date').getDate())
+                 + (fis.get('date').getDate())+(fis.get('date').getHours())
+                 + (fis.get('date').getMinutes())+(fis.get('date').getSeconds())
 });
 
 // Global end

VisualInspection/js/statistics/assess_situation.js

@@ -72,16 +72,23 @@ function initQuerySituation(){
     var strTbody='';
    
     post_common_service( url,param,function(data){
-        // 道管中心排名
-        ranking_method(data)
-        for(i=0;i<data.length;i++){       
-             $(".table-tbody").append(gethtml(data[i],i));
-        }         
-            },function(error){
-                return "" ;
+            var list = data.list;
+            // 道管中心排名
+            ranking_method(list);
+            for(i=0;i<list.length;i++){       
+                $(".table-tbody").append(gethtml(list[i],i));
+            }   
+            $(".table-tbody").append(getTotalHtml(data));      
+        },function(error){
+            return "" ;
      });
     
 }
+
+function getTotalHtml(data){
+    var html = "<tr><td>合计</td><td></td><td></td><td>"+data.totalMan+"</td><td>"+data.totalcheckedMan+"</td><td>"+data.totalcheckedCount+"</td><td>"+data.total0+"</td><td>"+data.total15+"</td><td>"+data.total50+"</td><td>"+data.totalOver50+"</td><td>"+data.totalAll+"</td><td>-</td><td>-</td></tr>";
+    return html;
+}
 /**
  * 道管中心排名
  * @param {*} data 

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/StatisticsBo.java

@@ -51,12 +51,20 @@ public class StatisticsBo {
 		if((o2.getChecked_num()+o2.getChecked_m_num())!=0){
 			b = (o2.getCheck_all_score()+o2.getCheck_all_m_score()) /(o2.getChecked_num()+o2.getChecked_m_num()+0.00);
 		}
+		int numA = this.getChecked_num();
+		int numB = o2.getChecked_num();
 		if (a > b ) {
 			return 1;
 		} else if (a < b) {
 			return -1;
 		} else {
-			return 0;
+			if(numA>numB){
+				return -1;
+			}else if(numA<numB){
+				return 1;
+			}else{
+				return 0;
+			}
 		}	
     }
     

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

@@ -1,5 +1,6 @@
 package com.xintong.visualinspection.controller;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -16,7 +17,6 @@ import com.xintong.visualinspection.bean.CheckmanStatisticsBean;
 import com.xintong.visualinspection.bean.StatisticsBean;
 import com.xintong.visualinspection.bean.StatisticsBo;
 import com.xintong.visualinspection.bean.StatisticsFsWork;
-import com.xintong.visualinspection.bean.Team;
 import com.xintong.visualinspection.service.StatisticsService;
 
 /**
@@ -52,7 +52,28 @@ public class StatisticsController extends BaseController {
     @RequestMapping(value = "/score/info")
     public String getScoreInfo(@RequestBody StatisticsBean obj){
     	List<StatisticsBean> lists=  statisticsService.getFeeStationCheckedScore(obj);
-    	return super.returnSuccessResult(lists);
+    	int totalMan=0,totalcheckedMan=0,totalcheckedCount=0,total0=0,total15=0,total50=0,totalOver50=0,totalAll = 0;
+    	for(StatisticsBean bean:lists){
+    		totalMan+=bean.getPeople_num();
+    		totalcheckedMan+=bean.getChecked_people_num();
+    		totalcheckedCount+=bean.getChecked_num();
+    		total0+=(bean.getChecked_people_num()-bean.getScore_fifteen()-bean.getScore_fifty()-bean.getScore_over_fifty());
+    		total15+=bean.getScore_fifteen();
+    		total50+=bean.getScore_fifty();
+    		totalOver50+=bean.getScore_over_fifty();
+    		totalAll+=bean.getAll_check_score();
+    	}
+    	Map<String,Object> resultMap = new HashMap<String,Object>();
+    	resultMap.put("list", lists);
+    	resultMap.put("totalMan", totalMan);
+    	resultMap.put("totalcheckedMan", totalcheckedMan);
+    	resultMap.put("totalcheckedCount", totalcheckedCount);
+    	resultMap.put("total0", total0);
+    	resultMap.put("total15", total15);
+    	resultMap.put("total50", total50);
+    	resultMap.put("totalOver50", totalOver50);
+    	resultMap.put("totalAll", totalAll);
+    	return super.returnSuccessResult(resultMap);
     }
     
     /**
@@ -61,6 +82,25 @@ public class StatisticsController extends BaseController {
     @RequestMapping(value = "/score/item/info")
     public String getScoreItemInfo(@RequestBody StatisticsBean obj){
     	List<StatisticsBean> lists=  statisticsService.getFeeStationCheckItemScore(obj);
+//    	int totalMan=0,totalcheckedMan=0,totalcheckedCount=0,totalAll=0;
+//    	Map<String,Integer> scoreTypeMap = new HashMap<String,Integer>();
+//    	for(StatisticsBean bean:lists){
+//    		totalMan+=bean.getPeople_num();
+//    		totalcheckedMan+=bean.getChecked_people_num();
+//    		totalcheckedCount+=bean.getChecked_num();
+//    		totalAll+=bean.getAll_check_score();
+//    		bean.get
+//    	}
+//    	Map<String,Object> resultMap = new HashMap<String,Object>();
+//    	resultMap.put("list", lists);
+//    	resultMap.put("totalMan", totalMan);
+//    	resultMap.put("totalcheckedMan", totalcheckedMan);
+//    	resultMap.put("totalcheckedCount", totalcheckedCount);
+//    	resultMap.put("total0", total0);
+//    	resultMap.put("total15", total15);
+//    	resultMap.put("total50", total50);
+//    	resultMap.put("totalOver50", totalOver50);
+//    	resultMap.put("totalAll", totalAll);
     	return super.returnSuccessResult(lists);
     }