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

VisualInspection/js/statistics/assess_situation.js

@@ -5,247 +5,243 @@
         var r2 = new Array();
         var r3 = new Array();
         var rank = new Array();
-function querySituationClick(){
-    //每次点击前清空表格数据
-    $(".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/score/info";
-    var strTbody='';
-    post_common_service( url,param,function(data){
-            var list = data.list;
-            // 道管中心排名
-            ranking_method(list);
-            for(i=0;i<list.length;i++){       
-                $(".table-tbody").append(gethtml(list[i],i));
+
+        function querySituationClick() {
+            //每次点击前清空表格数据
+            $(".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";
             }
-            $(".table-tbody").append(getTotalHtml(data));      
-        },function(error){
-                return "" ;
-   });
-}
-
-
-function initQuerySituation(){
-    //默认初始化前一周查所有
-    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/score/info";
-    var strTbody='';
-   
-    post_common_service( url,param,function(data){
-            var list = data.list;
-            // 道管中心排名
-            ranking_method(list);
-            for(i=0;i<list.length;i++){       
-                $(".table-tbody").append(gethtml(list[i],i));
+            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;
             }
-            $(".table-tbody").append(getTotalHtml(data));
-        },function(error){
-            return "" ;
-     });
-    
-}
-
-function getTotalHtml(data){
-    var html = "<tr><td>合计</td><td></td><td></td><td>"+data.totalMan+"</td><td>"+data.totalcheckedMan+"</td><td>"+data.totalcheckedCount+"</td><td>"+data.total0+"</td><td>"+data.total15+"</td><td>"+data.total50+"</td><td>"+data.totalOver50+"</td><td>"+data.totalAll+"</td><td>-</td><td>-</td></tr>";
-    return html;
-}
-/**
- * 道管中心排名
- * @param {*} data 
- */
-function ranking_method(data){
-        //清空数组
-        lianyungang_Station.length=0;
-        yancheng_Station.length=0;
-        nantong_Station.length=0;
-        r1.length=0;
-        r2.length=0;
-        r3.length=0;
-        rank.length=0;
-        // 把收费站得分分别添加到3个数组
-        for(i=0;i<data.length;i++){
-            if(i>=0 && i<=6)
-            lianyungang_Station.push(filterByZeroHandle(filterJudge(data[i].all_check_score,data[i].checked_num),'0'));
-            else if(i>6 && i<=12)
-            yancheng_Station.push(filterByZeroHandle(filterJudge(data[i].all_check_score,data[i].checked_num),'0'));
-            else
-            nantong_Station.push(filterByZeroHandle(filterJudge(data[i].all_check_score,data[i].checked_num),'0'));
-        }
-        // 得分转化为3个排名数组
-        for(var i=1;i<=3;i++){
-            station_rank(i);
-        }
-        // 将3个排名数组合并成一个数组
-        rank=r1.concat(r2).concat(r3);
-}
-
-function gethtml(data,i){
-    var strTbody = "";
-    if(i==0 || i==7 || i==13){
-        var ranking;
-        var name = "";
-        var rowspan = 0;
-        if(i==0){
-            name = "连云港";
-            rowspan = 7;
-            ranking=rank[i];
-        }else if(i==7){
-            name = "盐城";
-            rowspan = 6;
-            ranking=rank[i];
-        }else if(i==13){
-            name = "南通";
-            rowspan = 8;
-            ranking=rank[i];
+            var param = {
+                "dept_id": $("#fsList").val(),
+                "start_date": start_date,
+                "end_date": end_date,
+            }
+            var url = "statistics/score/info";
+            var strTbody = '';
+            post_common_service(url, param, function(data) {
+                var list = data.list;
+                // 道管中心排名
+                ranking_method(list);
+                for (i = 0; i < list.length; i++) {
+                    $(".table-tbody").append(gethtml(list[i], i));
+                }
+                $(".table-tbody").append(getTotalHtml(data));
+            }, function(error) {
+                return "";
+            });
         }
-        strTbody +="<tr><td rowspan="+rowspan+" width='110px'>"+name+"</td>";
-        strTbody +="<td width='80px'>"+ranking+"</td><td width='90px'>"+data.name+"</td><td width='80px'>"+filter(data.people_num,0)
-                +"</td><td width='80px'>"+filter(data.checked_people_num,0)+"</td><td width='80px'>"+filter(data.checked_num,0)
-                +"</td><td width='80px'>"+(data.checked_people_num-(data.score_fifteen+data.score_fifty+data.score_over_fifty))
-                +"</td><td width='80px'>"+data.score_fifteen+"</td><td width='80px'>"+data.score_fifty+"</td><td width='80px'>"
-                +data.score_over_fifty+"</td><td width='80px'>"+data.all_check_score+"</td><td width='80px'>"
-                +filterByZeroHandle(filterJudge(data.all_check_score,data.checked_num),'0')+"</td><td>"
-                +filterByZeroHandle((1000-filterJudge(data.all_check_score,data.checked_num)),'1000')+"</td>";
-        strTbody += "</tr>";
-       }else{
-        strTbody +="<tr>"
-        strTbody +="<td>"+rank[i]+"</td><td>"+data.name+"</td><td>"+filter(data.people_num,'0')
-                +"</td><td>"+filter(data.checked_people_num,0)+"</td><td>"+filter(data.checked_num,'0')
-                +"</td><td>"+(data.checked_people_num-(data.score_fifteen+data.score_fifty+data.score_over_fifty))
-                +"</td><td>"+data.score_fifteen+"</td><td>"+data.score_fifty+"</td><td>"
-                +data.score_over_fifty+"</td><td>"+data.all_check_score+"</td><td>"
-                +filterByZeroHandle(filterJudge(data.all_check_score,data.checked_num),'0')+"</td><td>"
-                +filterByZeroHandle((1000-filterJudge(data.all_check_score,data.checked_num)),'1000')+"</td>";
-        strTbody+="</tr>";
-            
-      }
-      return strTbody;
-}
-
-/**
- * 排名
- */
-function station_rank_method(array,rank){
-    rank[0] = 1 ;
-    for(var i=1; i<array.length; i++){
-        if(array[i-1] == array[i]  ){
-            rank[i] = rank[i-1];
-        }else{
-            rank[i] = i +1;
-        }				
-    }
-} 
-
-/**
- * 得分转化为3个排名数组
- * @param {*} type 
- */
-function station_rank(type){
-    if(type==1){
-        station_rank_method(lianyungang_Station, r1);
-    }else if(type==2){
-        station_rank_method(yancheng_Station, r2);
-    }else if(type==3){
-        station_rank_method(nantong_Station, r3);
-    }
-}
-
-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);
+
+
+        function initQuerySituation() {
+            //默认初始化前一周查所有
+            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,
             }
-            return value ;
+            var url = "statistics/score/info";
+            var strTbody = '';
+
+            post_common_service(url, param, function(data) {
+                var list = data.list;
+                // 道管中心排名
+                ranking_method(list);
+                for (i = 0; i < list.length; i++) {
+                    $(".table-tbody").append(gethtml(list[i], i));
+                }
+                $(".table-tbody").append(getTotalHtml(data));
+            }, function(error) {
+                return "";
+            });
+
         }
-}
 
