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

VisualInspection/js/statistics/operation_management_integration.js

@@ -0,0 +1,263 @@
+var lianyungang_Station = new Array;
+var yancheng_Station = new Array;
+var nantong_Station = new Array;
+var r1 = new Array();
+var r2 = new Array();
+var r3 = new Array();
+var rank = new Array();
+/**
+ * 点击查询
+ */
+function queryTypeClick(){
+    //每次点击前清空表格数据
+    $(".table-tbody").empty('');
+    var start_date = $("#start-time").val();
+    var end_date = $("#end-time").val();
+    if(start_date==null||start_date==''||start_date==undefined||
+    end_date==null||end_date==''||end_date==undefined){
+        tip("请选择起止日期");
+                return ;
+    }else{
+        start_date += " 23:00:00";
+        end_date += " 23:00:00";
+    }
+    var startStr = start_date.replace(/-/g, '/');
+    var endStr = end_date.replace(/-/g, '/');
+    var start = new Date(startStr);
+    //开始日期取前一天的23:00
+    start.setDate(start.getDate()-1);
+    start_date = start.Format("yyyy-MM-dd HH:mm:ss");
+    var end = new Date(endStr);
+    if(start>end){
+        tip("开始时间不能比结束时间大");
+        return;
+    }
+    var param = {
+        "dept_id": $("#fsList").val(),
+        "start_date": start_date,
+        "end_date": end_date,
+    }
+    var url = "statistics/operation/manage/integration";
+    var strTbody='';
+      post_common_service( url,param,function(data){
+          // 运营管理综合检查情况
+          check_operation_avg(data);
+            },function(error){
+                return "" ;
+     });
+}
+
+/**
+ * 表格初始化
+ */
+function initQueryType(){
+    // 默认初始化前一周查所有
+    var endD = new Date();
+    var startD = new Date();
+    // var startD = new Date(now.getTime() - 7 * 24 * 3600 * 1000);
+    var start_time = startD.getFullYear()+"-"+(startD.getMonth())+"-26";
+    var end_time = endD.getFullYear()+"-"+(endD.getMonth()+1)+"-25";
+    // 默认初始化时间页面回显
+    $("#start-time").val(start_time);
+    $("#end-time").val(end_time);
+    var start_date = start_time+" 23:00:00"; 
+    var end_date = end_time+" 23:00:00"; 
+    var start = new Date(start_date);
+    //开始日期取前一天的23:00
+    start.setDate(start.getDate()-1);
+    start_date = start.Format("yyyy-MM-dd HH:mm:ss");
+    var param = {
+        "start_date": start_date,
+        "end_date": end_date,
+    }
+    var url = "statistics/operation/manage/integration";
+    var strTbody='';
+   
+    post_common_service( url,param,function(data){
+             // 运营管理综合检查情况
+            check_operation_avg(data); 
+        },function(error){
+            return "" ;
+     });
+    
+}
+
+/**
+ * 表格拼接及数据传入
+ * @param {*} data 
+ * @param {*} i 
+ * @param {*} avg 
+ */
+function gethtml(data,i,avg,lists){
+    var strTbody = "";
+
+    if(i==0 || i==7 || i==13){
+       // debugger;
+        var ranking;
+        var name = "";
+        var rowspan = 0;
+          order = 1;
+        if(i==0){
+            name = "连云港";
+            rowspan = 7;
+            for(var i=0;i<lists.length;i++){
+                if(avg > lists[i]){
+                    order = order + 1;
+                }
+            }
+        }else if(i==7){
+            name = "盐城";
+            rowspan = 6;
+            for(var i=0;i<lists.length;i++){
+                if(avg > lists[i]){
+                    order = order + 1;
+                }
+            }
+        }else if(i==13){
+            name = "南通";
+            rowspan = 8;
+            for(var i=0;i<lists.length;i++){
+                if(avg > lists[i]){
+                    order = order + 1;
+                }
+            }
+        }
+        strTbody += "<tr><td rowspan="+rowspan+" width='6%'>"+order+"</td>"+"<td rowspan="+rowspan+" width='6%'>"+name+"</td>";
+        strTbody+="<td width='6%'>"+data.company_ranking2+"</td><td width='6%'>"+data.fee_station_ranking2+"</td><td width='8%'>"+data.name+"</td><td width='6%'>"+filter(data.people_num,'0')
+                   +"</td><td width='54px'>"+data.company_check_num
+                   +"</td><td width='54px'>"+data.company_total_score+"</td><td width='54px'>"+data.third_check_num
+                   +"</td><td width='54px'>"+data.third_total_score+"</td><td width='54px'>"+data.special_check_num
+                   +"</td><td width='54px'>"+data.special_total_score+"</td><td width='54px'>"+data.onsite_check_num
+                   +"</td><td width='54px'>"+data.onsite_total_score+"</td><td width='54px'>"+data.data_check_num
+                   +"</td><td width='54px'>"+data.data_total_score+"<td width='6%'>"
+                   +data.check_total_avg
+                   +"</td><td width='6%'>"+data.score_avg+"</td>";
+        strTbody += "</tr>";
+    }else{
+        strTbody += "<tr><td width='6%'>"+data.company_ranking2+"</td><td>"+data.fee_station_ranking2+"</td>";
+        strTbody+="<td>"+data.name+"</td><td>"+data.people_num+"</td><td>"+data.company_check_num
+                  +"</td><td>"+data.company_total_score+"</td><td>"+data.third_check_num
+                  +"</td><td>"+data.third_total_score+"</td><td>"+data.special_check_num
+                  +"</td><td>"+data.special_total_score+"</td><td>"+data.onsite_check_num
+                  +"</td><td>"+data.onsite_total_score+"</td><td>"+data.data_check_num
+                  +"</td><td>"+data.data_total_score+"</td><td>"
+                  +data.check_total_avg+"</td>"
+                  +"<td>"+data.score_avg+"</td>";
+        strTbody += "</tr>";
+          
+    }
+    return strTbody;
+}
+
+function getTotalHtml(data){
+    var html = "<tr><td>合计</td><td></td><td></td><td></td><td></td><td>"+data.totalMan+"</td><td>"+data.totalCompanyNum+"</td><td>"+data.totalCompanyScore+"</td><td>"
+    +data.totalThirdNum+"</td><td>"+data.totalThirdScore+"</td><td>"+data.totalSpecialNum+"</td><td>"+data.totalSpecialScore
+    +"</td><td>"+data.totalOnsiteNum+"</td><td>"+data.totalOnsiteScore+"</td><td>"+data.totalDataNum
+    +"</td><td>"+data.totalDataScore+"</td><td>-</td><td>-</td></tr>";
+    return html;
+}
+
+/**
+ * 管道中心受检人平均每人次扣分
+ * @param {*} data 
+ */
+function check_operation_avg(data){
+        var list = data.list;
+        var dataArray = new Array();
+        var sum = 0;
+        var sum1 = 0;
+        for(k=0;k<list.length;k++){
+                sum = parseFloat(sum)+ parseFloat(list[k].check_total_avg);
+                sum1++;
+            if(k==6){               
+                dataArray.push(filterJudge(sum,sum1));
+                sum = 0;
+                sum1 = 0;
+            }
+            if(k==12){  
+                dataArray.push(filterJudge(sum,sum1));
+                sum = 0;
+                sum1 = 0;
+            }
+            if(k==20){
+                dataArray.push(filterJudge(sum,sum1)); 
+                sum = 0;
+                sum1 = 0;
+            }
+        }   
+
+        for(i=0;i<list.length;i++){
+           if(i==0){
+                $(".table-tbody").append(gethtml(list[i],i,dataArray[0],dataArray));
+           }else if(i==7){
+                $(".table-tbody").append(gethtml(list[i],i,dataArray[1],dataArray));
+           }else if(i==13){
+                $(".table-tbody").append(gethtml(list[i],i,dataArray[2],dataArray));
+           }else{
+                $(".table-tbody").append(gethtml(list[i],i));              
+           }
+        } 
+        $(".table-tbody").append(getTotalHtml(data));
+}
+
+/**
+ * 过滤undefined
+ * @param {*} value 
+ * @param {*} default_display_value 
+ */
+function filter(value , default_display_value){
+    if(value!='' && value!=undefined ){
+        return value ;
+    }else if(default_display_value != undefined){
+        return default_display_value ;
+    }else{
+        return "" ;
+    }
+}
+
+/**
+ * 过滤除数为0和保留二位小数时出现的0.00
+ * @param {*} value 
+ * @param {*} default_display_value 
+ */
+function filterByZeroHandle(value , default_display_value){
+        if(isNaN(value)){
+            return default_display_value ;
+        }else{
+            if((value+'').endsWith('.00')){
+                return value.substring(0,value.length-3);
+            }
+            return value ;
+        }
+}
+
+function filterJudge(num1,num2){
+        if(num2==0){
+            return 0;
+        }else{
+            return (num1/num2).toFixed(2);
+        }
+}
+
+function exportExcel(){
+    var start_date = $("#start-time").val();
+    var end_date = $("#end-time").val();
+    if( start_date=='' || end_date==''){
+        tip("请选择起止日期");
+        return ;
+    }else{
+        start_date += " 23:00:00";
+        end_date += " 23:00:00";
+        var start = new Date(start_date);
+        //开始日期取前一天的23:00
+        start.setDate(start.getDate()-1);
+        start_date = start.Format("yyyy-MM-dd HH:mm:ss");
+    }
+    window.open( getserveraddr() + "/file/operation/manage/integration?start_date="+start_date+"&end_date="+end_date);
+}
+
+
+
+
+
+

