东部三期

VisualInspection/fwq/js/other_check/other_check.js

@@ -60,7 +60,9 @@ function init() {
     if (roleContains("ROAD_MANAGER")) {
         roadManager2 = getCurrentUser().organid;
     }
-    var feeList = getOrganList(roadManager2);
+    //var feeList = getOrganList(roadManager2);
+    var feeList = $.zui.store.get("cache_sa_station_list");
+    console.log(feeList);
     setSASelectValueNoAll(feeList, "#select-dept", dept);
     // setPersonal();// 2期不需要人员显示
     var zTreeObj;

VisualInspection/fwq/js/statistics/assess_type.js

@@ -63,9 +63,9 @@ function getHeadHtml(data) {
     var strHead = "";
     itemArray = data.itemList;
     var colspanNum = data.itemList.length + 1;
-    strHead += "<tr><th rowspan='2' width='6%'>工号</th><th rowspan='2' width='6%'>岗位</th><th rowspan='2' width='6%'>管道内服务区排名</th>";
-    strHead += "<th rowspan='2' width='10%'>出警</th><th rowspan='2' width='6%'>受检次数</th>";
-    strHead += "<th colspan=" + colspanNum + " height='40px'>存在问题扣分详情</th><th rowspan='2' width='6%'>管道中心受检服务区平均扣分（千分制）</th></tr><tr>";
+    strHead += "<tr><th rowspan='2' width='6%'>工号</th><th rowspan='2' width='6%'>岗位</th><th rowspan='2' width='6%'>管理处排名</th>";
+    strHead += "<th rowspan='2' width='10%'>服务区</th><th rowspan='2' width='6%'>受检次数</th>";
+    strHead += "<th colspan=" + colspanNum + " height='40px'>存在问题扣分详情</th><th rowspan='2' width='6%'>管理处受检服务区平均扣分（千分制）</th></tr><tr>";
     for(var i=0;i<data.itemList.length;i++){
         strHead += "<th width='55px'>"+data.itemList[i]+"</th>";
     }
@@ -80,6 +80,7 @@ function getHeadHtml(data) {
  * @param {*} avg
  */
 function gethtml(data, i, organList, avg, lists) {
+    console.log(data);
     var strTbody = "";
     if (i == 0 || i == organList[0] || i == organList[1]) {
 
@@ -88,7 +89,7 @@ function gethtml(data, i, organList, avg, lists) {
         var rowspan = 0;
         order = 1;
         if (i == 0) {
-            name = "连云港";
+            name = "连云港管理处";
             rowspan = organList[0];
             ranking = rank[i];
             for (var i = 0; i < lists.length; i++) {
@@ -97,7 +98,7 @@ function gethtml(data, i, organList, avg, lists) {
                 }
             }
         } else if (i == organList[0]) {
-            name = "盐城";
+            name = "连盐管理处";
             rowspan = organList[1]-organList[0];
             ranking = rank[i];
             for (var i = 0; i < lists.length; i++) {
@@ -106,7 +107,7 @@ function gethtml(data, i, organList, avg, lists) {
                 }
             }
         } else if (i == organList[1]) {
-            name = "南通";
+            name = "盐通管理处";
             rowspan = organList[2]-organList[1];
             ranking = rank[i];
             for (var i = 0; i < lists.length; i++) {
@@ -165,6 +166,15 @@ function getTotalScore(data, check_item_name) {
 function check_people_avg(data) {
     var list = data.list;
     var organList = data.organList;
+    if(list.length == 7){
+        for(var index in organList){
+               obj = organList[index];
+               if(obj.organname == '连云港管理处'){
+                     obj.sacount = 1;
+               }
+        }
+    }
+    console.log(organList);
     var organArray = new Array();
     var organCount = 0;
     for (h=0;h<organList.length;h++) {
@@ -197,7 +207,7 @@ function check_people_avg(data) {
 
     // 组装表格头部
     $(".table-thead")[0].innerHTML = getHeadHtml(data);
-
+    
     // 道管下的服务区排名
     ranking_method(list,organArray);
     for (i = 0; i < list.length; i++) {

VisualInspection/fwq/js/statistics/dept_check_statistics.js

@@ -61,7 +61,6 @@ function getdeptscore(starttime, endtime) {
     var url = "f/statistics/dept";
     
     post_common_service(url, data_p, function(data) {
-
         //     var table = '';
         if( (time_m + 1) * 4 * 60 < 1170 ) {
             $('.datatable').css('width', (time_m + 1) * 4 * 60+125+11+'px' )
@@ -72,7 +71,7 @@ function getdeptscore(starttime, endtime) {
         else {
             $('.datatable').css('width', 1170+'px' )
             $('.datatable').css('margin-left', 0 )
-            $('.tb').eq(0).css('left', 247+'px')
+          //$('.tb').eq(0).css('left', 0+'px')
         }
         //先确定表格标题
         var h_html = "<tr><th rowspan=2 style='width:30px'>序号</th><th rowspan=2 style='width:95px'>站名</th>";

VisualInspection/fwq/js/statistics/operation_management_integration.js

@@ -20,6 +20,9 @@ function queryTypeClick() {
         "start_date": start_date,
         "end_date": end_date,
     }
+
+
+    
     var url = "f/statistics/operation/manage/integration";
     var strTbody = '';
     post_common_service(url, param, function(data) {
@@ -32,6 +35,7 @@ function queryTypeClick() {
 
 /**
  * 表格初始化
+ * 
  */
 function initQueryType() {
     var t = getTimeByMonth($("#start-time").val());

VisualInspection/fwq/view/statistics/dept_check_statistics.html

@@ -92,7 +92,7 @@
         <div class="tb" style="height: 500px;background: rgb(255, 255, 255);width: 1565px;position: absolute;left: 0;width: 1440px;margin-left: 125px;top: 83px;z-index: 100;">
                 <table border="0" width="100%" align="center" id="table2"></table>
         </div> -->
-        <div class="tb" style="position: fixed;left:247px;top:208px;height: 83px;z-index: 102;width: 125px;">
+        <div class="tb" style="position: fixed;top:208px;height: 83px;z-index: 102;width: 125px;">
             <table border="0" class="table-head" width="100%" height="100%" align="center" id="table_h_left">
             </table>
         </div>

VisualInspection/fwq/view/statistics/total_company_statistics.html

@@ -42,7 +42,7 @@
         <!-- <div class="line-3"></div> -->
         <div class="col-sm-6">
             <div class="border-no">
-                <div class="title-div"><span class="title-span">道管中心得分排名</span></div>
+                <div class="title-div"><span class="title-span">管理处得分排名</span></div>
                 <div id="roadManager-score-rank" style="width:100%;height:400px;float:left;background-color: #fff;"></div>
             </div>
         </div>

VisualInspection/js/config.js

@@ -25,7 +25,9 @@ function getserveraddr() {
         return "http://200.200.19.126:8089/"
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236:8089/"
-    } else {
+    } else if (base_ui_url.indexOf("172.26.51.200:8080") != -1) {
+        return "http://172.26.51.200:8089/"
+    }else {
         return "http://10.112.0.199:8089/"
             // return "http://10.112.0.199:7001/"
     }
@@ -76,10 +78,10 @@ function getImageaddr() {
     } else if (base_ui_url.indexOf("file_release_yanhai") != -1) {
         return "http://file_release_yanhai.jsxt.jsjtyxt.com:8283/";
     } else if (base_ui_url.indexOf("localhost") != -1) {
-        // return "http://10.112.0.199:7000/"
+         return "http://10.112.0.199/"
         // return "http://file_release_yanhai.jsxt.jsjtyxt.com:8283/";
         //return "http://localhost:8081/";
-        return "http://200.200.19.126:8080/"
+       // return "http://200.200.19.126:8080/"
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236/"
     } else if (base_ui_url.indexOf("200.200.19.126") != -1) {

VisualInspection/js/mytask/check.js

@@ -4,7 +4,6 @@ function initCheck() {
     $("#ex1").on("slideStop", function(slideEvt) {
         setVideoProcess(slideEvt.value);
     });
-
     $("#ex1").on("change", function(sender) {
         var width = $("#ex1").siblings(".slider").children(".slider-track").children(".slider-selection").width();
         var total_width = $("#ex1").siblings(".slider").children(".slider-track").width();
@@ -38,12 +37,12 @@ function initCheck() {
 
     $("#tabcontent").css("height", ($("#video_content").height() - 80) + "px");
     $("#score_datatable").css("height", ($("#video_content").height() - 120) + "px");
-    if (ISCLIENT) {
-        event = document.createEvent('MessageEvent');
-        var origin = window.location.protocol + '//' + window.location.host;
-        event.initMessageEvent('setvideoposition', true, true, getVideoPosition(null), origin, 1234, window, null);
-        document.dispatchEvent(event);
-    }
+    // if (ISCLIENT) {
+    //     event = document.createEvent('MessageEvent');
+    //     var origin = window.location.protocol + '//' + window.location.host;
+    //     event.initMessageEvent('setvideoposition', true, true, getVideoPosition(null), origin, 1234, window, null);
+    //     document.dispatchEvent(event);
+    // }
 
 
 
@@ -95,6 +94,13 @@ function initCheck() {
         if (videos[0]) {
             curVideo = videos[0];
             queryVideoList();
+           // if (ISCLIENT) {
+                debugger;
+                event = document.createEvent('MessageEvent');
+                var origin = window.location.protocol + '//' + window.location.host;
+                event.initMessageEvent('setvideoposition', true, true, getVideoPosition(null), origin, 1234, window, null);
+                document.dispatchEvent(event);
+           // }
         } else {
             callFunc("showvideoview", "false");
             layer.msg('该处暂无视屏！', {

VisualInspection/js/statistics/assess_type.js

@@ -108,7 +108,7 @@ function gethtml(data, i, avg, lists) {
         var rowspan = 0;
         order = 1;
         if (i == 0) {
-            name = "连云港";
+            name = "连云港管理处";
             rowspan = lianyungang_Station.length;
             ranking = rank[i];
             for (var i = 0; i < lists.length; i++) {
@@ -117,7 +117,7 @@ function gethtml(data, i, avg, lists) {
                 }
             }
         } else if (i == lianyungang_Station.length) {
-            name = "盐城";
+            name = "连盐管理处";
             rowspan = yancheng_Station.length;
             ranking = rank[i];
             for (var i = 0; i < lists.length; i++) {
@@ -126,7 +126,7 @@ function gethtml(data, i, avg, lists) {
                 }
             }
         } else if (i == lianyungang_Station.length+yancheng_Station.length) {
-            name = "南通";
+            name = "盐通管理处";
             rowspan = nantong_Station.length;
             ranking = rank[i];
             for (var i = 0; i < lists.length; i++) {

VisualInspection/js/statistics/total_company_statistics.js

@@ -332,13 +332,13 @@ $(function() {
 
 
         if (temp[0] != 0) {
-            array_points2.push({ "value": temp[0], "name": '连云港道管', "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": '盐城道管', "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": '南通道管', "itemStyle": { "normal": { "color": color3 } } });
+            array_points2.push({ "value": temp[2], "name": '盐通管理处', "itemStyle": { "normal": { "color": color3 } } });
         }
     }
 
@@ -407,13 +407,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分');
@@ -421,8 +421,9 @@ $(function() {
             } else {
                 array_points.length = 0;
             }
-            console.log(data);
+            //console.log(data);
         } else if (type == 3) {
+            console.log(data);
             var scoreTotalArray;
             if(ctype == 1){
                 for(var index in data.rmlist){
@@ -452,6 +453,7 @@ $(function() {
                    }
                    data.sort(sequence);
             }
+            
                 array_road.length = 0;
                 array_road_score.length = 0;
                 for (var i = 0; i < data.length; i++) {
@@ -567,7 +569,7 @@ $(function() {
                 array_check_type.push({ "value": data.totalDataScore, "name": "数据平台应用" });
             }
         } else if (type == 6) {
-            console.log(data);
+            //console.log(data);
             array_all_deptname = new Array();
             map_month_data = new HashMap();
             map_per_data = new HashMap();
@@ -1018,8 +1020,12 @@ $(function() {
             },
             calculable: true,
             xAxis: [{
-                axisLabel: {
-                    interval: 0
+                axisLabel: {  
+                    interval: 0,  
+                    formatter:function(value)  
+                    {  
+                        return value.split("").join("\n");  
+                    }  
                 },
                 type: 'category',
                 data: array_allStation

VisualInspection/js/util/service.js

@@ -318,6 +318,7 @@ function VideoGetById(id, success, fail) {
 }
 
 function VideoGetByIds(ids, success, fail) {
+    console.log("获取数据中");
     var url = base_server_url + VIDEO_GET_IDs + ids;
     console.log(url);
     ajaxGet(url, "", function(response) {

VisualInspection/js/util/util.js

@@ -254,6 +254,7 @@ function setSASelect(div, selectId) {
         setSASelectValue(feeList, div, selectId);
     } else {
         get_common_service("/dept/getAllSA", null, function(data) {
+            console.log(data);
             $.zui.store.set("cache_sa_station_list", data);
             setSASelectValue(data, div, selectId);
         });
@@ -263,7 +264,9 @@ function setSASelect(div, selectId) {
 var hasall = true;
 
 function setSASelecttemp(div, selectId, hasall1) {
+    debugger;
     var feeList = $.zui.store.get("cache_sa_station_list");
+    console.log(feeList);
     hasall = hasall1;
     if (feeList) {
         setSASelectValue(feeList, div, selectId);
@@ -386,7 +389,8 @@ var cache_service_area_map;
 //获取服务区列表
 function getServiceAreaList(callback) {
     get_common_service("/dept/getAllSA", null, function(data) {
-        $.zui.store.set("cache_service_area_list", data);
+        console.log(data);
+        $.zui.store.set("cache_sa_station_list", data);
         var map = new Map();
         for (var i = 0; i < data.length; i++) {
             if (!map.get(data[i].parentid)) {

VisualInspection/js/util/video.js

@@ -43,6 +43,7 @@ function setVideoPos() {
 }
 
 function queryVideoLists(videoIds) {
+    console.log(videoIds);
     if (CLIENTVERSION == 1 && ISCLIENT) {
         callFunc("showvideoview", "false");
         layer.msg('该软件版本太低，请升级！', {
@@ -79,6 +80,8 @@ function queryVideoLists(videoIds) {
                     v_port.push(videoObj.port);
               }
               videoIds = cammercode.toString();
+            }else{
+                v_port.push(0); 
             }
             if (data != null && typeof(data) != "undefined") {
                 var pp = {
@@ -87,11 +90,11 @@ function queryVideoLists(videoIds) {
                     "starttime": startTime,
                     "endtime": endTime,
                     "cammercode": cammercode.toString(),
-                    "username": username.toString(),
-                    "userpwd": userpwd.toString(),
-                    "v_ip": v_ip.toString(),
+                    // "username": username.toString(),
+                    // "userpwd": userpwd.toString(),
+                    // "v_ip": v_ip.toString(),
                     "video_type":video_type,
-                    "v_port": v_port.toString(),
+                    // "v_port": v_port.toString(),
                     "videos": []
                 };
 
@@ -126,9 +129,8 @@ function queryVideoLists(videoIds) {
 
 
 function queryVideoList() {
-
     var videos = $.checkTask.video_id.split(',');
-
+    
     if (curVideo) {
         s1 = $.checkTask.start_time.replace(/-/g, "/");
         var startTime = new Date(s1).getTime() / 1000;
@@ -144,9 +146,10 @@ function queryVideoList() {
                 break;
             }
         }
-
+      debugger
         //获取摄像头信息
         VideoGetById(curVideo, function(data) {
+            console.log(data);
             if (data != null && typeof(data) != "undefined") {
                 var video_type = 1;
                 var str = curVideo + '|' + startTime + '|' + endTime + '|' + data.cameratype + '|' + data.playtype + '|' + index;

VisualInspection/qzd/js/other_check/other_check.js

@@ -877,7 +877,7 @@ function static() {
                 '            </thead>' +
                 '            <tbody>' +
                 '                <tr>' +
-                '                    <td style="width:40px">道管</td>' +
+                '                    <td style="width:40px">管理处</td>' +
                 '                    <td style="width:78px">服务区</td>' +
                 itemsname +
                 '                    <td>得分<br>（1000）</td>' +

VisualInspection/qzd/js/statistics/assess_type.js

@@ -196,7 +196,7 @@ function gethtml(data, i, itemlist, avg, lists) {
         var score = (1000-count/checkNum).toFixed(2); 
         count = count/checkNum;
       }
-
+      count = count.toFixed(2);
      // strTbody +="<th colspan=" + itemlist[0].length + " height='40px'>视频稽查</th><th colspan=" + itemlist[1].length + " height='40px'>暗访稽查</th><th colspan=" + itemlist[2].length + " height='40px'>现场检查</th>"
       strTbody +="<th width='6%'>"+count+"</th><th width='6%'>"+score+"</th>"
       strTbody +="</tr>"

VisualInspection/qzd/js/statistics/operation_management_integration.js

@@ -135,7 +135,11 @@ function check_operation_avg(data) {
     qzdPeople = 0;
     qzdRecord = 0;
     for (i = 0; i < list.length; i++) {
-        $(".table-tbody").append(gethtml(list[i], i, dataArray[0], data.deptList[i]));
+        if(data.deptList[i] > 0){
+            $(".table-tbody").append(gethtml(list[i], i, dataArray[0], data.deptList[i]));
+        }else{
+            $(".table-tbody").append(gethtml(list[i], i, dataArray[0], 0));
+        }       
     }
     $(".table-tbody").append(getTotalHtml(data));
 }

VisualInspection/qzd/js/statistics/total_company_statistics.js

@@ -426,7 +426,7 @@ $(function() {
             }
             array_allStation_score_temp = new Array();
             for (var i = 0; i < array_allStation_score.length; i++) {
-                array_allStation.push(data[i].name+(rank[i]));
+                array_allStation.push(data[i].name+data[i].company_ranking2);
                 array_allStation_score_temp.push({ value: array_allStation_score[i], name: data[i].name })
             }
         } else if (type == 5) {
@@ -780,9 +780,10 @@ $(function() {
             },
             calculable: true,
             xAxis: [{
-                axisLabel: {
-                    interval: 0
-                },
+                axisLabel: {  
+                    interval:0,  
+                    rotate:40  
+                 },
                 type: 'category',
                 data: array_road
             }],
@@ -1207,6 +1208,10 @@ $(function() {
             },
             calculable: true,
             xAxis: [{
+                axisLabel: {  
+                    interval:0,  
+                    rotate:40  
+                 },
                 type: 'category',
                 data: namelist
             }],

VisualInspection/qzd/view/statistics/total_company_statistics.html

@@ -57,21 +57,21 @@
         </div>
         <!-- <div class="line-3"></div> -->
         <div class="col-sm-6">
-            <!-- <div class="border-no">
-                <div class="title-div"><span class="title-span">清障队检查问题类别占比</span></div>
-                <div id="server-check-type" style="width:100%;height:400px;float:left;background-color: #fff;"></div>
-            </div> -->
+            <div class="border-no">
+                <div class="title-div"><span>各个问题类别的扣分情况</span></div>
+                <div id="each-people-points" style="width:100%;height:400px;float:left;"></div>
+            </div>
         </div>
     </div>
 
-    <div class="border-line">
+    <!-- <div class="border-line">
         <div>
             <div class="border-no">
                 <div class="title-div"><span>各个问题类别的扣分情况</span></div>
                 <div id="each-people-points" style="width:100%;height:400px;float:left;"></div>
             </div>
         </div>
-    </div>
+    </div> -->
 
 </div>
 <script>

VisualInspection/view/common/head.html

@@ -5,7 +5,7 @@
                 <img src="/images/logo.png" />
             </li> -->
             <li id="headimg">
-                <img src="/images/logo_name1.png" />
+                <img src="/images/logoName.png" />
             </li>
            
         </ul>

VisualInspection/view/common/login_head.html

@@ -5,7 +5,7 @@
                 <img src="/images/logo.png" />
             </li> -->
             <li>
-                <img src="/images/logo_name1.png" />
+                <img src="/images/logoName.png" />
             </li>
         </ul>
 

VisualInspection/view/other_check/data_platform_check.html

@@ -10,7 +10,7 @@
                 <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
             </div>
             <span style="float: left;
-            padding-top: 5px;">道管：</span>
+            padding-top: 5px;">管理处</span>
             <div class="div-roadManage">
                 <select class="form-control" id="first"></select>
             </div>

VisualInspection/view/other_check/special_check.html

@@ -10,7 +10,7 @@
                 <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
             </div>
             <span style="float: left;
-                 padding-top: 5px;">道管：</span>
+                 padding-top: 5px;">管理处：</span>
             <div class="div-roadManage">
                 <select class="form-control" id="first"></select>
             </div>

VisualInspection/view/other_check/third_unannounced_check.html

@@ -13,7 +13,7 @@
             </div>
             <div class="col-xs-1" style="width:220px">
                 <span style="float: left;
-                 padding-top: 5px;">道管：</span>
+                 padding-top: 5px;">管理处：</span>
                 <div class="div-roadManage">
                     <select class="form-control" id="first"></select>
                 </div>

VisualInspection/view/other_check/toubleshoot_check.html

@@ -10,7 +10,7 @@
                 <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
             </div>
             <span style="float: left;
-                 padding-top: 5px;">道管：</span>
+                 padding-top: 5px;">管理处：</span>
             <div class="div-roadManage">
                 <select class="form-control" id="first"></select>
             </div>

VisualInspection/view/statistics/assess_situation.html

@@ -33,8 +33,8 @@
                 <table border="1" width="100%" height="90px" align="center" class="a">
                     <thead>
                         <tr>
-                            <th rowspan="2" width="10%" id="tb_th_1">道管</th>
-                            <th rowspan="2" width="7%" id="tb_th_2">道管内排名</th>
+                            <th rowspan="2" width="10%" id="tb_th_1">管理处</th>
+                            <th rowspan="2" width="7%" id="tb_th_2">管理处内排名</th>
                             <th rowspan="2" width="8%" id="tb_th_3">站名</th>
                             <th rowspan="2" width="8%" id="tb_th_4">收费值机人数</th>
                             <th rowspan="2" width="6%" id="tb_th_5">受检人数</th>

VisualInspection/view/statistics/assess_type.html

@@ -32,10 +32,10 @@
               <div class="table-head" ><table border="1" width="100%" height="90px" align="center">
                  <thead>
                         <tr>
-                        <th rowspan="2" width="6%">道管整体排名</th><th rowspan="2" width="6%">道管</th><th rowspan="2" width="6%">管道内收费站排名</th>
+                        <th rowspan="2" width="6%">管理处整体排名</th><th rowspan="2" width="6%">管理处</th><th rowspan="2" width="6%">管理处内收费站排名</th>
                         <th rowspan="2" width="8%">站名</th><th rowspan="2" width="6%">收费值机岗位人数</th><th rowspan="2" width="6%">受检人数</th>
                         <th rowspan="2" width="6%">受检次数</th><th colspan="9" height="40px">存在问题扣分详情</th>
-                        <th rowspan="2" width="6%">受检人平均每人次扣分（千分制）</th><th rowspan="2" width="6%">管道中心受检人平均每人次扣分（千分制）</th>
+                        <th rowspan="2" width="6%">受检人平均每人次扣分（千分制）</th><th rowspan="2" width="6%">管理处受检人平均每人次扣分（千分制）</th>
                         </tr>
                         <tr> 
                         <th width="54px">环境卫生</th><th width="54px">仪容仪表</th><th width="54px">表情</th>

VisualInspection/view/statistics/business_promotion_feedback.html

@@ -6,7 +6,7 @@
         <form class="form-horizontal">
             <div class="form-group">
                 <div class="form-group col-sm-3">
-                    <label for="exampleInputAccount1" class="col-sm-4">道管中心</label>
+                    <label for="exampleInputAccount1" class="col-sm-4">管理处</label>
                     <div class="col-sm-8">
                         <select class="form-control" id="center-manager">
                             <!--<option selected value="">全部</option>

VisualInspection/view/statistics/emp_ranking.html

@@ -6,7 +6,7 @@
         <form class="form-horizontal">
             <div class="form-group">
                 <div class="form-group col-sm-3">
-                    <label for="exampleInputAccount1" class="col-sm-4">道管中心</label>
+                    <label for="exampleInputAccount1" class="col-sm-4">管理处</label>
                     <div class="col-sm-8">
                         <select class="form-control" id="center-manager">
                             <!--<option selected value="">全部</option>
@@ -91,7 +91,7 @@
                             <th rowspan="2" width="6%" id='th_4'>岗位</th>
                             <th rowspan="2" width="7%" id='th_5'>工号</th>
                             <th rowspan="2" width="4%" id='th_6'>公司排名</th>
-                            <th rowspan="2" width="4%" id='th_7'>道管排名</th>
+                            <th rowspan="2" width="4%" id='th_7'>管理处排名</th>
                             <th rowspan="2" width="4%" id='th_8'>收费站排名</th>
                             <th colspan="9" height="40px" id='th_9'>考核扣分</th>
                             <th rowspan="2" width="6%" id='th_10'>受检次数

VisualInspection/view/statistics/personal_data_statistics.html

@@ -47,7 +47,7 @@
         <div class="current-month">
             <span style="margin-left:20px;">本月：</span>
             <span style="margin-left:50px;">站内排名：</span><span style="display: -moz-inline-box;display: inline-block;width:100px" id="c_dept_ranking">-</span>
-            <span>道管排名：</span><span style="display: -moz-inline-box;display: inline-block;width:100px" id="c_road_ranking">-</span>
+            <span>管理处排名：</span><span style="display: -moz-inline-box;display: inline-block;width:100px" id="c_road_ranking">-</span>
             <span>公司排名：</span><span style="display: -moz-inline-box;display: inline-block;width:100px" id="c_com_ranking">-</span>
             <span>总扣分：</span><span style="display: -moz-inline-box;display: inline-block;width:100px" id="c_score_ranking">-</span>
 
@@ -56,7 +56,7 @@
         <div class="next-month">
             <span style="margin-left:20px;">上月：</span>
             <span style="margin-left:50px;">站内排名：</span><span style="display: -moz-inline-box;display: inline-block;width:100px" id="l_dept_ranking">-</span>
-            <span>道管排名：</span><span style="display: -moz-inline-box;display: inline-block;width:100px" id="l_road_ranking">-</span>
+            <span>管理处排名：</span><span style="display: -moz-inline-box;display: inline-block;width:100px" id="l_road_ranking">-</span>
             <span>公司排名：</span><span style="display: -moz-inline-box;display: inline-block;width:100px" id="l_com_ranking">-</span>
             <span>总扣分：</span><span style="display: -moz-inline-box;display: inline-block;width:100px" id="l_score_ranking">-</span>
 

VisualInspection/view/statistics/road_manage_statistics.html

@@ -33,14 +33,14 @@
     <!-- <div class="line-1"></div> -->
 
     <div class="border-line">
-    <div class="title-div"><span>道管中心12个月考核得分总体变化趋势分析</span></div>
+    <div class="title-div"><span>管理处12个月考核得分总体变化趋势分析</span></div>
     <div id="roadManager-year-assess" style="height: 100%;height:400px;"></div>
     </div>
 
     <div class="row">
         <div class="col-sm-6">
             <div class="border-no">
-                <div class="title-div"><span>道管中心考核扣分情况占比</span></div>
+                <div class="title-div"><span>管理处考核扣分情况占比</span></div>
                 <div id="roadManager-points-assess" style="width:100%;height:400px;float:left;"></div>
             </div>
         </div>

VisualInspection/view/statistics/toll_station_statistics.html

@@ -55,7 +55,7 @@
             <!-- <div class="line-3"></div> -->
         <div class="col-sm-6">
             <div class="border-no">
-                <div class="title-div" id="progress"><span class="title-span">道管中心得分排名</span><div class="btn-change">
+                <div class="title-div" id="progress"><span class="title-span">管理处得分排名</span><div class="btn-change">
                         <div title="切换" class="view_change" title="切换排行榜"></div></div></div>
                 <div class="title-div" id="backward" style="display:none;"><span>考核退步Top5排行榜</span></div>
                 <!-- <div id="roadManager-score-rank" style="width:100%;height:400px;float:left;background-color: #fff;"></div> -->

VisualInspection/view/statistics/total_company_statistics.html

@@ -33,7 +33,7 @@
 
     <div class="border-line">
         <div class="row-3">
-            <div class="title-div"><span>公司12个月考核得分总体变化趋势分析</span></div>
+            <div class="title-div"><span></span></div>
         </div>
         <div id="company-year-assess" style="height: 100%;height:400px;"></div>
     </div>
@@ -48,7 +48,7 @@
         <!-- <div class="line-3"></div> -->
         <div class="col-sm-6">
             <div class="border-no">
-                <div class="title-div"><span class="title-span">道管中心得分排名</span></div>
+                <div class="title-div"><span class="title-span">管理处得分排名</span></div>
                 <div id="roadManager-score-rank" style="width:100%;height:400px;float:left;background-color: #fff;"></div>
             </div>
         </div>

VisualInspection/view/statistics/user_check_statistics.html

@@ -71,7 +71,7 @@
     <div class="row" style="position: relative;">
 
         <div class="row">
-            <label class="col-sm-1" style="line-height:30px;width:80px">道管中心</label>
+            <label class="col-sm-1" style="line-height:30px;width:80px">管理处</label>
             <div class="col-sm-2">
                 <select class="form-control" id="center-manager">
                     <!--<option selected value="">全部</option>

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

@@ -33,7 +33,7 @@ public class Webcam {
 	private String devicenumber;
 	private String ip;
 	private Integer port;
-	private Integer channel;
+	private String channel;
 	private Integer cameratype;
 	private Integer playtype;
 	private String user_name;

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/cluster/DepartmentDao.java

@@ -18,6 +18,7 @@ import java.util.List;
 public interface DepartmentDao  {
 	public List<Organ> getAll();
     public List<Organ> getOrgan(Organ organ);
+    public List<Organ> getOldOrgan(Organ organ);
     public void insert(Organ organ);
     public void update(Organ organ);
     public void delete(Integer id);
@@ -27,7 +28,10 @@ public interface DepartmentDao  {
     public List<FeeStation> getAllSA();
     public List<Organ> getCarDept();
     public FeeStation getFsBydeptId(Integer id);
-    
+    public void updateManager(Organ organ);
+    public void updateStation(Organ organ);
+    public void updateService(Organ organ);
+    public void updateWrecker(Organ organ);
     public List<StatisticsBean> selectFeeStationGroup(User obj);
 
     List<FwqNum> getOrganToSaCount();

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/DepartmentMapper.xml

@@ -73,7 +73,7 @@
     
     <select id="getOrgan" parameterType="com.xintong.visualinspection.bean.Organ" resultMap="BaseResultMap">
         SELECT 
-        id,organname,remark,parentid,classtype,organcode,isshow,deptype,status
+        id,organname,remark,parentid,classtype,organcode,isshow,deptype,status,creattime
          FROM t_sys_organ
          where 1=1
          <if test="organname != null">and organname = #{organname} </if>
@@ -86,7 +86,22 @@
          <if test="status != null">and status = #{status} </if>
          <if test="id != null and id != 0">and id = #{id} </if>
     </select>
-    
+
+    <select id="getOldOrgan" parameterType="com.xintong.visualinspection.bean.Organ" resultMap="BaseResultMap">
+        SELECT
+        id,organname,remark,parentid,classtype,organcode,isshow,deptype,status,creattime
+        FROM t_sys_organ_old
+        where 1=1
+        <if test="organname != null">and organname = #{organname} </if>
+        <if test="remark != null">and remark = #{remark} </if>
+        <if test="parentid != null and parentid!=0">and parentid = #{parentid} </if>
+        <if test="classtype != null">and classtype = #{classtype} </if>
+        <if test="organcode != null">and organcode = #{organcode} </if>
+        <if test="isshow != null">and isshow = #{isshow} </if>
+        <if test="deptype != null">and deptype = #{deptype} </if>
+        <if test="status != null">and status = #{status} </if>
+        <if test="id != null and id != 0">and id = #{id} </if>
+    </select>
 
     <insert id="insert" parameterType="com.xintong.visualinspection.bean.Organ" >
         INSERT INTO
@@ -153,5 +168,39 @@
         ORDER BY PARENTID
     </select>
 
+    <update id="updateManager" parameterType="com.xintong.visualinspection.bean.Organ" >
+        UPDATE
+    t_br_layer_road_manager
+        SET
+        <if test="organname != null">name = #{organname}</if>
+        WHERE
+        organ_id = #{id}
+    </update>
 
+    <update id="updateStation" parameterType="com.xintong.visualinspection.bean.Organ" >
+        UPDATE
+       t_br_layer_fee_station
+        SET
+        <if test="organname != null">name = #{organname}</if>
+        WHERE
+        organ_id = #{id}
+    </update>
+
+    <update id="updateService" parameterType="com.xintong.visualinspection.bean.Organ" >
+        UPDATE
+        t_br_layer_service_area
+        SET
+        <if test="organname != null">name = #{organname}</if>
+        WHERE
+        organ_id = #{id}
+    </update>
+
+    <update id="updateWrecker" parameterType="com.xintong.visualinspection.bean.Organ" >
+        UPDATE
+       t_br_layer_wrecker_group
+        SET
+        <if test="organname != null"> name = #{organname}</if>
+        WHERE
+        organ_id = #{id}
+    </update>
 </mapper>

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

@@ -67,6 +67,15 @@ public class DepartmentServiceImpl extends BaseService implements DepartmentServ
 	@Override
 	public void update(Organ organ) {
 		departmentDao.update(organ);
+		if(organ.getOrganname().indexOf("管理处") != -1){
+			departmentDao.updateManager(organ);
+		}else if(organ.getOrganname().indexOf("收费站") != -1){
+			departmentDao.updateStation(organ);
+		}else if(organ.getOrganname().indexOf("服务区") != -1){
+			departmentDao.updateService(organ);
+		}else if(organ.getOrganname().indexOf("清障") != -1){
+			departmentDao.updateWrecker(organ);
+		}
 	}
 
 	@Override

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

@@ -365,15 +365,27 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 
 		user.setInvalidtime(obj.getStart_date());
 		List<StatisticsBean> lists = departmentDao.selectFeeStationGroup(user);
+		lists = getDeptData(lists,obj);
 		Map<Long, StatisticsBean> mapStationInfos = new HashMap<>();
-		for(StatisticsBean sb :lists){
-		    Organ org = new Organ();
-		    long deptId = sb.getDept_id();
-		    org.setId((int)deptId);
-		    List<Organ> dept = departmentDao.getOrgan(org);
-		    int parentId = dept.get(0).getParentid();
-            sb.setParent_dept_id((long)parentId);
-        }
+		if(lists.size() > 25){
+			for(StatisticsBean sb :lists){
+				Organ org = new Organ();
+				long deptId = sb.getDept_id();
+				org.setId((int)deptId);
+				List<Organ> dept = departmentDao.getOrgan(org);
+				int parentId = dept.get(0).getParentid();
+				sb.setParent_dept_id((long)parentId);
+			}
+		}else{
+			for(StatisticsBean sb :lists){
+				Organ org = new Organ();
+				long deptId = sb.getDept_id();
+				org.setId((int)deptId);
+				List<Organ> dept = departmentDao.getOldOrgan(org);
+				int parentId = dept.get(0).getParentid();
+				sb.setParent_dept_id((long)parentId);
+			}
+		}
 		for (StatisticsBean sta : lists) {
 			if (sta.getParent_dept_id() == 30) {
 				sta.setId(1);
@@ -484,16 +496,27 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		user.setPosition_ids(positionList);
 		user.setInvalidtime(obj.getStart_date());
 		List<StatisticsBean> lists = departmentDao.selectFeeStationGroup(user);
-
+		lists = getDeptData(lists,obj);
 		Map<Long, StatisticsBean> mapStationInfos = new HashMap<>();
-        for(StatisticsBean sb :lists){
-            Organ org = new Organ();
-            long deptId = sb.getDept_id();
-            org.setId((int)deptId);
-            List<Organ> dept = departmentDao.getOrgan(org);
-            int parentId = dept.get(0).getParentid();
-            sb.setParent_dept_id((long)parentId);
-        }
+		if(lists.size() >25){
+			for(StatisticsBean sb :lists){
+				Organ org = new Organ();
+				long deptId = sb.getDept_id();
+				org.setId((int)deptId);
+				List<Organ> dept = departmentDao.getOrgan(org);
+				int parentId = dept.get(0).getParentid();
+				sb.setParent_dept_id((long)parentId);
+			}
+		}else{
+			for(StatisticsBean sb :lists){
+				Organ org = new Organ();
+				long deptId = sb.getDept_id();
+				org.setId((int)deptId);
+				List<Organ> dept = departmentDao.getOldOrgan(org);
+				int parentId = dept.get(0).getParentid();
+				sb.setParent_dept_id((long)parentId);
+			}
+		}
         for (StatisticsBean sta : lists) {
             if (sta.getParent_dept_id() == 30) {
                 sta.setId(1);
@@ -706,7 +729,11 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		map.put("total50", total50);
 		map.put("totalOver50", totalOver50);
 		map.put("totalAll", totalAll);
-		exportExcel("温馨服务检查千分考核扣分情况汇总表", "checked_info", map, resp);
+		if(list.size() < 25){
+			exportExcel("温馨服务检查千分考核扣分情况汇总表", "checked_info_old", map, resp);
+		}else{
+			exportExcel("温馨服务检查千分考核扣分情况汇总表", "checked_info", map, resp);
+		}
 	}
 
 	@Override
@@ -759,7 +786,11 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		map.putAll(scoreTypeMap);
 		map.put("totalAll", totalAll);
 		map.put("list", list);
-		exportExcel("温馨服务检查情况统计表", "checked_item_info", map, resp);
+		if(list.size() < 25){
+			exportExcel("温馨服务检查情况统计表", "checked_item_info_old", map, resp);
+		}else{
+			exportExcel("温馨服务检查情况统计表", "checked_item_info", map, resp);
+		};
 	}
 
 	@Override
@@ -833,6 +864,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			organ.setParentid(obj.getDept_id().intValue());
 
 			List<Organ> list = departmentDao.getOrgan(organ);
+			list = getOrganData(list,obj);
 			// 将导管中心下的收费站部门id 列表放入到list中
 			obj.setDept_list(list);
 		}
@@ -847,6 +879,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		} else if (obj.getQueryType() != null && obj.getQueryType() == 2) {
 			// 收费站
 			feeStationList = userInfoDao.getUsersCountList();
+			feeStationList = getDeptData(feeStationList,obj);
 			if (feeStationList != null && feeStationList.size() > 0) {
 				for (StatisticsBean sta : feeStationList) {
 					if (obj.getDept_id() + 0L == sta.getDept_id()) {
@@ -857,6 +890,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		} else {
 			// 总公司
 			feeStationList = userInfoDao.getUsersCountList();
+			feeStationList = getDeptData(feeStationList,obj);
 			if (feeStationList != null && feeStationList.size() > 0) {
 				for (StatisticsBean sta : feeStationList) {
 					people_num += sta.getPeople_num();
@@ -935,8 +969,8 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 	@Override
 	public List<StatisticsBean> getSingleFeeStationScoreInfo(StatisticsBean obj) {
 		List<StatisticsBean> resultList = new ArrayList<>();
-
 		List<StatisticsBean> scoreList = reFeeStationScoreInfo(obj);
+		scoreList = getDeptData(scoreList,obj);
 		Map<Long, StatisticsBean> centerManageMap = new HashMap<>();
 		for (StatisticsBean sta : scoreList) {
 			if (!centerManageMap.containsKey(sta.getDept_id())) {
@@ -999,7 +1033,12 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		List<StatisticsBean> lists = departmentDao.selectFeeStationGroup(user);
 		int i = 0;
 		for (StatisticsBean sta : lists) {
-			if (i < 7) {
+			Organ organ = new Organ();
+			long deptId = sta.getDept_id();
+			int  dept = (int)deptId;
+			organ.setId(dept);
+			int parentId = departmentDao.getOrgan(organ).get(0).getParentid();
+			if (parentId == 30) {
 				centerManageList.get(0).setAll_check_score(centerManageList.get(0).getAll_check_score()
 						+ centerManageMap.get(sta.getDept_id()).getAll_check_score());
 				centerManageList.get(0).setChecked_num(centerManageList.get(0).getChecked_num()
@@ -1007,15 +1046,15 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 				centerManageList.get(0).setPeople_num(centerManageList.get(0).getPeople_num()
 						+ centerManageMap.get(sta.getDept_id()).getPeople_num());
 
-				centerManageList.get(0).setFeeStationName("连云港");
-			} else if (i < 13) {
+				centerManageList.get(0).setFeeStationName("连云港管理处");
+			} else if (parentId == 31) {
 				centerManageList.get(1).setAll_check_score(centerManageList.get(1).getAll_check_score()
 						+ centerManageMap.get(sta.getDept_id()).getAll_check_score());
 				centerManageList.get(1).setChecked_num(centerManageList.get(1).getChecked_num()
 						+ centerManageMap.get(sta.getDept_id()).getChecked_num());
 				centerManageList.get(1).setPeople_num(centerManageList.get(1).getPeople_num()
 						+ centerManageMap.get(sta.getDept_id()).getPeople_num());
-				centerManageList.get(1).setFeeStationName("盐城");
+				centerManageList.get(1).setFeeStationName("连盐管理处");
 			} else {
 				centerManageList.get(2).setAll_check_score(centerManageList.get(2).getAll_check_score()
 						+ centerManageMap.get(sta.getDept_id()).getAll_check_score());
@@ -1023,7 +1062,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 						+ centerManageMap.get(sta.getDept_id()).getChecked_num());
 				centerManageList.get(2).setPeople_num(centerManageList.get(2).getPeople_num()
 						+ centerManageMap.get(sta.getDept_id()).getPeople_num());
-				centerManageList.get(2).setFeeStationName("南通");
+				centerManageList.get(2).setFeeStationName("盐通管理处");
 			}
 			i++;
 		}
@@ -1941,6 +1980,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		user.setPosition_ids(positionList);
 		user.setInvalidtime(obj.getStart_date());
 		List<StatisticsBean> lists = departmentDao.selectFeeStationGroup(user);
+		lists = getDeptData(lists,obj);
 		Map<Long, StatisticsBean> mapStationInfos = new HashMap<>();
 		int i = 0;
 		for (StatisticsBean sta : lists) {
@@ -3106,4 +3146,44 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		return map;
 	}
 
+	public List<StatisticsBean> getDeptData(List<StatisticsBean> list,StatisticsBean sObj){
+		List<StatisticsBean> lists =new ArrayList<StatisticsBean>();
+		for(StatisticsBean bean : list){
+			Organ obj = new Organ();
+			long deptId = bean.getDept_id();
+			obj.setId((int)deptId);
+			Organ organ = departmentDao.getOrgan(obj).get(0);
+			Date date = new Date();
+			if(sObj.getStart_date() == null) {
+				//Date date1=null;
+				SimpleDateFormat simdate1 = new SimpleDateFormat("yyyy/MM/dd");
+				String str1 = sObj.getMth() + "/01";
+				try {
+					sObj.setStart_date(simdate1.parse(str1));
+				} catch (Exception e) {
+// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+			System.out.print(organ.getCreattime().getTime()+"-------------"+ sObj.getStart_date().getTime());
+			if(organ.getCreattime().getTime() < sObj.getStart_date().getTime()){
+				lists.add(bean);
+			}
+		}
+
+		return lists;
+	}
+
+	public List<Organ> getOrganData(List<Organ> list,StatisticsBean sObj){
+		List<Organ> lists =new ArrayList<Organ>();
+		for(Organ bean : list){
+			Organ obj = new Organ();
+			Date date = new Date();
+			if(bean.getCreattime().getTime() < sObj.getStart_date().getTime()){
+				lists.add(bean);
+			}
+		}
+		return lists;
+	}
+
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/util/DeptUtil.java

@@ -0,0 +1,33 @@
+package com.xintong.visualinspection.util;
+
+import com.xintong.visualinspection.bean.Organ;
+import com.xintong.visualinspection.bean.StatisticsBean;
+import com.xintong.visualinspection.dao.cluster.DepartmentDao;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.method.P;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class DeptUtil {
+
+    @Autowired
+    private DepartmentDao departmentDao;
+
+    public List<StatisticsBean> getDeptData(List<StatisticsBean> list,StatisticsBean sObj){
+        List<StatisticsBean> lists =new ArrayList<StatisticsBean>();
+        for(StatisticsBean bean : list){
+            Organ obj = new Organ();
+            long deptId = bean.getDept_id();
+            obj.setId((int)deptId);
+            Organ organ = departmentDao.getOrgan(obj).get(0);
+            Date date = new Date();
+            if(organ.getCreattime().getTime() < sObj.getStart_date().getTime()){
+                lists.add(bean);
+            }
+        }
+        return lists;
+    }
+
+}

VisualInspection_server/src/main/resources/application.properties

@@ -5,8 +5,12 @@ context.listener.classes=com.xintong.SystemInit
 #master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://git.topm.win:9003/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://192.168.45.158:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
-#master.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://192.168.45.158:3306/visual_test?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://10.112.0.199:3306/visual_test?useUnicode=true&characterEncoding=utf-8
 master.datasource.url = jdbc:mysql://127.0.0.1:7004/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://127.0.0.1:7004/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://127.0.0.1:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
@@ -17,8 +21,12 @@ master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.x
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf8
 #cluster.datasource.url=jdbc:mysql://git.topm.win:9003/visualinspection?useUnicode=true&characterEncoding=utf8
 #cluster.datasource.url = jdbc:mysql://192.168.45.158:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
+#cluster.datasource.url = jdbc:mysql://192.168.45.158:3306/visual_test?useUnicode=true&characterEncoding=utf-8
+#cluster.datasource.url = jdbc:mysql://10.112.0.199:3306/visual_test?useUnicode=true&characterEncoding=utf-8
 #cluster.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection?useUnicode=true&characterEncoding=utf-8
+#cluster.datasource.url = jdbc:mysql://127.0.0.1:7004/visual_test?useUnicode=true&characterEncoding=utf-8
 cluster.datasource.url = jdbc:mysql://127.0.0.1:7004/visualinspection?useUnicode=true&characterEncoding=utf-8
+#cluster.datasource.url = jdbc:mysql://127.0.0.1:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
@@ -142,8 +150,9 @@ dubbo.protocol.status = server
 
 ## RegistryConfig Bean
 dubbo.registry.id = demoservice
-dubbo.registry.address = zookeeper://127.0.0.1:2181
+#dubbo.registry.address = zookeeper://10.112.0.199:2181
 #dubbo.registry.address = zookeeper://192.168.45.158:2181
+dubbo.registry.address = zookeeper://127.0.0.1:2181
 dubbo.registry.file = ./output/dubbo.cache
 
 

Visuallnspection_fjq/.idea/workspace.xml

@@ -28,7 +28,6 @@
     </navigator>
     <panes>
       <pane id="Scope" />
-      <pane id="AndroidView" />
       <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
@@ -51,12 +50,13 @@
           <select />
         </subPane>
       </pane>
+      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="D:/Visuallnspection_njy/VisualInspection_server" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/visuallnspection_fjq" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
   </component>
@@ -129,11 +129,13 @@
       <workItem from="1535368355504" duration="70000" />
       <workItem from="1554257887011" duration="734000" />
       <workItem from="1554708635186" duration="23000" />
+      <workItem from="1560920693097" duration="15000" />
+      <workItem from="1567495032555" duration="49000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="847000" />
+    <option name="totallyTimeSpent" value="911000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
@@ -145,24 +147,24 @@
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
       <window_info anchor="right" id="Maven Projects" order="3" />
-      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Terminal" order="7" />
+      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.32905984" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24530831" />
-      <window_info anchor="right" id="Database" order="3" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24865952" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info id="UI Designer" order="2" />
       <window_info anchor="right" id="Theme Preview" order="3" />
-      <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Database" order="3" />
       <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Find" order="1" />
     </layout>

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

@@ -24,7 +24,7 @@
             resultType="com.xintong.visualinspection.bean.FwqStatisticsBean">
         SELECT
         /*COUNT(t.checked_dept) AS checked_num,*/
-        15 AS checked_num,
+        10 AS checked_num,
         t.checked_dept AS dept_id
         FROM view_check_task t
         WHERE 1=1
@@ -83,7 +83,7 @@
             resultType="com.xintong.visualinspection.bean.FwqStatisticsBean">
         SELECT
             /*COUNT(1) AS checked_num, */
-            15 AS checked_num,
+            10 AS checked_num,
             t.checked_dept dept_id
         FROM view_check_task t
         WHERE 1=1
@@ -161,7 +161,7 @@
         FROM (
         SELECT
         /*count(t.id)     AS checked_num,*/
-        15     AS checked_num,
+        10     AS checked_num,
         sum(cs.check_item_score) AS all_check_score,
         cs.check_item_id,
         cs.checked_dept as dept_id
@@ -260,7 +260,7 @@
             resultType="com.xintong.visualinspection.bean.FwqStatisticsBean">
         SELECT
           /*count(DISTINCT m.task_id)   AS checked_num,*/
-          15   AS checked_num,
+          10   AS checked_num,
           sum(m.check_item_score)     AS all_check_score,
           m.check_item_id,
           m.checked_dept              AS dept_id
@@ -328,7 +328,7 @@
         (
         SELECT
         /*COUNT(t.id)             AS checked_num,*/
-        15             AS checked_num,
+        10             AS checked_num,
         monthfunc(t.start_time) AS mth,
         t.checked_dept
         FROM
@@ -384,7 +384,7 @@
         (
         SELECT
         /*COUNT(t.checked_dept)   AS checked_num,*/
-        15   AS checked_num,
+        10   AS checked_num,
         monthfunc(t.start_time) AS mth,
         t.id,
         t.checked_dept

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/service/impl/CheckOtherService_FImpl.java

@@ -188,7 +188,7 @@ public class CheckOtherService_FImpl implements CheckOtherService_F {
                         s.add(o);
                     }
                 }
-                datas.put(a.getName().replaceAll("道管中心", ""), s);
+                datas.put(a.getName().replaceAll("管理处", ""), s);
             }
 
         }

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/service/impl/StatisticsServiceImpl.java

@@ -63,11 +63,14 @@ public class StatisticsServiceImpl implements StatisticsService_F {
             registry = "${dubbo.registry.address}")
     private CommonService commonService;
 
+    public static Double check_num = 10.0;
+
     @Override
     public List<FwqStatisticsBean> getOperationInfo(FwqStatisticsBean obj) {
 
         // 获得所有服务区数据
         List<FeeStation> saList = commonService.getAllDeptByLayer("SA");
+        saList = getDeptData(saList,obj);
         Map<Long, FwqStatisticsBean> mapStationInfos = new HashMap<>();
         for (FeeStation sta : saList) {
             FwqStatisticsBean obj2 = new FwqStatisticsBean();
@@ -88,7 +91,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
         for (FwqStatisticsBean company_bean : company_beans) {
 //            mapStationInfos.get(company_bean.getDept_id()).setCompany_check_num(company_bean.getChecked_num());
             // 公司稽查固定15次稽查
-            mapStationInfos.get(company_bean.getDept_id()).setCompany_check_num(15);
+            mapStationInfos.get(company_bean.getDept_id()).setCompany_check_num(check_num.intValue());
             mapStationInfos.get(company_bean.getDept_id()).setCompany_total_score(company_bean.getAll_check_score());
         }
         for (FwqStatisticsBean third_bean : third_beans) {
@@ -115,8 +118,8 @@ public class StatisticsServiceImpl implements StatisticsService_F {
             value.setOnsite_check_num(1);
             // 设置总平均扣分
             if (value.getCompany_check_num() > 0 || value.getThird_check_num() > 0) {
-                avgWxfw += value.getCompany_total_score() / 15.0;
-                avg += value.getCompany_total_score() / 15.0 * 0.3 + value.getThird_total_score() * 0.4 + value.getOnsite_total_score() * 0.3;
+                avgWxfw += value.getCompany_total_score() / check_num;
+                avg += value.getCompany_total_score() / check_num * 0.3 + value.getThird_total_score() * 0.4 + value.getOnsite_total_score() * 0.3;
             }
 //            if (value.getOnsite_check_num() > 0) {
 //                avg += value.getOnsite_total_score() / 2.0 / value.getOnsite_check_num();
@@ -382,6 +385,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
 
         // 获得所有服务区数据
         List<FeeStation> saList = commonService.getAllDeptByLayer("SA");
+        saList = getDeptData(saList,obj);
         Map<Long, Item> itemMap = commonService.getItemMap();
         Map<Long, FwqStatisticsBean> mapStationInfos = new HashMap<>();
         for (FeeStation sta : saList) {
@@ -803,7 +807,7 @@ public class StatisticsServiceImpl implements StatisticsService_F {
 //            } else if ("32".equals(sta.getParentid())) {
 //                obj2.setId(3);
 //            }
-            obj2.setChecked_num(15);
+            obj2.setChecked_num(check_num.intValue());
             mapStationInfos.put(Long.valueOf(sta.getDeptid()), obj2);
         }
 
@@ -923,19 +927,19 @@ public class StatisticsServiceImpl implements StatisticsService_F {
                         + centerManageMap.get(sta.getDept_id()).getAll_check_score());
                 centerManageList.get(0).setChecked_num(centerManageList.get(0).getChecked_num()
                         + centerManageMap.get(sta.getDept_id()).getChecked_num());
-                centerManageList.get(0).setFeeStationName("连云港");
+                centerManageList.get(0).setFeeStationName("连云港管理处");
             } else if (sta.getParent_dept_id() == 31) {
                 centerManageList.get(1).setAll_check_score(centerManageList.get(1).getAll_check_score()
                         + centerManageMap.get(sta.getDept_id()).getAll_check_score());
                 centerManageList.get(1).setChecked_num(centerManageList.get(1).getChecked_num()
                         + centerManageMap.get(sta.getDept_id()).getChecked_num());
-                centerManageList.get(1).setFeeStationName("盐城");
+                centerManageList.get(1).setFeeStationName("连盐管理处");
             } else if (sta.getParent_dept_id() == 32) {
                 centerManageList.get(2).setAll_check_score(centerManageList.get(2).getAll_check_score()
                         + centerManageMap.get(sta.getDept_id()).getAll_check_score());
                 centerManageList.get(2).setChecked_num(centerManageList.get(2).getChecked_num()
                         + centerManageMap.get(sta.getDept_id()).getChecked_num());
-                centerManageList.get(2).setFeeStationName("南通");
+                centerManageList.get(2).setFeeStationName("盐通管理处");
             }
         }
 
@@ -1178,4 +1182,27 @@ public class StatisticsServiceImpl implements StatisticsService_F {
         scoreList.addAll(reList);
         return scoreList;
     }
+
+    public List<FeeStation> getDeptData(List<FeeStation> list,FwqStatisticsBean sObj){
+        List<FeeStation> lists =new ArrayList<FeeStation>();
+        for(FeeStation bean : list){
+//            if(sObj.getStart_date() == null) {
+//                //Date date1=null;
+//                SimpleDateFormat simdate1 = new SimpleDateFormat("yyyy/MM/dd");
+//                String str1 = sObj.getMth() + "/01";
+//                try {
+//                    sObj.setStart_date(simdate1.parse(str1));
+//                } catch (Exception e) {
+//// TODO Auto-generated catch block
+//                    e.printStackTrace();
+//                }
+//            }
+            if(bean.getCreattime().getTime() < sObj.getEnd_date().getTime()){
+                lists.add(bean);
+            }
+        }
+
+        return lists;
+    }
+
 }

Visuallnspection_fjq/visuallnspection_fjq/src/main/java/com/xintong/visualinspection/visuallnspection_fjq/service/impl/StatisticsService_FImpl.java

@@ -65,6 +65,7 @@ public class StatisticsService_FImpl implements StatisticsService_F {
 
         // 获得所有服务区数据
         List<FeeStation> saList = commonService.getAllDeptByLayer("SA");
+        saList = getDeptData(saList,obj);
         Map<Long, FwqStatisticsBean> mapStationInfos = new HashMap<>();
         for (FeeStation sta : saList) {
             FwqStatisticsBean obj2 = new FwqStatisticsBean();
@@ -382,6 +383,7 @@ public class StatisticsService_FImpl implements StatisticsService_F {
 
         // 获得所有服务区数据
         List<FeeStation> saList = commonService.getAllDeptByLayer("SA");
+        saList = getDeptData(saList,obj);
         Map<Long, Item> itemMap = commonService.getItemMap();
         Map<Long, FwqStatisticsBean> mapStationInfos = new HashMap<>();
         for (FeeStation sta : saList) {
@@ -646,4 +648,15 @@ public class StatisticsService_FImpl implements StatisticsService_F {
         }
         return 0;
     }
+
+    public List<FeeStation> getDeptData(List<FeeStation> list,FwqStatisticsBean sObj){
+        List<FeeStation> lists =new ArrayList<FeeStation>();
+        for(FeeStation bean : list){
+            if(bean.getCreattime().getTime() < sObj.getEnd_date().getTime()){
+                lists.add(bean);
+            }
+        }
+
+        return lists;
+    }
 }

Visuallnspection_fjq/visuallnspection_fjq/src/main/resources/application.properties

@@ -18,17 +18,18 @@ dubbo.protocol.status = server
 ## RegistryConfig Bean
 dubbo.registry.id = fjq_service
 #dubbo.registry.address = zookeeper://git.topm.win:9994
-dubbo.registry.address = zookeeper://192.168.45.158:2181
-#dubbo.registry.address = zookeeper://127.0.0.1:2181
+#dubbo.registry.address = zookeeper://192.168.45.158:2181
+dubbo.registry.address = zookeeper://127.0.0.1:2181
 dubbo.registry.file = ./output/dubbo1.cache
 dubbo.reference.check=false
 dubbo.consumer.check=false
 
 
 
-#master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection_2?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://192.168.45.158:3306/visualinspection_2?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://10.112.0.199:3306/visual_test2?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://192.168.45.158:3306/visualinspection_2?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://127.0.0.1:7004/visualinspection_2?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://127.0.0.1:7004/visual_test2?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection_2?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root

Visuallnspection_fjq/visuallnspectioninteface/src/main/java/com/xintong/visualinspection/util/CacheUtil.java

@@ -8,10 +8,7 @@ import com.xintong.visualinspection.service.JobService;
 import com.xintong.visualinspection.service.UserService;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class CacheUtil {
 

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/StatisticsServiceImpl.java

@@ -58,6 +58,7 @@ public class StatisticsServiceImpl implements StatisticsService_Q {
 
         // 获得所有服务区数据
         List<FeeStation> saList = commonService.getAllDeptByLayer("WG");
+        saList = getDeptData(saList,obj);
         Map<Long, FwqStatisticsBean> mapStationInfos = new HashMap<>();
         if (obj.getStart_date() != null && obj.getEnd_date() != null) {
             CheckTaskPeriod p = commonService.getCheckTaskPeriod(obj.getStart_date().getTime() , obj.getEnd_date().getTime());
@@ -90,17 +91,23 @@ public class StatisticsServiceImpl implements StatisticsService_Q {
         List<FwqStatisticsBean> onsite_beans = fwqStatisticsDao.getselectFeeStationOperationScoreDetail(obj);
 
         for (FwqStatisticsBean company_bean : company_beans) {
-            mapStationInfos.get(company_bean.getDept_id()).setCompany_check_num(company_bean.getChecked_num());
-            mapStationInfos.get(company_bean.getDept_id()).setCompany_total_score(company_bean.getAll_check_score());
+            if(mapStationInfos.get(company_bean.getDept_id()) != null){
+                mapStationInfos.get(company_bean.getDept_id()).setCompany_check_num(company_bean.getChecked_num());
+                mapStationInfos.get(company_bean.getDept_id()).setCompany_total_score(company_bean.getAll_check_score());
+            }
         }
         for (FwqStatisticsBean third_bean : third_beans) {
-            mapStationInfos.get(third_bean.getDept_id()).setThird_check_num(third_bean.getChecked_num() > 1 ? 1 : third_bean.getChecked_num());
-            mapStationInfos.get(third_bean.getDept_id()).setThird_total_score(third_bean.getCheck_total_score());
+            if(mapStationInfos.get(third_bean.getDept_id()) != null) {
+                mapStationInfos.get(third_bean.getDept_id()).setThird_check_num(third_bean.getChecked_num() > 1 ? 1 : third_bean.getChecked_num());
+                mapStationInfos.get(third_bean.getDept_id()).setThird_total_score(third_bean.getCheck_total_score());
+            }
         }
 
         for (FwqStatisticsBean onsite_bean : onsite_beans) {
-            mapStationInfos.get(onsite_bean.getDept_id()).setOnsite_check_num(onsite_bean.getChecked_num() > 1 ? 1 : onsite_bean.getChecked_num());
-            mapStationInfos.get(onsite_bean.getDept_id()).setOnsite_total_score(onsite_bean.getCheck_total_score());
+            if(mapStationInfos.get(onsite_bean.getDept_id()) != null) {
+                mapStationInfos.get(onsite_bean.getDept_id()).setOnsite_check_num(onsite_bean.getChecked_num() > 1 ? 1 : onsite_bean.getChecked_num());
+                mapStationInfos.get(onsite_bean.getDept_id()).setOnsite_total_score(onsite_bean.getCheck_total_score());
+            }
         }
         // 计算出每个收费站的总平均扣分和平均得分
         Set<Map.Entry<Long, FwqStatisticsBean>> stationInfos = mapStationInfos.entrySet();
@@ -1415,4 +1422,15 @@ public class StatisticsServiceImpl implements StatisticsService_Q {
 
            return objList;
        }
+
+    public List<FeeStation> getDeptData(List<FeeStation> list,FwqStatisticsBean sObj){
+        List<FeeStation> lists =new ArrayList<FeeStation>();
+        for(FeeStation bean : list){
+            if(bean.getCreattime().getTime() < sObj.getEnd_date().getTime()){
+                lists.add(bean);
+            }
+        }
+
+        return lists;
+    }
 }

Visuallnspection_qzd/src/main/java/com/xintong/visualinspection/visuallnspection_qzd/service/impl/StatisticsService_FImpl.java

@@ -58,6 +58,7 @@ public class StatisticsService_FImpl implements StatisticsService_F {
 
         // 获得所有服务区数据
         List<FeeStation> saList = commonService.getAllDeptByLayer("WG");
+        saList = getDeptData(saList,obj);
         Map<Long, FwqStatisticsBean> mapStationInfos = new HashMap<>();
         if (obj.getStart_date() != null && obj.getEnd_date() != null) {
             CheckTaskPeriod p = commonService.getCheckTaskPeriod(obj.getStart_date().getTime(), obj.getEnd_date().getTime());
@@ -93,17 +94,23 @@ public class StatisticsService_FImpl implements StatisticsService_F {
         List<FwqStatisticsBean> onsite_beans = qzdStatisticsDao.getselectFeeStationOperationScoreDetail(obj);
 
         for (FwqStatisticsBean company_bean : company_beans) {
-            mapStationInfos.get(company_bean.getDept_id()).setCompany_check_num(company_bean.getChecked_num());
-            mapStationInfos.get(company_bean.getDept_id()).setCompany_total_score(company_bean.getAll_check_score());
+            if(mapStationInfos.get(company_bean.getDept_id()) != null){
+                mapStationInfos.get(company_bean.getDept_id()).setCompany_check_num(company_bean.getChecked_num());
+                mapStationInfos.get(company_bean.getDept_id()).setCompany_total_score(company_bean.getAll_check_score());
+            }
         }
         for (FwqStatisticsBean third_bean : third_beans) {
-            mapStationInfos.get(third_bean.getDept_id()).setThird_check_num(third_bean.getChecked_num() > 1 ? 1 : third_bean.getChecked_num());
-            mapStationInfos.get(third_bean.getDept_id()).setThird_total_score(third_bean.getCheck_total_score());
+            if(mapStationInfos.get(third_bean.getDept_id()) != null) {
+                mapStationInfos.get(third_bean.getDept_id()).setThird_check_num(third_bean.getChecked_num() > 1 ? 1 : third_bean.getChecked_num());
+                mapStationInfos.get(third_bean.getDept_id()).setThird_total_score(third_bean.getCheck_total_score());
+            }
         }
 
         for (FwqStatisticsBean onsite_bean : onsite_beans) {
-            mapStationInfos.get(onsite_bean.getDept_id()).setOnsite_check_num(onsite_bean.getChecked_num() > 1 ? 1 : onsite_bean.getChecked_num());
-            mapStationInfos.get(onsite_bean.getDept_id()).setOnsite_total_score(onsite_bean.getCheck_total_score());
+            if(mapStationInfos.get(onsite_bean.getDept_id()) != null) {
+                mapStationInfos.get(onsite_bean.getDept_id()).setOnsite_check_num(onsite_bean.getChecked_num() > 1 ? 1 : onsite_bean.getChecked_num());
+                mapStationInfos.get(onsite_bean.getDept_id()).setOnsite_total_score(onsite_bean.getCheck_total_score());
+            }
         }
         // 计算出每个收费站的总平均扣分和平均得分
         Set<Map.Entry<Long, FwqStatisticsBean>> stationInfos = mapStationInfos.entrySet();
@@ -842,4 +849,15 @@ public class StatisticsService_FImpl implements StatisticsService_F {
         return mapStationInfos;
     }
 
+    public List<FeeStation> getDeptData(List<FeeStation> list,FwqStatisticsBean sObj){
+        List<FeeStation> lists =new ArrayList<FeeStation>();
+        for(FeeStation bean : list){
+            if(bean.getCreattime().getTime() < sObj.getEnd_date().getTime()){
+                lists.add(bean);
+            }
+        }
+
+        return lists;
+    }
+
 }