-function filterJudge(num1,num2){
-        if(num2==0){
-            return 0;
-        }else{
-            return (num1/num2).toFixed(2);
+        function getTotalHtml(data) {
+            var html = "<tr><td>合计</td><td></td><td></td><td>" + data.totalMan + "</td><td>" + data.totalcheckedMan + "</td><td>" + data.totalcheckedCount + "</td><td>" + data.total0 + "</td><td>" + data.total15 + "</td><td>" + data.total50 + "</td><td>" + data.totalOver50 + "</td><td>" + data.totalAll + "</td><td>-</td><td>-</td></tr>";
+            return html;
+        }
+        /**
+         * 道管中心排名
+         * @param {*} data
+         */
+        function ranking_method(data) {
+            //清空数组
+            lianyungang_Station.length = 0;
+            yancheng_Station.length = 0;
+            nantong_Station.length = 0;
+            r1.length = 0;
+            r2.length = 0;
+            r3.length = 0;
+            rank.length = 0;
+            // 把收费站得分分别添加到3个数组
+            for (i = 0; i < data.length; i++) {
+                if (i >= 0 && i <= 6)
+                    lianyungang_Station.push(filterByZeroHandle(filterJudge(data[i].all_check_score, data[i].checked_num), '0'));
+                else if (i > 6 && i <= 12)
+                    yancheng_Station.push(filterByZeroHandle(filterJudge(data[i].all_check_score, data[i].checked_num), '0'));
+                else
+                    nantong_Station.push(filterByZeroHandle(filterJudge(data[i].all_check_score, data[i].checked_num), '0'));
+            }
+            // 得分转化为3个排名数组
+            for (var i = 1; i <= 3; i++) {
+                station_rank(i);
+            }
+            // 将3个排名数组合并成一个数组
+            rank = r1.concat(r2).concat(r3);
         }
-}
 
-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";
+        function gethtml(data, i) {
+            var strTbody = "";
+            if (i == 0 || i == 7 || i == 13) {
+                var ranking;
+                var name = "";
+                var rowspan = 0;
+                if (i == 0) {
+                    name = "连云港";
+                    rowspan = 7;
+                    ranking = rank[i];
+                } else if (i == 7) {
+                    name = "盐城";
+                    rowspan = 6;
+                    ranking = rank[i];
+                } else if (i == 13) {
+                    name = "南通";
+                    rowspan = 8;
+                    ranking = rank[i];
+                }
+
+                strTbody += "<tr><td rowspan=" + rowspan + " width='" + ($("#tb_th_1").width() + 4) + "px'>" + name + "</td>";
+                strTbody += "<td width='" + ($("#tb_th_2").width() + 4) + "px'>" + ranking + "</td><td width='" + ($("#tb_th_3").width() + 4) + "px'>" + data.name + "</td><td width='" + ($("#tb_th_4").width() + 4) + "px'>" + filter(data.people_num, 0) +
+                    "</td><td width='" + ($("#tb_th_5").width() + 4) + "px'>" + filter(data.checked_people_num, 0) + "</td><td width='" + ($("#tb_th_6").width() + 4) + "px'>" + filter(data.checked_num, 0) +
+                    "</td><td width='" + ($("#tb_th_7_1").width() + 4) + "px'>" + (data.checked_people_num - (data.score_fifteen + data.score_fifty + data.score_over_fifty)) +
+                    "</td><td width='" + ($("#tb_th_7_2").width() + 4) + "px'>" + data.score_fifteen + "</td><td width='" + ($("#tb_th_7_3").width() + 4) + "px'>" + data.score_fifty + "</td><td width='" + ($("#tb_th_7_4").width() + 4) + "px'>" +
+                    data.score_over_fifty + "</td><td width='" + ($("#tb_th_7_5").width() + 4) + "px'>" + data.all_check_score + "</td><td width='" + ($("#tb_th_7_6").width() + 4) + "px'>" +
+                    filterByZeroHandle(filterJudge(data.all_check_score, data.checked_num), '0') + "</td><td>" +
+                    filterByZeroHandle((1000 - filterJudge(data.all_check_score, data.checked_num)), '1000') + "</td>";
+                strTbody += "</tr>";
+            } else {
+                strTbody += "<tr>"
+                strTbody += "<td>" + rank[i] + "</td><td>" + data.name + "</td><td>" + filter(data.people_num, '0') +
+                    "</td><td>" + filter(data.checked_people_num, 0) + "</td><td>" + filter(data.checked_num, '0') +
+                    "</td><td>" + (data.checked_people_num - (data.score_fifteen + data.score_fifty + data.score_over_fifty)) +
+                    "</td><td>" + data.score_fifteen + "</td><td>" + data.score_fifty + "</td><td>" +
+                    data.score_over_fifty + "</td><td>" + data.all_check_score + "</td><td>" +
+                    filterByZeroHandle(filterJudge(data.all_check_score, data.checked_num), '0') + "</td><td>" +
+                    filterByZeroHandle((1000 - filterJudge(data.all_check_score, data.checked_num)), '1000') + "</td>";
+                strTbody += "</tr>";
 
-        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/score/info?start_date="+start_date+"&end_date="+end_date);
-}
+            }
+            return strTbody;
+        }
 