VisualInspection/js/statistics/personal_data_statistics.js

@@ -98,15 +98,15 @@ $(function() {
                 if (p_c.fee_station_ranking != undefined && p_l.fee_station_ranking != undefined) {
                     var dept_r = p_c.fee_station_ranking - p_l.fee_station_ranking;
                     if (dept_r != 0) {
-                        $("#c_dept_ranking").html($("#c_dept_ranking").html() + "<i style='margin-left:10px;color:" + (dept_r > 0 ? "red" : "#08a208") + "' class='icon icon-long-arrow-" + (dept_r > 0 ? "down" : "up") + "'>" + Math.abs(dept_r) + "</i>");
+                        $("#c_dept_ranking").html($("#c_dept_ranking").html() + "<i style='margin-left:10px;color:" + (dept_r > 0 ? "red" : "#0aef3d") + "' class='icon icon-long-arrow-" + (dept_r > 0 ? "down" : "up") + "'>" + Math.abs(dept_r) + "</i>");
                     }
                     var com_r = p_c.company_ranking - p_l.company_ranking;
                     if (com_r != 0) {
-                        $("#c_com_ranking").html($("#c_com_ranking").html() + "<i style='margin-left:10px;color:" + (com_r > 0 ? "red" : "#08a208") + "' class='icon icon-long-arrow-" + (com_r > 0 ? "down" : "up") + "'>" + Math.abs(com_r) + "</i>");
+                        $("#c_com_ranking").html($("#c_com_ranking").html() + "<i style='margin-left:10px;color:" + (com_r > 0 ? "red" : "#0aef3d") + "' class='icon icon-long-arrow-" + (com_r > 0 ? "down" : "up") + "'>" + Math.abs(com_r) + "</i>");
                     }
                     var road_r = p_c.center_ranking - p_l.center_ranking;
                     if (road_r != 0) {
-                        $("#c_road_ranking").html($("#c_road_ranking").html() + "<i style='margin-left:10px;color:" + (road_r > 0 ? "red" : "#08a208") + "' class='icon icon-long-arrow-" + (road_r > 0 ? "down" : "up") + "'>" + Math.abs(road_r) + "</i>");
+                        $("#c_road_ranking").html($("#c_road_ranking").html() + "<i style='margin-left:10px;color:" + (road_r > 0 ? "red" : "#0aef3d") + "' class='icon icon-long-arrow-" + (road_r > 0 ? "down" : "up") + "'>" + Math.abs(road_r) + "</i>");
                     }
                 }
             }

VisualInspection/js/term_management/charge_terms_m.js

@@ -1,168 +1,191 @@
-    var user = $.zui.store.get("user") ;  // 缓存用户信息，取出dept_id
-    var dept_id=user.organid;
+    var user = $.zui.store.get("user"); // 缓存用户信息，取出dept_id
+    var dept_id = user.organid;
     var team_id;
     var idUpdate;
     var type = 1;
     var organid = user.organid;
-    function queryTable(){
+
+    function queryTable() {
         var data = {
-            "dept_id":dept_id
+            "dept_id": dept_id
         }
         data.type = type;
         var name = $("#select_name").val();
-        if(name!=''){
-            data.name = name ;
+        if (name != '') {
+            data.name = name;
         }
         var cols = [
-                        {width: 30, text: '序号', flex: false, colClass: 'text-center',field:'num'},
-                        {width: 50, text: '班组名称', flex: false,colClass: '',field:'name'},
-                        {width: 50, text: '所属人员分类',  flex: false, colClass: '',field:'type',func:function(obj){
-                            if(obj==1){
-                                return "收费人员";
-                            }else if(obj == 2){
-                                return "稽查人员";
-                            }
-                        }},
-                        {width: 50, text: '班长', type: 'string', flex: false, sort: 'down',field:'monitor_name'},
-                        {width: 50, text: '副班长', type: 'string', flex: false, colClass: '',field:'sub_monitor_name'},
-                        {width: 200, text: '人员',  flex: false, colClass: '',field:'user_ids_name'},
-                        {width: 80, text: '操作',  flex: false, colClass: '',field:'id',oper:[
-                            {func:'updateCheckTeam',text:'修改',icon_class:'icon-edit'},{func:'deleteCheckTeam',text:'删除',icon_class:'icon-remove-circle'}
-                        ]},
-                    ] ;
-        
-        $('.datatable').mytable({'cols':cols,
-                                'url':"team/getTeamByName",
-                                'param':data}
-                                );
+            { width: 30, text: '序号', flex: false, colClass: 'text-center', field: 'num' },
+            { width: 50, text: '班组名称', flex: false, colClass: '', field: 'name' },
+            {
+                width: 50,
+                text: '所属人员分类',
+                flex: false,
+                colClass: '',
+                field: 'type',
+                func: function(obj) {
+                    if (obj == 1) {
+                        return "收费人员";
+                    } else if (obj == 2) {
+                        return "稽查人员";
+                    }
+                }
+            },
+            { width: 50, text: '班长', type: 'string', flex: false, sort: 'down', field: 'monitor_name' },
+            { width: 50, text: '副班长', type: 'string', flex: false, colClass: '', field: 'sub_monitor_name' },
+            { width: 200, text: '人员', flex: false, colClass: '', field: 'user_ids_name' },
+            {
+                width: 80,
+                text: '操作',
+                flex: false,
+                colClass: '',
+                field: 'id',
+                oper: [
+                    { func: 'updateCheckTeam', text: '修改', icon_class: 'icon-edit' }, { func: 'deleteCheckTeam', text: '删除', icon_class: 'icon-remove-circle' }
+                ]
+            },
+        ];
+
+        $('.datatable').mytable({
+            'cols': cols,
+            'url': "team/getTeamByName",
+            'param': data
+        });
     }
-    function deleteCheckTeam(id){
-        deleteItem4Common(id,"team/delete",queryTable);
+
+    function deleteCheckTeam(id) {
+        deleteItem4Common(id, "team/delete", queryTable);
     }
-     $(document).ready(function() {
-         queryTable();
-         getUser();
+    $(document).ready(function() {
+        queryTable();
+        getUser();
     })
-    function getUser(){
-        data ={
-            "organid":organid
+
+    function getUser() {
+        data = {
+            "organid": organid
         }
-        post_common_service("user/getUserList", data, function(data){
+        post_common_service("user/getUserList", data, function(data) {
             $("#team_name").val("");
             $("#monitor").empty();
             $("#second-monitor").empty();
             $("#member").empty();
             $("#monitor").append('<option value="0">请选择班长</option>');
             $("#second-monitor").append('<option value="0">请选择副班长</option>');
-            for(i=0;i<data.length;i++){
-                $("#monitor").append('<option value="'+data[i].id+'">'+data[i].truename+'</option>');
-                $("#second-monitor").append('<option value="'+data[i].id+'">'+data[i].truename+'</option>');
+            for (i = 0; i < data.length; i++) {
+                $("#monitor").append('<option value="' + data[i].id + '">' + data[i].truename + '</option>');
+                $("#second-monitor").append('<option value="' + data[i].id + '">' + data[i].truename + '</option>');
                 $("#member").append('<div style="width:78px;float:left;">\
-                                         <input type="checkbox" value="'+data[i].id+'" class="chkItem"><span>'+data[i].truename+'</span>\
+                                         <input type="checkbox" value="' + data[i].id + '" class="chkItem"><span>' + data[i].truename + '</span>\
                                      </div>');
             }
-        }, function(){
+        }, function() {
 
         });
     }
-    function updateCheckTeam(id){
+
+    function updateCheckTeam(id) {
         team_id = id;
         data = {
-            "id":id
+            "id": id
         }
-        post_common_service("team/getTeamById", data, function(data){
+        post_common_service("team/getTeamById", data, function(data) {
             $("#team_name").val(data.name);
             $("#monitor").val(data.monitor);
             $("#second-monitor").val(data.sub_monitor);
-             var ids = data.user_ids.split(",");
-              $(".chkItem").prop("checked",false);
-             for(i=0;i<ids.length;i++){
+            var ids = data.user_ids.split(",");
+            $(".chkItem").prop("checked", false);
+            for (i = 0; i < ids.length; i++) {
                 // console.log(ids[i])
-                $(".chkItem").each(function(){ 
-                    if($(this).attr('value') == ids[i]){
+                $(".chkItem").each(function() {
+                    if ($(this).attr('value') == ids[i]) {
                         $(this).prop("checked", true);
                     }
                 });
             }
             idUpdate = true;
-            layerUpdateTeam('form-div','班组修改','550px');
-        }, function(){
+            layerUpdateTeam('form-div', '班组修改', '550px');
+        }, function() {
 
         });
-        
+
     }
-    function layerUpdateTeam(domId,title,area){
+
+    function layerUpdateTeam(domId, title, area) {
         //  $(".chkItem").attr("checked", false);
         layer.open({
             type: 1,
             title: false,
             closeBtn: 1,
-            title:title,
+            title: title,
             shadeClose: true,
             skin: 'yourclass',
-            area:area,
-            content: $("#"+domId)
+            area: area,
+            content: $("#" + domId)
         });
     }
     //关闭弹窗
-    $("#close-layer").click(function(){
-        layer.closeAll();
-    })
-    //保存修改或添加
-    $("#save-team").click(function(){
+    $("#close-layer").click(function() {
+            layer.closeAll();
+        })
+        //保存修改或添加
+    $("#save-team").click(function() {
         var user_ids = "";
-         $.each($('input:checkbox'),function(){
-                if(this.checked){
-                    user_ids = user_ids +　$(this).val() + ",";
+        $.each($('input:checkbox'), function() {
+            if (this.checked) {
+                if (numberreg.test($(this).val())) {
+                    user_ids = user_ids + 　$(this).val() + ",";
                 }
+
+            }
         });
-        if(user_ids != ""){
-            user_ids = user_ids.substring(0,user_ids.length-1);
-        }else{
+        if (user_ids != "") {
+            user_ids = user_ids.substring(0, user_ids.length - 1);
+        } else {
             layer.msg('请选择人员');
             return;
         }
         data = {
-            "id":team_id,
-            "dept_id":dept_id,
-            "name":$("#team_name").val(),
-            "user_ids":user_ids,
-            "type":type,
-            "monitor":$("#monitor").val(),
-            "sub_monitor":$("#second-monitor").val()
+            "id": team_id,
+            "dept_id": dept_id,
+            "name": $("#team_name").val(),
+            "user_ids": user_ids,
+            "type": type,
+            "monitor": $("#monitor").val(),
+            "sub_monitor": $("#second-monitor").val()
         }
-        if(idUpdate){
+        if (idUpdate) {
             //修改
-            post_common_service("team/update", data, function(data){
+            post_common_service("team/update", data, function(data) {
                 layer.closeAll();
                 queryTable();
-            }, function(){
+            }, function() {
 
             });
-        }else{
+        } else {
             //添加
-            post_common_service("team/add", data, function(data){
+            post_common_service("team/add", data, function(data) {
                 layer.closeAll();
                 queryTable();
-            }, function(){
+            }, function() {
 
             });
         }
-        
+
     })
 
     //条件查询
-    $("#conditional_query").click(function(){
+    $("#conditional_query").click(function() {
         queryTable();
     })
 
 
     //添加班组
-    $("#addTeam").click(function(){
+    $("#addTeam").click(function() {
         idUpdate = false;
         $("#team_name").val("");
         $("#monitor").val(0);
         $("#second-monitor").val(0);
         $(".chkItem").attr("checked", false);
-        layerUpdateTeam('form-div','班组新增','550px');
+        layerUpdateTeam('form-div', '班组新增', '550px');
     })

VisualInspection/js/user/addUser.js

@@ -10,6 +10,7 @@ function loadUserData(nodedata) {
     var enable = true;
 
     if (edittype == "update") {
+        $("#user_title").html("修改用户信息")
         enable = false;
     } else {
         enable = true;
@@ -17,7 +18,13 @@ function loadUserData(nodedata) {
 
     if (edittype == "add") {
         $("#dept_name").val("")
+        $("#user_title").html("添加用户")
     }
+
+    if (edittype == "edit") {
+        $("#user_title").html("修改用户")
+    }
+
     if (role_selectinput == null) {
         role_selectinput = $('#user_role_select').comboTree({
             source: roles,
@@ -40,8 +47,6 @@ function loadUserData(nodedata) {
         usertemp = nodedata;
         pnode = [{ "id": usertemp.organid }]
         initUserInfo()
-
-
     }
 
 

VisualInspection/js/util/util.js

@@ -1,3 +1,6 @@
+var numberreg = new RegExp(
+    "^(([0-9]+\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\.[0-9]+)|([0-9]*[1-9][0-9]*))$");
+
 function doajax(method, dataurl, data, sucessCallBack, errorCallBack) {
     var user_key = undefined;
     var user = $.zui.store.get("user")

VisualInspection/view/common/head.html

@@ -34,7 +34,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
-                <h4 class="modal-title">修改用户信息</h4>
+                <h4 class="modal-title" id="user_title">修改用户信息</h4>
             </div>
             <div class="modal-body">
                 <link rel="import" href="/view/user/addUser.html?__inline">

VisualInspection/view/statistics/operation_management_integration.html

@@ -0,0 +1,94 @@
+<script src="/js/statistics/operation_management_integration.js?__inline"></script>
+<link rel="stylesheet" type="text/css" href="/css/statistics/assess_situation.css?__inline">
+<div class="container-fluid ">
+    <div class="form-div">
+        <form  class="form-horizontal">
+            <div class="form-group">
+                <div class="from-label"><label>查询日期</label></div>
+                <div class="col-sm-3">
+                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始日期">
+                </div>
+                <div class="col-sm-4">
+                    <input type="text" id="end-time" class="form-control form-date" placeholder="结束日期">
+                </div>
+                <div class="col-sm-5">
+                    <button class="btn btn-primary " type="button" onclick="queryTypeClick()">查询</button>
+                </div>
+                <div class="col-sm-6">
+                    <button class="btn btn-primary " type="button" onclick="exportExcel()" >导出Excel</button>
+                </div>
+            </div>
+        </form>
+    </div>
+    <div class="table-title"><span>运营管理综合检查情况统计表</span></div>
+
+    <div class="row">
+          <!-- 使用一个div来显示数据表格 -->
+          <div class="datatable" data-checkable="false" data-sortable="false"  style="margin-bottom:0px;">
+              <div class="table-head" ><table border="1" width="100%" height="90px" align="center">
+                 <thead>
+                        <tr>
+                        <th rowspan="3" width="6%">排名</th><th rowspan="3" width="6%">道管</th><th rowspan="3" width="6%">公司内排名</th><th rowspan="3" width="6%">道管内排名</th>
+                        <th rowspan="3" width="8%">站名</th><th rowspan="3" width="6%">收费值机岗位人数</th><th colspan="4" height="40px">温馨服务</th><th colspan="2" height="40px">特情操作</th>
+                        <th colspan="2" height="40px">现场检查</th><th colspan="2" height="40px">数据平台应用情况</th><th rowspan="3" width="6%">总平均扣分</th>
+                        <th rowspan="3" width="6%">平均得分</th>
+                        </tr>
+                        <tr> 
+                        <th colspan="2">公司检查</th><th colspan="2">第三方暗访</th><th rowspan="2" width="54px">存在问题次数</th>
+                        <th rowspan="2" width="54px">扣分合计</th><th rowspan="2" width="54px">受检次数</th><th rowspan="2" width="54px">扣分合计</th>
+                        <th rowspan="2" width="54px">受检次数</th><th rowspan="2" width="54px">扣分合计</th>
+                        </tr>
+                        <tr> 
+                        <th width="54px">受检次数</th><th width="54px">扣分合计</th>
+                        <th width="54px">受检次数</th><th width="54px">扣分合计</th>
+                        </tr>
+                 </thead>
+                    <!-- <tbody class="table-tbody" style="background:white" align="center">
+               
+                    </tbody> -->
+                </table></div>
+          </div>
+          <div id="scrollTable" style="height:300px;overflow:scroll;margin-right:-10px;">
+              <div class="table-head" style="margin:0px;">
+                  <table border="1" width="100%" height="90px" align="center" style="border-top:0px;">
+                    <tbody class="table-tbody" style="background:white" align="center">
+               
+                    </tbody>
+                  </table></div>
+          </div>
+    </div>
+</div>
+<script>
+   
+    $(document).ready(function() {
+        // 设置滚动表格的高度
+        $("#scrollTable").height($(window).height() - 360);
+        // 仅选择日期
+        $("#start-time").datetimepicker(
+        {
+            language:  "zh-CN",
+            weekStart: 1,
+            todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
+        });
+        // 仅选择日期
+        $("#end-time").datetimepicker(
+        {
+            language:  "zh-CN",
+            weekStart: 1,
+            todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
+        });
+        initQueryType();
+    });
+</script>

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

@@ -132,6 +132,37 @@ public class StatisticsBean {
     
     private Integer score_flag  ;
     
+    // 其他稽查不同类型
+    private Integer check_type;
+    // 扣分合计
+    private Integer check_total_score = 0;
+    // 公司受检次数
+    private Integer company_check_num = 0;
+    // 公司扣分合计
+    private Integer company_total_score= 0;
+    // 第三方暗访受检次数
+    private Integer third_check_num = 0;
+    // 第三方暗访扣分合计
+    private Integer third_total_score = 0;
+    // 特情受检次数
+    private Integer special_check_num = 0;
+    // 特情访扣分合计
+    private Integer special_total_score = 0;
+    // 现场受检次数
+    private Integer onsite_check_num = 0;
+    // 现场扣分合计
+    private Integer onsite_total_score = 0;
+    // 数据平台受检次数
+    private Integer data_check_num = 0;
+    // 数据平台扣分合计
+    private Integer data_total_score = 0;
+    // 总平均扣分
+    private String check_total_avg  = "0";
+    // 公司排名
+    private Integer company_ranking2;
+    // 道管排名
+    private Integer fee_station_ranking2;
+    
     // 比较大小 1 小 ， -1 大
     public int compareTo(StatisticsBean o2){
     	if(this.getChecked_num()!=0 && o2.getChecked_num()!=0){
@@ -174,4 +205,51 @@ public class StatisticsBean {
 		}	
     }
     
+    //比较大小 1 小 ， -1 大 
+    // 方法3
+    public int compare3To(StatisticsBean o2){
+    	double a = -1 ,b=-1 ;
+		if(Float.valueOf(this.getCheck_total_avg())!=0 ){
+			a = Float.valueOf(this.getCheck_total_avg());
+		}
+		if(Float.valueOf(o2.getCheck_total_avg())!=0){
+			b = Float.valueOf(o2.getCheck_total_avg());
+		}
+		if (a > b ) {
+			return 1;
+		} else if (a < b) {
+			return -1;
+		} else {
+			return 0;
+		}	
+    }
+    
+  //比较大小 1 小 ， -1 大 
+    // 方法3
+    public int compare4To(StatisticsBean o2){
+    	if (this.getId() > o2.getId()) {
+			return 1;
+		} else if (this.getId() == o2.getId()) {
+			if (Float.valueOf(this.getCheck_total_avg()) != 0 && Float.valueOf(o2.getCheck_total_avg()) != 0) {
+				if (Float.valueOf(this.getCheck_total_avg()) < Float.valueOf(o2.getCheck_total_avg())) {
+					return -1;
+				} else if (Float.valueOf(this.getCheck_total_avg()) > Float.valueOf(o2.getCheck_total_avg())) {
+					return 1;
+				} else {
+					return 0;
+				}
+			} else {
+				if (Float.valueOf(this.getCheck_total_avg()) == 0) {
+					return -1;
+				} else if (Float.valueOf(o2.getCheck_total_avg()) == 0) {
+					return 1;
+				} else {
+					return 0;
+				}
+			}
+		} else {
+			return -1;
+		}
+    }
+    
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/FileExcelController.java

@@ -149,4 +149,22 @@ public class FileExcelController extends BaseController {
     	statisticsService.getCheckInfo(obj, req, resp);
     	return super.returnSuccessResult(null);
     }
+    /**
+     * @param req
+     * @param resp
+     * @param start_date
+     * @param end_date
+     * @return
+     */
+    @RequestMapping(value = "/operation/manage/integration",method=RequestMethod.GET)
+    public String getOperationInfo(HttpServletRequest req,HttpServletResponse resp,
+    		@RequestParam String start_date,@RequestParam String end_date){
+    	StatisticsBean obj = new StatisticsBean();
+		Date start = DateUtil.strParseDate(start_date);
+		Date end = DateUtil.strParseDate(end_date);
+		obj.setStart_date(start);
+		obj.setEnd_date(end);
+    	statisticsService.getOperationInfo(obj, req, resp);
+    	return super.returnSuccessResult(null);
+    }
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/StatisticsController.java

@@ -145,7 +145,43 @@ public class StatisticsController extends BaseController {
 //    	resultMap.put("totalAll", totalAll);
     	return super.returnSuccessResult(resultMap);
     }
-    
+    /**
+     * 运营管理综合检查情况统计表
+     */
+    @RequestMapping(value = "/operation/manage/integration")
+    public String getOperationInfo(@RequestBody StatisticsBean obj){
+    	List<StatisticsBean> lists= statisticsService.getOperationInfo(obj);
+    	int totalMan=0,totalCompanyNum=0,totalCompanyScore=0,totalThirdNum=0,
+    			totalThirdScore=0,totalSpecialNum=0,totalSpecialScore=0,totalOnsiteNum=0,
+    			totalOnsiteScore=0,totalDataNum=0,totalDataScore=0;
+    	for(StatisticsBean bean:lists){
+    		totalMan+=bean.getPeople_num();
+    		totalCompanyNum += bean.getCompany_check_num();
+    		totalCompanyScore += bean.getCompany_total_score();
+    		totalThirdNum += bean.getThird_check_num();
+    		totalThirdScore += bean.getThird_total_score();
+    		totalSpecialNum += bean.getSpecial_check_num();
+    		totalSpecialScore += bean.getSpecial_total_score();
+    		totalOnsiteNum += bean.getOnsite_check_num();
+    		totalOnsiteScore += bean.getOnsite_total_score();
+    		totalDataNum += bean.getData_check_num();
+    		totalDataScore += bean.getData_total_score();
+    	}
+    	Map<String,Object> resultMap = new HashMap<String,Object>();
+    	resultMap.put("list", lists);
+    	resultMap.put("totalMan", totalMan);
+    	resultMap.put("totalCompanyNum", totalCompanyNum);
+    	resultMap.put("totalCompanyScore", totalCompanyScore);
+    	resultMap.put("totalThirdNum", totalThirdNum);
+    	resultMap.put("totalThirdScore", totalThirdScore);
+    	resultMap.put("totalSpecialNum", totalSpecialNum);
+    	resultMap.put("totalSpecialScore", totalSpecialScore);
+    	resultMap.put("totalOnsiteNum", totalOnsiteNum);
+    	resultMap.put("totalOnsiteScore", totalOnsiteScore);
+    	resultMap.put("totalDataNum", totalDataNum);
+    	resultMap.put("totalDataScore", totalDataScore);
+    	return super.returnSuccessResult(resultMap);
+    }
     /**
      * 12个月考核等分总体
      */

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/StatisticsDao.java

@@ -66,6 +66,8 @@ public interface StatisticsDao  {
 	public List<TaskAndScore> selectMList(TaskAndScore obj);
 	
 	public Integer selectCheckedNum(StatisticsBean obj);
+
+	public List<StatisticsBean> getselectFeeStationOperationScoreDetail(StatisticsBean obj);
 	
 	
 }

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

@@ -118,6 +118,21 @@
     	 GROUP BY t.checked_dept
     </select>
     
+    <select id="getselectFeeStationOperationScoreDetail" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
+    	SELECT
+			o.dept_id,
+			COUNT(1) checked_num,
+			SUM(o.check_score) check_total_score
+		FROM
+			other_check o
+		WHERE
+			o.check_type = #{check_type}
+			<if test="start_date!=null and end_date != null">
+		        AND	 o.check_time &gt;= #{start_date} AND o.check_time &lt; #{end_date}
+			</if>
+		GROUP BY
+			dept_id
+    </select>
     <select id="selectFeeStationCheckedScore" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
     	SELECT IFNULL(sum(ct.check_item_score),0) AS score ,t.checked_dept AS dept_id ,t.checked_person AS user_id
     		FROM check_task t

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/StatisticsService.java

@@ -97,4 +97,9 @@ public interface StatisticsService {
 	// 稽查人员工作量统计
 	public void getCheckInfo(StatisticsBean obj,HttpServletRequest req,HttpServletResponse resp);
 
+	// 运营管理综合检查情况统计表
+	public List<StatisticsBean> getOperationInfo(StatisticsBean obj);
+
+	public void getOperationInfo(StatisticsBean obj, HttpServletRequest req, HttpServletResponse resp);
+
 }