扣分比例

VisualInspection/js/statistics/road_manage_statistics.js

@@ -244,7 +244,7 @@ $(function() {
                 if (data.list[i][propertyname] != 0)
                     array_points2.push({
                         "value": (data.list[i][propertyname]),
-                        "name": data.list[i].name + names,
+                        "name": data.list[i].name,
                         "itemStyle": { "normal": { "color": color.hexStr() } }
                     });
             } else if (i > 6 && i < 13 && center_id == 31) {
@@ -253,7 +253,7 @@ $(function() {
                 if (data.list[i][propertyname] != 0)
                     array_points2.push({
                         "value": (data.list[i][propertyname]),
-                        "name": data.list[i].name + names,
+                        "name": data.list[i].name,
                         "itemStyle": { "normal": { "color": color.hexStr() } }
                     });
             } else if (i > 12 && i < 21 && center_id == 32) {
@@ -262,7 +262,7 @@ $(function() {
                 if (data.list[i][propertyname] != 0)
                     array_points2.push({
                         "value": (data.list[i][propertyname]),
-                        "name": data.list[i].name + names,
+                        "name": data.list[i].name,
                         "itemStyle": { "normal": { "color": color.hexStr() } }
                     });
             }
@@ -347,7 +347,7 @@ $(function() {
                         array_points2.push({
                             "value": (data.list[i].checked_people_num - data.list[i].score_fifteen -
                                 data.list[i].score_fifty - data.list[i].score_over_fifty),
-                            "name": data.list[i].name + '满分',
+                            "name": data.list[i].name,
                             "itemStyle": { "normal": { "color": color.hexStr() } }
                         });
                     } else if (i > 6 && i < 13 && center_id == 31) {
@@ -356,7 +356,7 @@ $(function() {
                         array_points2.push({
                             "value": (data.list[i].checked_people_num - data.list[i].score_fifteen -
                                 data.list[i].score_fifty - data.list[i].score_over_fifty),
-                            "name": data.list[i].name + '满分',
+                            "name": data.list[i].name,
                             "itemStyle": { "normal": { "color": color.hexStr() } }
                         });
                     } else if (i > 12 && i < 21 && center_id == 32) {
@@ -365,7 +365,7 @@ $(function() {
                         array_points2.push({
                             "value": (data.list[i].checked_people_num - data.list[i].score_fifteen -
                                 data.list[i].score_fifty - data.list[i].score_over_fifty),
-                            "name": data.list[i].name + '满分',
+                            "name": data.list[i].name,
                             "itemStyle": { "normal": { "color": color.hexStr() } }
                         });
                     }
@@ -795,7 +795,7 @@ $(function() {
                         normal: {
                             label: {
                                 show: true,
-                                formatter: '{b} :\n{c}人 ({d}%)'
+                                formatter: '{b}:{c}人({d}%)'
                             },
                             labelLine: {
                                 show: true

VisualInspection/js/statistics/total_company_statistics.js

@@ -219,13 +219,13 @@ $(function() {
 
 
         if (temp[0] != 0) {
-            array_points2.push({ "value": temp[0], "name": '连云港道管' + appendname, "itemStyle": { "normal": { "color": color1 } } });
+            array_points2.push({ "value": temp[0], "name": '连云港道管', "itemStyle": { "normal": { "color": color1 } } });
         }
         if (temp[1] != 0) {
-            array_points2.push({ "value": temp[1], "name": '盐城道管' + appendname, "itemStyle": { "normal": { "color": color2 } } });
+            array_points2.push({ "value": temp[1], "name": '盐城道管', "itemStyle": { "normal": { "color": color2 } } });
         }
         if (temp[2] != 0) {
-            array_points2.push({ "value": temp[2], "name": '南通道管' + appendname, "itemStyle": { "normal": { "color": color3 } } });
+            array_points2.push({ "value": temp[2], "name": '南通道管', "itemStyle": { "normal": { "color": color3 } } });
         }
     }
 
@@ -282,13 +282,13 @@ $(function() {
                     }
                 }
                 if (temp[0] != 0) {
-                    array_points2.push({ "value": temp[0], "name": '连云港道管满分', "itemStyle": { "normal": { "color": '#7BCCB5' } } });
+                    array_points2.push({ "value": temp[0], "name": '连云港道管', "itemStyle": { "normal": { "color": '#7BCCB5' } } });
                 }
                 if (temp[1] != 0) {
-                    array_points2.push({ "value": temp[1], "name": '盐城道管满分', "itemStyle": { "normal": { "color": '#3EA99F' } } });
+                    array_points2.push({ "value": temp[1], "name": '盐城道管', "itemStyle": { "normal": { "color": '#3EA99F' } } });
                 }
                 if (temp[2] != 0) {
-                    array_points2.push({ "value": temp[2], "name": '南通道管满分', "itemStyle": { "normal": { "color": '#008080' } } });
+                    array_points2.push({ "value": temp[2], "name": '南通道管', "itemStyle": { "normal": { "color": '#008080' } } });
                 }
                 pushDate(data, 'score_fifteen', '0-15分');
                 pushDate(data, 'score_fifty', '15-50分');
@@ -670,7 +670,7 @@ $(function() {
                         normal: {
                             label: {
                                 show: true,
-                                formatter: '{b} :\n{c}人 ({d}%)'
+                                formatter: '{b}:{c}人({d}%)'
                             },
                             labelLine: {
                                 show: true

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/StatisticsMapper.xml

@@ -119,7 +119,7 @@
     </select>
     
     <select id="selectFeeStationCheckedScore" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
-    	SELECT sum(t.check_item_score) AS score ,t.checked_dept AS dept_id 
+    	SELECT sum(t.check_item_score) AS score ,t.checked_dept AS dept_id ,t.checked_person AS user_id
     		FROM check_score t 
     		LEFT JOIN check_item c ON t.check_item_id = c.id
     		LEFT JOIN check_task ct ON ct.id = t.task_id

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

@@ -323,14 +323,27 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			}
 		}
 
+
+
+        List<StatisticsBo> list = getEmployeeCheckedInfo(obj);
+        Map<Integer,StatisticsBo> listmap = new HashMap<>();
+		for(StatisticsBo b:list){
+            listmap.put(b.getUser().getId(),b);
+        }
+
+
 		List<StatisticsBean> listCheckedScore = statisticsDao.selectFeeStationCheckedScore(obj);
 		for (StatisticsBean sta : listCheckedScore) {
 			if (mapStationInfos.containsKey(sta.getDept_id())) {
+
+                StatisticsBo bo= listmap.get(sta.getUser_id().intValue());
+
 				StatisticsBean statis = mapStationInfos.get(sta.getDept_id());
 				statis.setAll_check_score(statis.getAll_check_score() + sta.getScore());
-				if (sta.getScore() <= 15) {
+				double sc = Double.parseDouble(bo.getCheck_score_avg());
+				if (sc <= 15) {
 					statis.setScore_fifteen(statis.getScore_fifteen() + 1);
-				} else if (sta.getScore() <= 50) {
+				} else if (sc <= 50) {
 					statis.setScore_fifty(statis.getScore_fifty() + 1);
 				} else {
 					statis.setScore_over_fifty(statis.getScore_over_fifty() + 1);
@@ -338,6 +351,10 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			}
 		}
 
+
+
+
+
 		List<StatisticsBean> sortList = new ArrayList<>(mapStationInfos.values());
 
 		sortList.sort(new Comparator<StatisticsBean>() {