+        /**
+         * 排名
+         */
+        function station_rank_method(array, rank) {
+            rank[0] = 1;
+            for (var i = 1; i < array.length; i++) {
+                if (array[i - 1] == array[i]) {
+                    rank[i] = rank[i - 1];
+                } else {
+                    rank[i] = i + 1;
+                }
+            }
+        }
 
+        /**
+         * 得分转化为3个排名数组
+         * @param {*} type
+         */
+        function station_rank(type) {
+            if (type == 1) {
+                station_rank_method(lianyungang_Station, r1);
+            } else if (type == 2) {
+                station_rank_method(yancheng_Station, r2);
+            } else if (type == 3) {
+                station_rank_method(nantong_Station, r3);
+            }
+        }
 
+        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/score/info?start_date=" + start_date + "&end_date=" + end_date);
+        }

VisualInspection/view/statistics/assess_situation.html

@@ -2,7 +2,7 @@
 <link rel="stylesheet" type="text/css" href="/css/statistics/assess_situation.css">
 <div class="container-fluid ">
     <div class="form-div">
-        <form  class="form-horizontal">
+        <form class="form-horizontal">
             <div class="form-group">
                 <div class="from-label"><label>查询日期</label></div>
                 <div class="col-sm-3">
@@ -15,7 +15,7 @@
                     <button class="btn btn-primary " type="button" onclick="querySituationClick()">查询</button>
                 </div>
                 <div class="col-sm-6">
