修改图

VisualInspection/js/statistics/road_manage_statistics.js

@@ -12,6 +12,12 @@ var array_points2 = new Array();
 var array_allStation = new Array();
 var array_allStation_score = new Array();
 var array_check_type = new Array();
+
+var map_per_data = new HashMap();
+var map_month_data = new HashMap();
+var array_all_name = new Array()
+var array_all_deptname = new Array()
+
 var array_points_name = new Array();
 var array_points_pre = new Array();
 var arrar_points_month = new Array();
@@ -477,83 +483,117 @@ $(function() {
 
             }
         } else if (type == 6) {
-            array_check_type.length = 0;
+            array_check_type = [];
             if (data.length != 0) {
+                var map = new HashMap();
                 for (var i = 0; i < data.length; i++) {
-                    array_check_type.push({ "value": data[i].all_check_score, "name": data[i].name });
+                    if (map.get(data[i].name) == null) {
+                        map.set(data[i].name, data[i].all_check_score)
+                    } else {
+                        map.set(data[i].name, data[i].all_check_score + map.get(data[i].name))
+                    }
+
                 }
+
+                map.forEach(function(value, key) {
+                    array_check_type.push({ "value": value, "name": key });
+                });
             } else {
                 array_check_type.length = 0;
             }
         } else if (type == 7) {
-            array_points_name.length = 0;
-            array_points_pre.length = 0;
-            arrar_points_month.length = 0;
+            // array_points_name.length = 0;
+            // array_points_pre.length = 0;
+            // arrar_points_month.length = 0;
             if ((data != null && data.Pmth.length != 0) || (data != null && data.Tmth.length != 0)) {
                 data_each_people_points(data);
             } else {
-                array_points_name.length = 0;
-                array_points_pre.length = 0;
-                arrar_points_month.length = 0;
+                // array_points_name.length = 0;
+                // array_points_pre.length = 0;
+                // arrar_points_month.length = 0;
             }
         }
     }
 
     function data_each_people_points(data) {
-        var flag = true;
+        var flag = false;
         var name = ['环境卫生', '仪容仪表着装', '表情', '动作', '文明用语', '工作纪律及行为举止', '便民服务', '安全管理']
+        array_all_name = name;
+        // array_all_deptname = ["连云港道管", "盐城道管", "南通道管"];
         var Tmth = data.Tmth;
         var Pmth = data.Pmth;
-        var Ntemp = new Array();
-        var Ptemp = new Array();
-        var Ttemp = new Array();
+        // var Ntemp = new Array();
+        // var Ptemp = new Array();
+        // var Ttemp = new Array();
 
         for (var i = 0; i < name.length; i++) {
-            flag = true;
-            if (Tmth.length > 0) {
-                for (var j = 0; j < Tmth.length; j++) {
-                    if (name[i] == Tmth[j].name && Tmth[j].all_check_score != null) {
-                        // Ttemp[i] = filter_handler(Tmth[j].all_check_score,Tmth[j].checked_num,Tmth[j].people_num,0);
-                        Ttemp[i] = Tmth[j].all_check_score;
-                        break;
-                    } else {
-                        Ttemp[i] = 0;
+            //     var temp_map_m = new HashMap();
+            //     var temp_map_p = new HashMap();
+
+            for (var j = 0; j < Tmth.length; j++) {
+                flag = false;
+                if (array_all_deptname.length > 0) {
+                    for (var p = 0; p < array_all_deptname.length; p++) {
+                        if (array_all_deptname[p] == Tmth[j].feeStationName) {
+                            flag = true;
+                            break;
+                        }
                     }
                 }
-            } else {
-                Ttemp[i] = 0;
-            }
-            if (Pmth.length > 0) {
-                for (var m = 0; m < Pmth.length; m++) {
-                    if (name[i] == Pmth[m].name && Pmth[m].all_check_score != null) {
-                        // Ptemp[i] = filter_handler(Pmth[m].all_check_score,Pmth[m].checked_num,Pmth[m].people_num,0);
-                        Ptemp[i] = Pmth[m].all_check_score;
-                        break;
+                if (!flag) {
+                    array_all_deptname.push(Tmth[j].feeStationName);
+                }
+
+                if (name[i] == Tmth[j].name) {
+                    if (map_month_data.get(Tmth[j].feeStationName) != null) {
+                        var map = map_month_data.get(Tmth[j].feeStationName)
+                        if (map.get(name[i]) != null) {
+                            map.set(name[i], map.get(name[i]) + Tmth[j].all_check_score);
+                        } else {
+                            map.set(name[i], Tmth[j].all_check_score);
+                        }
+                        map_month_data.set(Tmth[j].feeStationName, map);
                     } else {
-                        Ptemp[i] = 0;
+                        var map = new HashMap();
+                        map.set(name[i], Tmth[j].all_check_score);
+                        map_month_data.set(Tmth[j].feeStationName, map);
                     }
                 }
-            } else {
-                Ptemp[i] = 0;
-            }
-            if (Ttemp[i] == 0 && Ptemp[i] == 0) {
-                name[i] = "";
-                flag = null;
+
             }
-            if (name[i] != "") {
-                if (name[i] == '仪容仪表着装') {
-                    name[i] = '仪表';
+
+            for (var j = 0; j < Pmth.length; j++) {
+                flag = false;
+                if (array_all_deptname.length > 0) {
+                    for (var p = 0; p < array_all_deptname.length; p++) {
+                        if (array_all_deptname[p] == Pmth[j].feeStationName) {
+                            flag = true;
+                            break;
+                        }
+                    }
+                }
+                if (!flag) {
+                    array_all_deptname.push(Pmth[j].feeStationName);
                 }
-                if (name[i] == '工作纪律及行为举止') {
-                    name[i] = '行为';
+                if (name[i] == Pmth[j].name) {
+                    if (map_per_data.get(Pmth[j].feeStationName) != null) {
+                        var map = map_per_data.get(Pmth[j].feeStationName)
+                        if (map.get(name[i]) != null) {
+                            map.set(name[i], map.get(name[i]) + Pmth[j].all_check_score);
+                        } else {
+                            map.set(name[i], Pmth[j].all_check_score);
+                        }
+                        map_per_data.set(Pmth[j].feeStationName, map);
+                    } else {
+                        var map = new HashMap();
+                        map.set(name[i], Pmth[j].all_check_score);
+                        map_per_data.set(Pmth[j].feeStationName, map);
+                    }
                 }
-                array_points_name.push(name[i]);
             }
 
-            if (flag) {
-                array_points_pre.push(Ptemp[i]);
-                arrar_points_month.push(Ttemp[i]);
-            }
+            //     map_month_data.set(name[i], temp_map_m)
+            //     map_pre_data.set(name[i], temp_map_p)
         }
     }
 
@@ -1089,9 +1129,107 @@ $(function() {
      * 图七
      */
     function each_people_points() {
+        var sdata = new Array();
+        for (var j = 0; j < array_all_deptname.length; j++) {
+            var dept = array_all_deptname[j]
+
+            if (map_per_data.get(dept) != null) {
+                var data_a = new Array();
+                var d_t = map_per_data.get(dept);
+                for (var i = 0; i < array_all_name.length; i++) {
+                    var name = array_all_name[i];
+                    data_a.push(d_t.get(name) == null ? 0 : d_t.get(name));
+                }
+                var d_tt = {
+                    name: dept,
+                    type: 'bar',
+                    stack: '上月',
+                    data: data_a
+                }
+                sdata.push(d_tt);
+            } else {
+                var data_a = new Array();
+                for (var i = 0; i < array_all_name.length; i++) {
+                    var name = array_all_name[i];
+                    data_a.push(0);
+                }
+                var d_tt = {
+                    name: dept,
+                    type: 'bar',
+                    stack: '上月',
+                    data: data_a
+                }
+                sdata.push(d_tt);
+            }
+
+            if (map_month_data.get(dept) != null) {
+                var data_a = new Array();
+                var d_t = map_month_data.get(dept);
+                for (var i = 0; i < array_all_name.length; i++) {
+                    var name = array_all_name[i];
+                    data_a.push(d_t.get(name) == null ? 0 : d_t.get(name));
+                }
+                var d_tt = {
+                    name: dept,
+                    type: 'bar',
+                    stack: '本月',
+                    data: data_a
+                }
+                sdata.push(d_tt);
+            } else {
+                var data_a = new Array();
+                for (var i = 0; i < array_all_name.length; i++) {
+                    var name = array_all_name[i];
+                    data_a.push(0);
+                }
+                var d_tt = {
+                    name: dept,
+                    type: 'bar',
+                    stack: '本月',
+                    data: data_a
+                }
+                sdata.push(d_tt);
+            }
+        }
+
+
+
+
+        var namelist = new Array();
+        for (var i = 0; i < array_all_name.length; i++) {
+            var name = array_all_name[i];
+            if (name == '仪容仪表着装') {
+                name = '仪表';
+            }
+            if (name == '工作纪律及行为举止') {
+                name = '行为';
+            }
+            namelist.push(name);
+        }
+
+
         option = {
             tooltip: {
-                trigger: 'axis'
+                trigger: 'axis',
+                axisPointer: { // 坐标轴指示器，坐标轴触发有效
+                    type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+                },
+                formatter: function(params, ticket, callback) {
+                    var name = "";
+                    var content = "";
+                    if (params.length > 0) {
+                        for (var i = 0; i < params.length; i++) {
+                            var p = params[i];
+                            name = p.name;
+                            if (p.series.stack == "本月") {
+                                content += "<br>本月 " + p.seriesName.replace("收费站", "") + ":" + p.value + "分"
+                            } else {
+                                content += "<br>上月 " + p.seriesName.replace("收费站", "") + ":" + p.value + "分"
+                            }
+                        }
+                    }
+                    return name + content;
+                }
             },
             noDataLoadingOption: {
                 text: '暂无数据',
@@ -1108,52 +1246,20 @@ $(function() {
                 }
             },
             grid: {
-                width: "80%"
+                width: "80%",
             },
             legend: {
-                data: ['上月', '本月']
+                data: array_all_deptname
             },
             calculable: true,
             xAxis: [{
                 type: 'category',
-                data: array_points_name
+                data: namelist
             }],
             yAxis: [{
                 type: 'value'
             }],
-            series: [{
-                    name: '上月',
-                    type: 'bar',
-                    data: array_points_pre,
-                    itemStyle: {
-                        normal: {
-                            color: '#7bc0f2',
-                            label: {
-                                show: true,
-                                textStyle: {
-                                    color: 'black'
-                                }
-                            }
-                        }
-                    },
-                },
-                {
-                    name: '本月',
-                    type: 'bar',
-                    data: arrar_points_month,
-                    itemStyle: {
-                        normal: {
-                            color: '#ea644a',
-                            label: {
-                                show: true,
-                                textStyle: {
-                                    color: 'black'
-                                }
-                            }
-                        }
-                    },
-                }
-            ]
+            series: sdata
         };
         return option;
     }

VisualInspection/js/statistics/total_company_statistics.js

@@ -9,6 +9,14 @@ var array_road_score = new Array();
 var array_allStation = new Array();
 var array_allStation_score = new Array();
 var array_check_type = new Array();
+
+var map_per_data = new HashMap();
+var map_month_data = new HashMap();
+var array_all_name = new Array()
+var array_all_deptname = new Array()
+
+
+
 var array_points_name = new Array();
 var array_points_pre = new Array();
 var arrar_points_month = new Array();
@@ -357,82 +365,166 @@ $(function() {
         } else if (type == 5) {
             array_check_type = [];
             if (data.length != 0) {
+                var map = new HashMap();
                 for (var i = 0; i < data.length; i++) {
-                    array_check_type.push({ "value": data[i].all_check_score, "name": data[i].name });
+                    if (map.get(data[i].name) == null) {
+                        map.set(data[i].name, data[i].all_check_score)
+                    } else {
+                        map.set(data[i].name, data[i].all_check_score + map.get(data[i].name))
+                    }
+
                 }
+
+                map.forEach(function(value, key) {
+                    array_check_type.push({ "value": value, "name": key });
+                });
             } else {
                 array_check_type.length = 0;
             }
         } else if (type == 6) {
-            array_points_name.length = 0;
-            array_points_pre.length = 0;
-            arrar_points_month.length = 0;
+            // array_points_name.length = 0;
+            // array_points_pre.length = 0;
+            // arrar_points_month.length = 0;
             if (data != '' && data.Pmth.length != 0 || data.Tmth.length != 0) {
                 data_each_people_points(data);
             } else {
-                array_points_name.length = 0;
-                array_points_pre.length = 0;
-                arrar_points_month.length = 0;
+                // array_points_name.length = 0;
+                // array_points_pre.length = 0;
+                // arrar_points_month.length = 0;
             }
         }
     }
 
     function data_each_people_points(data) {
-        var flag = true;
+        var flag = false;
         var name = ['环境卫生', '仪容仪表着装', '表情', '动作', '文明用语', '工作纪律及行为举止', '便民服务', '安全管理']
+        array_all_name = name;
+        // array_all_deptname = ["连云港道管", "盐城道管", "南通道管"];
         var Tmth = data.Tmth;
         var Pmth = data.Pmth;
-        var Ntemp = new Array();
-        var Ptemp = new Array();
-        var Ttemp = new Array();
+        // var Ntemp = new Array();
+        // var Ptemp = new Array();
+        // var Ttemp = new Array();
 
         for (var i = 0; i < name.length; i++) {
-            flag = true;
-            if (Tmth.length > 0) {
-                for (var j = 0; j < Tmth.length; j++) {
-                    if (name[i] == Tmth[j].name && Tmth[j].all_check_score != null) {
-                        //		Ttemp[i] = filter_handler(Tmth[j].all_check_score,Tmth[j].checked_num,Tmth[j].people_num,0);
-                        Ttemp[i] = Tmth[j].all_check_score;
-                        break;
-                    } else {
-                        Ttemp[i] = 0;
+            //     var temp_map_m = new HashMap();
+            //     var temp_map_p = new HashMap();
+
+            for (var j = 0; j < Tmth.length; j++) {
+                flag = false;
+                if (array_all_deptname.length > 0) {
+                    for (var p = 0; p < array_all_deptname.length; p++) {
+                        if (array_all_deptname[p] == Tmth[j].pfeeStationName) {
+                            flag = true;
+                            break;
+                        }
                     }
                 }
-            } else {
-                Ttemp[i] = 0;
-            }
-            if (Pmth.length > 0) {
-                for (var m = 0; m < Pmth.length; m++) {
-                    if (name[i] == Pmth[m].name && Pmth[m].all_check_score != null) {
-                        //	Ptemp[i] = filter_handler(Pmth[m].all_check_score,Pmth[m].checked_num,Pmth[m].people_num,0);
-                        Ptemp[i] = Pmth[m].all_check_score;
-                        break;
+                if (!flag) {
+                    array_all_deptname.push(Tmth[j].pfeeStationName);
+                }
+
+                if (name[i] == Tmth[j].name) {
+                    if (map_month_data.get(Tmth[j].pfeeStationName) != null) {
+                        var map = map_month_data.get(Tmth[j].pfeeStationName)
+                        if (map.get(name[i]) != null) {
+                            map.set(name[i], map.get(name[i]) + Tmth[j].all_check_score);
+                        } else {
+                            map.set(name[i], Tmth[j].all_check_score);
+                        }
+                        map_month_data.set(Tmth[j].pfeeStationName, map);
                     } else {
-                        Ptemp[i] = 0;
+                        var map = new HashMap();
+                        map.set(name[i], Tmth[j].all_check_score);
+                        map_month_data.set(Tmth[j].pfeeStationName, map);
                     }
                 }
-            } else {
-                Ptemp[i] = 0;
-            }
-            if (Ttemp[i] == 0 && Ptemp[i] == 0) {
-                name[i] = "";
-                flag = null;
+
             }
-            if (name[i] != "") {
-                if (name[i] == '仪容仪表着装') {
-                    name[i] = '仪表';
+
+            for (var j = 0; j < Pmth.length; j++) {
+                flag = false;
+                if (array_all_deptname.length > 0) {
+                    for (var p = 0; p < array_all_deptname.length; p++) {
+                        if (array_all_deptname[p] == Pmth[j].pfeeStationName) {
+                            flag = true;
+                            break;
+                        }
+                    }
                 }
-                if (name[i] == '工作纪律及行为举止') {
-                    name[i] = '行为';
+                if (!flag) {
+                    array_all_deptname.push(Pmth[j].pfeeStationName);
+                }
+                if (name[i] == Pmth[j].name) {
+                    if (map_per_data.get(Pmth[j].pfeeStationName) != null) {
+                        var map = map_per_data.get(Pmth[j].pfeeStationName)
+                        if (map.get(name[i]) != null) {
+                            map.set(name[i], map.get(name[i]) + Pmth[j].all_check_score);
+                        } else {
+                            map.set(name[i], Pmth[j].all_check_score);
+                        }
+                        map_per_data.set(Pmth[j].pfeeStationName, map);
+                    } else {
+                        var map = new HashMap();
+                        map.set(name[i], Pmth[j].all_check_score);
+                        map_per_data.set(Pmth[j].pfeeStationName, map);
+                    }
                 }
-                array_points_name.push(name[i]);
             }
 
-            if (flag) {
-                array_points_pre.push(Ptemp[i]);
-                arrar_points_month.push(Ttemp[i]);
-            }
+            //     map_month_data.set(name[i], temp_map_m)
+            //     map_pre_data.set(name[i], temp_map_p)
         }
+        // console.log(Tmth)
+        // console.log(map_month_data)
+
+
+        // flag = true;
+        // if (Tmth.length > 0) {
+        //     for (var j = 0; j < Tmth.length; j++) {
+        //         if (name[i] == Tmth[j].name && Tmth[j].all_check_score != null) {
+        //             //		Ttemp[i] = filter_handler(Tmth[j].all_check_score,Tmth[j].checked_num,Tmth[j].people_num,0);
+        //             Ttemp[i] = Tmth[j].all_check_score;
+        //             break;
+        //         } else {
+        //             Ttemp[i] = 0;
+        //         }
+        //     }
+        // } else {
+        //     Ttemp[i] = 0;
+        // }
+        // if (Pmth.length > 0) {
+        //     for (var m = 0; m < Pmth.length; m++) {
+        //         if (name[i] == Pmth[m].name && Pmth[m].all_check_score != null) {
+        //             //	Ptemp[i] = filter_handler(Pmth[m].all_check_score,Pmth[m].checked_num,Pmth[m].people_num,0);
+        //             Ptemp[i] = Pmth[m].all_check_score;
+        //             break;
+        //         } else {
+        //             Ptemp[i] = 0;
+        //         }
+        //     }
+        // } else {
+        //     Ptemp[i] = 0;
+        // }
+        // if (Ttemp[i] == 0 && Ptemp[i] == 0) {
+        //     name[i] = "";
+        //     flag = null;
+        // }
+        // if (name[i] != "") {
+        //     if (name[i] == '仪容仪表着装') {
+        //         name[i] = '仪表';
+        //     }
+        //     if (name[i] == '工作纪律及行为举止') {
+        //         name[i] = '行为';
+        //     }
+        //     array_points_name.push(name[i]);
+        // }
+
+        // if (flag) {
+        //     array_points_pre.push(Ptemp[i]);
+        //     arrar_points_month.push(Ttemp[i]);
+        // }
+        // }
     }
 
     /**
@@ -639,18 +731,20 @@ $(function() {
                         normal: {
                             label: {
                                 show: true,
-                                position: 'inner',
-                                formatter: function(params, ticket, callback) {
-
-                                    var res = params.name;
-                                    if (params.percent < 10) {
-                                        return "";
-                                    }
-                                    return res;
+                                formatter: '{b}:\n{c}人({d}%)',
+                                textStyle: {
+                                    alias: 'center',
+                                    fontSize: 10,
+                                    color: '#888'
                                 }
                             },
                             labelLine: {
-                                show: false
+                                show: true,
+                                length: 20,
+                                lineStyle: {
+                                    color: '#888'
+                                }
+
                             }
                         }
                     },
@@ -659,7 +753,7 @@ $(function() {
                 {
                     name: '访问来源',
                     type: 'pie',
-                    radius: [80, 120],
+                    radius: [150, 190],
 
                     // for funnel
                     x: '60%',
@@ -669,11 +763,11 @@ $(function() {
                     itemStyle: {
                         normal: {
                             label: {
-                                show: true,
+                                show: false,
                                 formatter: '{b}:{c}人({d}%)'
                             },
                             labelLine: {
-                                show: true
+                                show: false
                             }
                         }
                     },
@@ -877,9 +971,108 @@ $(function() {
      * 图六
      */
     function each_people_points_six() {
+
+        var sdata = new Array();
+        for (var j = 0; j < array_all_deptname.length; j++) {
+            var dept = array_all_deptname[j]
+
+            if (map_per_data.get(dept) != null) {
+                var data_a = new Array();
+                var d_t = map_per_data.get(dept);
+                for (var i = 0; i < array_all_name.length; i++) {
+                    var name = array_all_name[i];
+                    data_a.push(d_t.get(name) == null ? 0 : d_t.get(name));
+                }
+                var d_tt = {
+                    name: dept,
+                    type: 'bar',
+                    stack: '上月',
+                    data: data_a
+                }
+                sdata.push(d_tt);
+            } else {
+                var data_a = new Array();
+                for (var i = 0; i < array_all_name.length; i++) {
+                    var name = array_all_name[i];
+                    data_a.push(0);
+                }
+                var d_tt = {
+                    name: dept,
+                    type: 'bar',
+                    stack: '上月',
+                    data: data_a
+                }
+                sdata.push(d_tt);
+            }
+
+            if (map_month_data.get(dept) != null) {
+                var data_a = new Array();
+                var d_t = map_month_data.get(dept);
+                for (var i = 0; i < array_all_name.length; i++) {
+                    var name = array_all_name[i];
+                    data_a.push(d_t.get(name) == null ? 0 : d_t.get(name));
+                }
+                var d_tt = {
+                    name: dept,
+                    type: 'bar',
+                    stack: '本月',
+                    data: data_a
+                }
+                sdata.push(d_tt);
+            } else {
+                var data_a = new Array();
+                for (var i = 0; i < array_all_name.length; i++) {
+                    var name = array_all_name[i];
+                    data_a.push(0);
+                }
+                var d_tt = {
+                    name: dept,
+                    type: 'bar',
+                    stack: '本月',
+                    data: data_a
+                }
+                sdata.push(d_tt);
+            }
+        }
+
+
+
+
+        var namelist = new Array();
+        for (var i = 0; i < array_all_name.length; i++) {
+            var name = array_all_name[i];
+            if (name == '仪容仪表着装') {
+                name = '仪表';
+            }
+            if (name == '工作纪律及行为举止') {
+                name = '行为';
+            }
+            namelist.push(name);
+        }
+
+
         option = {
             tooltip: {
-                trigger: 'axis'
+                trigger: 'axis',
+                axisPointer: { // 坐标轴指示器，坐标轴触发有效
+                    type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+                },
+                formatter: function(params, ticket, callback) {
+                    var name = "";
+                    var content = "";
+                    if (params.length > 0) {
+                        for (var i = 0; i < params.length; i++) {
+                            var p = params[i];
+                            name = p.name;
+                            if (p.series.stack == "本月") {
+                                content += "<br>本月 " + p.seriesName.replace("道管中心", "") + ":" + p.value + "分"
+                            } else {
+                                content += "<br>上月 " + p.seriesName.replace("道管中心", "") + ":" + p.value + "分"
+                            }
+                        }
+                    }
+                    return name + content;
+                }
             },
             noDataLoadingOption: {
                 text: '暂无数据',
@@ -899,49 +1092,17 @@ $(function() {
                 width: "80%",
             },
             legend: {
-                data: ['上月', '本月']
+                data: array_all_deptname
             },
             calculable: true,
             xAxis: [{
                 type: 'category',
-                data: array_points_name
+                data: namelist
             }],
             yAxis: [{
                 type: 'value'
             }],
-            series: [{
-                    name: '上月',
-                    type: 'bar',
-                    data: array_points_pre,
-                    itemStyle: {
-                        normal: {
-                            color: '#7bc0f2',
-                            label: {
-                                show: true,
-                                textStyle: {
-                                    color: 'black'
-                                }
-                            }
-                        }
-                    },
-                },
-                {
-                    name: '本月',
-                    type: 'bar',
-                    data: arrar_points_month,
-                    itemStyle: {
-                        normal: {
-                            color: '#ea644a',
-                            label: {
-                                show: true,
-                                textStyle: {
-                                    color: 'black'
-                                }
-                            }
-                        }
-                    },
-                }
-            ]
+            series: sdata
         };
         return option;
     }

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

@@ -99,6 +99,7 @@ public class StatisticsBean {
     
     // 收费站名称
     private String feeStationName ;
+    private String pfeeStationName ;
     
     private User user;
     

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

@@ -269,7 +269,7 @@
      
      
      <select id="selectCheckedItemScoreInfo" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
-     	SELECT count(DISTINCT m.task_id) AS checked_num , sum(m.check_item_score) AS all_check_score , m.parent_id,m.check_item_name AS name FROM check_task t INNER JOIN
+     	SELECT count(DISTINCT m.task_id) AS checked_num , sum(m.check_item_score) AS all_check_score , m.parent_id,m.checked_dept as dept_id,(select parentid from t_sys_organ where id=m.checked_dept ) as parent_dept_id,m.check_item_name AS name FROM check_task t INNER JOIN
 		(
 			select ci.name AS check_item_name , t.* FROM
 			(  SELECT ci.parent_id, t.* from check_score t LEFT JOIN check_item  ci ON t.check_item_id = ci.id
@@ -289,7 +289,7 @@
 			) m ON t.id = m.task_id
 			where t.check_status !=22 and t.id not in <include refid="taskexclouddeleteUser"/>
 			AND monthfunc( t.start_time ) = #{mth}
-		GROUP BY m.parent_id
+		GROUP BY m.parent_id,m.checked_dept order by  m.checked_dept
      </select>
      
      

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

@@ -1033,6 +1033,8 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 
 		for (int i = 0; i < objList.size(); i++) {
 			objList.get(i).setPeople_num(people_num);
+            objList.get(i).setFeeStationName(CacheUtil.getOrgannameFromMap(objList.get(i).getDept_id()));
+            objList.get(i).setPfeeStationName(CacheUtil.getOrgannameFromMap(objList.get(i).getParent_dept_id()));
 		}
 
 		map.put("Tmth", objList);
@@ -1043,6 +1045,8 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 
 		for (int i = 0; i < objList.size(); i++) {
 			objList.get(i).setPeople_num(people_num);
+            objList.get(i).setFeeStationName(CacheUtil.getOrgannameFromMap(objList.get(i).getDept_id()));
+            objList.get(i).setPfeeStationName(CacheUtil.getOrgannameFromMap(objList.get(i).getParent_dept_id()));
 		}
 
 		map.put("Pmth", objList);