fix bug：公司统计中收费站统计

VisualInspection/js/main.js

@@ -350,6 +350,7 @@ function addBreadMenu(url, name, flag) {
         else
             $("#breadcrumb_menu").append('<li murl="' + url + '" mname="' + name + '"><a href="javascript:void(0)" onclick="changePage(\'' + url + '\')"><span>' + name + '</span></a></li>');
     }
+    isnew = true;
 }
 
 function hasMenu(url, name) {

VisualInspection/js/statistics/total_company_statistics.js

@@ -385,12 +385,14 @@ $(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, 1.0, 0))));
                 } else {
                     array_allStation_score.length = 0;
                     array_allStation.length = 0;
                 }
             }
+
             if (eval("Math.min(" + array_allStation_score.toString() + ")") == 0)
                 min_allStation = 0;
             else
@@ -406,6 +408,7 @@ $(function() {
                     rank[i] = i + 1;
                 }
             }
+            array_allStation_score_temp = new Array();
             for (var i = 0; i < array_allStation_score.length; i++) {
                 array_allStation.push(data[i].feeStationName.substr(0, data[i].feeStationName.length - 3) + "\n" + (rank[i]));
                 array_allStation_score_temp.push({ value: array_allStation_score[i], name: data[i].feeStationName })

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

@@ -248,6 +248,7 @@
         </if>
         GROUP BY
         t.checked_person,
+        t.checked_dept,
         mth
         ) check_num_t
 
@@ -271,9 +272,9 @@
         ) t
         ON m.task_id = t.id
         WHERE 1=1
-        GROUP BY mth , m.checked_person
+        GROUP BY mth , m.checked_person,m.checked_dept
 
-        ) checked_score_t  ON checked_score_t.checked_person = check_num_t.checked_person
+        ) checked_score_t  ON (checked_score_t.checked_person = check_num_t.checked_person and checked_score_t.checked_dept = check_num_t.checked_dept)
         AND check_num_t.mth = checked_score_t.mth
     </sql>