-                    <button class="btn btn-primary " type="button"  onclick="exportExcel()" >导出Excel</button>
+                    <button class="btn btn-primary " type="button" onclick="exportExcel()">导出Excel</button>
                 </div>
             </div>
         </form>
@@ -23,35 +23,44 @@
     <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" class="a">
+        <!-- 使用一个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" class="a">
                     <thead>
                         <tr>
-                            <th rowspan="2" width="110px">道管</th><th rowspan="2" width="80px">道管内排名</th><th rowspan="2" width="90px">站名</th>
-                            <th rowspan="2" width="80px">收费值机人数</th><th rowspan="2" width="80px">受检人数</th>
-                            <th rowspan="2" width="80px">受检次数</th><th colspan="6" height="40px">扣分情况</th><th rowspan="2" width="85px">平均得分(千分)</th>
+                            <th rowspan="2" width="110px" id="tb_th_1">道管</th>
+                            <th rowspan="2" width="80px" id="tb_th_2">道管内排名</th>
+                            <th rowspan="2" width="90px" id="tb_th_3">站名</th>
+                            <th rowspan="2" width="80px" id="tb_th_4">收费值机人数</th>
+                            <th rowspan="2" width="80px" id="tb_th_5">受检人数</th>
+                            <th rowspan="2" width="80px" id="tb_th_6">受检次数</th>
+                            <th colspan="6" height="40px" id="tb_th_7">扣分情况</th>
+                            <th rowspan="2" width="85px" id="tb_th_8">平均得分(千分)</th>
                         </tr>
-                        <tr> 
-                        <th width="80px">满分（人）</th><th width="80px">≤15分（人）</th><th width="80px">≤50分（人）</th>
-                        <th width="80px">>50分（人）</th><th width="80px">总扣分（分）</th><th width="80px">平均每人次扣分（分）</th>
+                        <tr>
+                            <th width="80px" id="tb_th_7_1">满分（人）</th>
+                            <th width="80px" id="tb_th_7_2">≤15分（人）</th>
+                            <th width="80px" id="tb_th_7_3">≤50分（人）</th>
+                            <th width="80px" id="tb_th_7_4">50分（人）</th>
+                            <th width="80px" id="tb_th_7_5">总扣分（分）</th>
+                            <th width="80px" id="tb_th_7_6">平均每人次扣分（分）</th>
                         </tr>
                     </thead>
                     <!-- <tbody class="table-tbody" style="background:white" align="center" height="500px">
