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

VisualInspection/js/statistics/road_manage_statistics.js

@@ -294,7 +294,7 @@ $(function() {
                     if (months.indexOf(data[i].mth.substr(2))) {
                         // 指定位置插入值
                         array_year_score.splice(months.indexOf(data[i].mth.substr(2)), 0,
-                            (1000 - (filter_handler(data[i].all_check_score, data[i].checked_num, data[i].people_num, 0))));
+                            (1000 - (filter_handler(data[i].all_check_score, data[i].checked_num, 1.0, 0))));
                     }
                 }
             } else {
@@ -391,7 +391,7 @@ $(function() {
             array_allStation.length = 0;
             if (data != null && data.length != 0) {
                 for (var i = 0; i < data.length; i++) {
-                    array_allStation_score.push((1000 - (filter_handler(data[i].all_check_score, data[i].checked_num, data[i].people_num, 0))));
+                    array_allStation_score.push((1000 - (filter_handler(data[i].all_check_score, data[i].checked_num, 1.0, 0))));
                 }
             } else {
                 array_allStation_score.length = 0;
@@ -421,7 +421,7 @@ $(function() {
             if (data != null && data.length != 0) {
                 for (var i = 0; i < data.length; i++) {
                     array_score_order.push(data[i].user.truename + "\n" + "(" + data[i].user.fee_station_name.substr(0, data[i].user.fee_station_name.length - 3) + ")");
-                    array_score_data.push((1000 - filter(data[i].all_check_score, data[i].checked_num, 0)));
+                    array_score_data.push((1000 - filter(data[i].all_check_score, 1.0, 0)));
                 }
             } else {
                 array_score_order.length = 0;

VisualInspection/js/statistics/total_company_statistics.js

@@ -256,7 +256,7 @@ $(function() {
                     if (months.indexOf(data[i].mth.substr(2))) {
                         // 指定位置插入值
                         array_year_score.splice(months.indexOf(data[i].mth.substr(2)), 0,
-                            (1000 - (filter_handler(data[i].all_check_score, data[i].checked_num, data[i].people_num, 0))));
+                            (1000 - (filter_handler(data[i].all_check_score, data[i].checked_num, 1.0, 0))));
                     }
                 }
             } else {
@@ -338,7 +338,7 @@ $(function() {
             array_allStation.length = 0;
             for (var i = 0; i < data.length; i++) {
                 if (data != '' && data.length != 0) {
-                    array_allStation_score.push((1000 - (filter_handler(data[i].all_check_score, data[i].checked_num, data[i].people_num, 0))));
+                    array_allStation_score.push((1000 - (filter_handler(data[i].all_check_score, data[i].checked_num, 1.0, 0))));
                 } else {
                     array_allStation_score.length = 0;
                     array_allStation.length = 0;

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

@@ -163,10 +163,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 
 		}
 
-		TaskAndScore temp = new TaskAndScore();
-		temp.setStart_time(obj.getStart_date());
-		temp.setEnd_time(obj.getEnd_date());
-		List<TaskAndScore> taskAndScores = statisticsDao.selectMList(temp);
+		List<TaskAndScore> taskAndScores = GET_M_SCORE(obj.getStart_date(),obj.getEnd_date());
 		for (StatisticsBo b : statisticBoMap.values()) {
 			// 班长扣分加上成员的扣分
 			for (TaskAndScore s : taskAndScores) {
@@ -286,6 +283,9 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		return reList;
 	}
 
+
+
+
 	@Override
 	public List<StatisticsBean> getFeeStationCheckedScore(StatisticsBean obj) {
 		// 获取收费站信息收费站人数
@@ -1686,4 +1686,15 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		map.put("list", list);
 		exportExcel("稽查人员工作量统计", "check_info", map, resp);
 	}
+
+
+	private List<TaskAndScore> GET_M_SCORE(Date start_time,Date end_time){
+        TaskAndScore temp = new TaskAndScore();
+        temp.setStart_time(start_time);
+        temp.setEnd_time(end_time);
+
+        List<TaskAndScore> taskAndScores = statisticsDao.selectMList(temp);
+        return  taskAndScores;
+    }
+
 }