-                        
+
                     </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" class="a" style="border-top:0px;">
-                    <tbody class="table-tbody" style="background:white" align="center" height="500px">                       
+                </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" class="a" style="border-top:0px;">
+                    <tbody class="table-tbody" style="background:white" align="center" height="500px">
                     </tbody>
-                  </table>
-                </div>  
-          </div>
+                </table>
+            </div>
+        </div>
     </div>
 </div>
 <script>
@@ -59,11 +68,10 @@
         // 设置滚动表格的高度
         $("#scrollTable").height($(window).height() - 360);
         // 仅选择日期
-        $("#start-time").datetimepicker(
-        {
-            language:  "zh-CN",
+        $("#start-time").datetimepicker({
+            language: "zh-CN",
             weekStart: 1,
-            todayBtn:  1,
+            todayBtn: 1,
             autoclose: 1,
             todayHighlight: 1,
             startView: 2,
@@ -72,11 +80,10 @@
             format: "yyyy-mm-dd"
         });
         // 仅选择日期
-        $("#end-time").datetimepicker(
-        {
-            language:  "zh-CN",
+        $("#end-time").datetimepicker({
+            language: "zh-CN",
             weekStart: 1,
-            todayBtn:  1,
+            todayBtn: 1,
             autoclose: 1,
             todayHighlight: 1,
             startView: 2,
@@ -84,7 +91,7 @@
             forceParse: 0,
             format: "yyyy-mm-dd"
         });
-       
+
         initQuerySituation();
     });
-</script>
+</script>

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

@@ -349,6 +349,61 @@
 			AND monthfunc( t.start_time ) = #{mth}
 		GROUP BY m.parent_id,m.checked_dept order by  m.checked_dept
      </select>
+
+
+
+    <!--包含扣分-->
+    <sql id="selectOneAllCheckedInfo">
+        SELECT
+        check_num_t.checked_num , check_num_t.mth, IFNULL(checked_score_t.checkd_all_score ,0) as checkd_all_score, check_num_t.checked_person,check_num_t.checked_dept
+        FROM
+
+        (
+        SELECT
+        COUNT( t.id) AS checked_num,
+        t.checked_person,
+        monthfunc (t.start_time) AS mth,t.checked_dept
+        FROM
+        check_task t
+        WHERE
+        t.checked_person IS NOT NULL
+        AND t.check_status != 22 and t.id not in <include refid="taskexclouddeleteUser"/>
+        <if test="start_date !=null">
+            AND t.start_time >= #{start_date}
+        </if>
+        <if test="end_date !=null">
+            AND t.end_time &lt; #{end_date}
+        </if>
+        <if test="user_id !=null ">
+            AND t.checked_person = #{user_id}
+        </if>
+        GROUP BY mth
+        ) check_num_t
+
+        LEFT JOIN (
+        SELECT
+        monthfunc (t.start_time) AS mth,
+        sum(m.check_item_score) AS checkd_all_score,m.*
+        FROM
+        check_score m INNER JOIN
+        ( select * From check_task t
+        where t.check_status != 22  and t.id not in <include refid="taskexclouddeleteUser"/>
+        <if test="start_date !=null">
+            AND t.start_time >= #{start_date}
+        </if>
+        <if test="end_date !=null">
+            AND t.end_time &lt; #{end_date}
+        </if>   ) t
+        ON m.task_id = t.id
+        WHERE 1=1
+        <if test="user_id !=null ">
+            AND m.checked_person = #{user_id}
+        </if>
+        GROUP BY mth
+
+        ) checked_score_t ON checked_score_t.checked_person = check_num_t.checked_person
+        AND check_num_t.mth = checked_score_t.mth
+    </sql>
      
      
      <sql id="selectOneCheckedInfo">
@@ -402,7 +457,7 @@
      </sql>
      
      <select id="selectOneCheckedInfo" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
-     	SELECT * FROM ( <include refid="selectOneCheckedInfo"/> ) t
+     	SELECT * FROM ( <include refid="selectOneAllCheckedInfo"/> ) t
      </select>
      
      <select id="selectOneCheckedItemInfo" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">