修改ui和个人数据统计饼图bug

VisualInspection/css/main.css

@@ -23,11 +23,14 @@ footer p {
 }
 
 .panel-heading {
-    border-bottom: 0px;
+    /* border-bottom: 1px; */
+}
+#main_content_title{
+    border-top: 3px solid #3c8dbc;
 }
 
 .navbar-header {
-    box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
+    /* box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12); */
 }
 
 .tree-menu li>a {
@@ -66,7 +69,7 @@ footer p {
 
 #main_panel_body {
     overflow: auto;
-    background: #fff;
+    background: #ecf0f5;
 }
 .btn-info1{
     padding: 5px 5px;
@@ -122,4 +125,27 @@ footer p {
 /* .statistic-panel{
     margin: -15px -15px -30px -15px;
     background-color: #ecf0f5;
-} */
+} */
+.datatable{
+    background-color: #fff;
+    /* padding: 5px; */
+}
+#kkpager span.disabled {
+    border: 0px;
+}
+#kkpager span.curr {
+    border: 0px;
+}
+#kkpager a{
+    border: 0px;
+}
+.container-fluid  .form-control {
+    border-color: #d2d6de;
+    /* border: none; */
+    box-shadow:none;
+}
+.table>thead>tr>th {
+    vertical-align: bottom;
+    background-color: #d2d6de;
+    border-bottom: 0px solid #ddd;
+}

VisualInspection/css/statistics/assess_situation.css

@@ -1,4 +1,4 @@
-.from-label label{
+/* .from-label label{
     width:60px;
     float:left;
     padding-top: 6px;
@@ -9,9 +9,9 @@
     float:left;
     padding-top: 6px;
     margin-left: 5px;
-}
+} */
 
-.col-sm-1{
+/* .col-sm-1{
     width:80px;
     float:left;
 }
@@ -24,13 +24,13 @@
 .col-sm-3,.col-sm-4{
     width:165px;
     float:left;
-}
+} */
 
-#start-time,#end-time{
+/* #start-time,#end-time{
  width:150px;
-}
+} */
 
-.col-sm-4{
+/* .col-sm-4{
     padding-left: 0px;
 }
 
@@ -43,12 +43,12 @@
     float:right;
     width:100px;
     margin-right: 0px;
-}
+} */
 
 
-.btn-primary{
+/* .btn-primary{
     width:80px;
-}
+} */
 
 .table-title{
     line-height: 50px;

VisualInspection/css/statistics/road_manage_statistics.css

@@ -35,7 +35,7 @@
 }
 .div-month {
     width:80px;
-    height:50px;
+    /* height:50px; */
     float:left;
     margin-left: 20px;
     line-height: 50px;
@@ -44,13 +44,13 @@
 {
     /*margin-top: 9px;*/
     width:80px;
-    height:50px;
+    /* height:50px; */
     float:left;
     line-height: 50px;
 }
 .div-roadManage{
     width:140px;
-    height:50px;
+    /* height:50px; */
     float:left;
     margin-left: 20px;
     line-height: 50px;
@@ -66,7 +66,7 @@
 
 .div-button{
     width:80px;
-    height:50px;
+    /* height:50px; */
     float:left;
     margin-left: 20px;
 }
@@ -218,8 +218,37 @@
     background-color: #fff;
 }
 .border-line{
-    width:100%;
+    /* width:100%; */
     height: 442px;
     margin:15px auto;
-    border:1px solid #328dc7;
+    border:0px solid #328dc7;
+    background-color: #fff;
+    /* background-color: #ecf0f5; */
+    /* box-shadow: 0 1px 1px rgba(0,0,0,0.1); */
+     /* box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);  */
+}
+
+.border-no{
+    /* width:100%; */
+    height: 442px;
+    margin:15px 5px;
+    border:0px solid #328dc7;
+    background-color: #fff;
+    /* background-color: #ecf0f5; */
+    box-shadow: 0 1px 1px rgba(0,0,0,0.1);
+    /* background-color: #ecf0f5; */
+    /* box-shadow: 1px 1px 3px 0 rgba(0, 0, 0, 0.16), 1px 1px 5px 0 rgba(0, 0, 0, 0.12);  */
+    text-align: center;
+}
+
+.title-div{
+    background-color: #529AC5;
+    text-align: center;
+    padding: 15px;
+}
+.title-div span{
+    color:#fff;
+    margin-left: 20px;
+    line-height: 35px;
+    font-size: 20px;
 }

VisualInspection/css/statistics/toll_station_statistics.css

@@ -35,21 +35,21 @@
 }
 .div-month{
     width:80px;
-    height:50px;
+    /* height:50px; */
     float:left;
     margin-left: 20px;
     line-height: 50px;
 }
 .div-roadManage{
     width:140px;
-    height:50px;
+    /* height:50px; */
     float:left;
     margin-left: 20px;
     line-height: 50px;
 }
 .div-station{
     width:120px;
-    height:50px;
+    /* height:50px; */
     float:left;
     margin-left: 20px;
     line-height: 50px;
@@ -85,7 +85,7 @@
 }
 .div-button{
     width:80px;
-    height:50px;
+    /* height:50px; */
     float:left;
     margin-left: 10px;
 }
@@ -246,14 +246,42 @@
     height:400px;
     background-color: #fff;
 }
+
+/* span{
+    font-family: '宋体';
+    font-size:15px;
+} */
 .border-line{
-    width:100%;
+    /* width:100%; */
     height: 442px;
     margin:15px auto;
-    border:1px solid #328dc7;
+    border:0px solid #328dc7;
+    background-color: #fff;
+    /* background-color: #ecf0f5; */
+    /* box-shadow: 0 1px 1px rgba(0,0,0,0.1); */
+     /* box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);  */
 }
-span{
-    font-family: '宋体';
-    font-size:15px;
+.border-no{
+    /* width:100%; */
+    height: 442px;
+    margin:15px 5px;
+    border:0px solid #328dc7;
+    background-color: #fff;
+    /* background-color: #ecf0f5; */
+    box-shadow: 0 1px 1px rgba(0,0,0,0.1);
+    /* background-color: #ecf0f5; */
+    /* box-shadow: 1px 1px 3px 0 rgba(0, 0, 0, 0.16), 1px 1px 5px 0 rgba(0, 0, 0, 0.12);  */
+    text-align: center;
 }
 
+.title-div{
+    background-color: #529AC5;
+    text-align: center;
+    padding: 15px;
+}
+.title-div span{
+    color:#fff;
+    margin-left: 20px;
+    line-height: 35px;
+    font-size: 20px;
+}

VisualInspection/css/statistics/total_company_statistics.css

@@ -207,7 +207,8 @@
     height: 442px;
     margin:15px auto;
     border:0px solid #328dc7;
-    background-color: #ecf0f5;
+    background-color: #fff;
+    /* background-color: #ecf0f5; */
     /* box-shadow: 0 1px 1px rgba(0,0,0,0.1); */
      /* box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);  */
 }
@@ -217,7 +218,8 @@
     height: 442px;
     margin:15px 5px;
     border:0px solid #328dc7;
-    background-color: #ecf0f5;
+    background-color: #fff;
+    /* background-color: #ecf0f5; */
     box-shadow: 0 1px 1px rgba(0,0,0,0.1);
     /* background-color: #ecf0f5; */
     /* box-shadow: 1px 1px 3px 0 rgba(0, 0, 0, 0.16), 1px 1px 5px 0 rgba(0, 0, 0, 0.12);  */
@@ -227,10 +229,11 @@
 .title-div{
     background-color: #529AC5;
     text-align: center;
-    padding: 5px;
+    padding: 15px;
 }
 .title-div span{
     color:#fff;
     margin-left: 20px;
     line-height: 35px;
+    font-size: 20px;
 }

VisualInspection/js/statistics/toll_station_statistics.js

@@ -839,7 +839,7 @@
      	     */
      	    function backward_rank_assess() {
      	        option = {
-     	            color: ['#00ced1'], // 条形图颜色
+     	            color: ['#FF7F27'], // 条形图颜色
      	            tooltip: {
      	                trigger: 'axis'
      	            },

VisualInspection/view/statistics/assess_situation.html

@@ -4,18 +4,22 @@
     <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  class="form-group col-sm-5">
+                    <label class="col-sm-2">查询日期</label>
+                    <div class="col-sm-5">
+                        <input type="text" id="start-time" class="form-control form-date" placeholder="开始日期">
+                    </div>
+                    <div class="col-sm-5">
+                        <input type="text" id="end-time" class="form-control form-date" placeholder="结束日期">
+                    </div>
                 </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="querySituationClick()">查询</button>
-                </div>
-                <div class="col-sm-6">
-                    <button class="btn btn-primary " type="button" onclick="exportExcel()">导出Excel</button>
+                <div  class="form-group col-sm-3">
+                    <div class="col-sm-6">
+                        <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>
+                    </div>
                 </div>
             </div>
         </form>

VisualInspection/view/statistics/assess_type.html

@@ -4,18 +4,22 @@
     <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  class="form-group col-sm-5">
+                    <label class="col-sm-2">查询日期</label>
+                    <div class="col-sm-5">
+                        <input type="text" id="start-time" class="form-control form-date" placeholder="开始日期">
+                    </div>
+                    <div class="col-sm-5">
+                        <input type="text" id="end-time" class="form-control form-date" placeholder="结束日期">
+                    </div>
                 </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  class="form-group col-sm-3">
+                    <div class="col-sm-6">
+                        <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>
             </div>
         </form>

VisualInspection/view/statistics/emp_ranking.html

@@ -5,63 +5,74 @@
     <div class="form-div">
         <form class="form-horizontal">
             <div class="form-group">
-                <label for="exampleInputAccount1" class="col-sm-1">道管中心</label>
-                <div class="col-sm-2" style="width:150px;">
-                    <select class="form-control" id="center-manager">
-                        <!--<option selected value="">全部</option>
-                        <option  value="30">连云港</option>
-                        <option value="31">盐城</option>
-                        <option value="32">南通</option>-->
-                    </select>
+                <div class="form-group col-sm-3">
+                    <label for="exampleInputAccount1" class="col-sm-4">道管中心</label>
+                    <div class="col-sm-8">
+                        <select class="form-control" id="center-manager">
+                            <!--<option selected value="">全部</option>
+                            <option  value="30">连云港</option>
+                            <option value="31">盐城</option>
+                            <option value="32">南通</option>-->
+                        </select>
+                    </div>
                 </div>
-                <label for="exampleInputAccount1" class="col-sm-1">部门</label>
-                <div class="col-sm-2" style="width:150px;">
-                    <select class="form-control" id="fsList">
-                    </select>
+                <div  class="form-group col-sm-3">
+                    <label for="exampleInputAccount1" class="col-sm-4">部门</label>
+                    <div class="col-sm-8">
+                        <select class="form-control" id="fsList">
+                        </select>
+                    </div>
                 </div>
-                <label for="exampleInputAccount1" class="col-sm-1">查询日期</label>
-                <div class="col-sm-3">
-                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始日期">
+                <div  class="form-group col-sm-4">
+                    <label for="exampleInputAccount1" class="col-sm-4">查询日期</label>
+                    <div class="col-sm-4">
+                        <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>
-                <div class="col-sm-3">
-                    <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="queryEmpClick()">查询</button>
-                </div>
-                <div class="col-sm-6">
-                    <button class="btn btn-primary " type="button" onclick="exportExcel()">导出Excel</button>
+                <div  class="form-group col-sm-2">
+                    <div class="col-sm-6">
+                        <button class="btn btn-primary " type="button" onclick="queryEmpClick()">查询</button>
+                    </div>
+                    <div class="col-sm-6">
+                        <button class="btn btn-primary " type="button" onclick="exportExcel()">导出Excel</button>
+                    </div>
                 </div>
             </div>
             <div class="form-group">
-                <label for="exampleInputAccount1" class="col-sm-1">考核次数</label>
+                <div  class="form-group col-sm-3">
+                    <label for="exampleInputAccount1" class="col-sm-4">考核次数</label>
 
-                <div class="col-sm-3" style="width:60px;">
-                    <input type="text" id="start-num" class="form-control form-date" style="width:60px;" value="0">
-                </div>
-                <div class="to-score" style="float:left;margin-left:20px;padding-top: 6px;"><label> - </label></div>
-                <div class="col-sm-4" style="width:60px;margin-left:10px;">
-                    <input type="text" id="end-num" class="form-control form-date" style="width:60px;" value="10">
+                    <div class="col-sm-3">
+                        <input type="text" id="start-num" class="form-control form-date" value="0">
+                    </div>
+                    <div class="to-score col-sm-2" style="padding-top: 6px;text-align:center;"><label> - </label></div>
+                    <div class="col-sm-3">
+                        <input type="text" id="end-num" class="form-control form-date" value="10">
+                    </div>
                 </div>
-
+                <div  class="form-group col-sm-3">
                 <!--<div class="col-sm-2" style="width:150px;">
                     <input type="text" id="check_count" class="form-control" value="">
                 </div>-->
-                <label for="exampleInputAccount1" class="col-sm-1">职位</label>
-                <div class="col-sm-2" style="width:150px;">
-                    <select class="form-control" id="jobSelect">
-                    </select>
-                </div>
-                <label for="exampleInputAccount1" class="col-sm-1">得分区间</label>
-                <div class="col-sm-3" style="width:60px;">
-                    <input type="text" id="start-score" class="form-control form-date" style="width:60px;" value="0">
+                    <label for="exampleInputAccount1" class="col-sm-4">职位</label>
+                    <div class="col-sm-8">
+                        <select class="form-control" id="jobSelect">
+                        </select>
+                    </div>
                 </div>
-                <div class="to-score" style="float:left;margin-left:20px;padding-top: 6px;"><label> - </label></div>
-                <div class="col-sm-4" style="width:60px;margin-left:10px;">
-                    <input type="text" id="end-score" class="form-control form-date" style="width:60px;" value="1000">
+                <div  class="form-group col-sm-4">
+                    <label for="exampleInputAccount1" class="col-sm-4">得分区间</label>
+                    <div class="col-sm-3">
+                        <input type="text" id="start-score" class="form-control form-date"  value="0">
+                    </div>
+                    <div class="to-score col-sm-2" style="padding-top: 6px;text-align:center;"><label> - </label></div>
+                    <div class="col-sm-3">
+                        <input type="text" id="end-score" class="form-control form-date" value="1000">
+                    </div>
                 </div>
-
             </div>
         </form>
     </div>

VisualInspection/view/statistics/road_manage_statistics.html

@@ -34,11 +34,26 @@
     <!-- <div class="line-1"></div> -->
 
     <div class="border-line">
-    <div class="row-3"><div><span>道管中心12个月考核得分总体变化趋势分析</span></div></div>
+    <div class="title-div"><span>道管中心12个月考核得分总体变化趋势分析</span></div>
     <div id="roadManager-year-assess" style="height: 100%;height:400px;"></div>
     </div>
 
-    <div class="border-line">
+    <div class="row">
+        <div class="col-sm-6">
+            <div class="border-no">
+                <div class="title-div"><span>道管中心考核扣分情况占比</span></div>
+                <div id="roadManager-points-assess" style="width:100%;height:400px;float:left;"></div>
+            </div>
+        </div>
+            <!-- <div class="line-3"></div> -->
+        <div class="col-sm-6">
+            <div class="border-no">
+                <div class="title-div"><span>收费站得分排名</span></div>
+                <div id="tollStation-score-rank" style="width:100%;height:400px;float:left"></div>
+            </div>
+        </div>
+    </div>
+    <!-- <div class="border-line">
     <div class="row-4">
         <div class="col-1"><span>道管中心考核扣分情况占比</span></div><div class="line-2"></div>
         <div class="col-1"><span>收费站得分排名</span></div>
@@ -48,12 +63,12 @@
         <div class="line-3"></div>
         <div id="tollStation-score-rank" style="width:49%;height:400px;float:left;padding-right:0px;"></div>
     </div>
-    </div>
+    </div> -->
 
   <div class="border-line" style="display:none;">
     <div class="row-7">
-        <div class="col-1"><span>人员考核得分前十名</span></div><div class="line-2"></div>
-        <div class="col-1"><span>人员考核得分后十名</span></div>
+        <div class="col-1 title-div"><span>人员考核得分前十名</span></div><div class="line-2"></div>
+        <div class="col-1 title-div"><span>人员考核得分后十名</span></div>
     </div>
     <div class="row-8">
         <div id="people-rank-pre" style="width:49%;height:400px;float:left;"></div>
@@ -63,11 +78,25 @@
   </div>
 
   <div class="border-line">
-    <div class="row-3"><div><span>人员考核得分后20名</span></div></div>
+    <div class="row-3"><div class="title-div"><span>人员考核得分后20名</span></div></div>
     <div id="people-rank-suf" style="height: 100%;height:400px;padding-right:10px;"></div>
     </div>
 
-  <div class="border-line">
+    <div class="row">
+        <div class="col-sm-6">
+            <div class="border-no">
+                <div class="title-div"><span>温馨服务检查问题类别占比</span></div>
+                <div id="server-check-type" style="width:100%;height:400px;float:left;"></div>
+            </div>
+        </div>
+        <div class="col-sm-6">
+            <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="row-7">
         <div class="col-1"><span>温馨服务检查问题类别占比</span></div><div class="line-2"></div>
         <div class="col-1"><span>各个问题类别的扣分情况</span></div>
@@ -77,7 +106,7 @@
         <div class="line-3"></div>
         <div id="each-people-points" style="width:49%;height:400px;float:left;"></div>
     </div>
-  </div>
+  </div> -->
   
 </div>
 <script>

VisualInspection/view/statistics/toll_station_statistics.html

@@ -40,11 +40,30 @@
     <!-- <div class="line-1"></div> -->
 
     <div class="border-line">
-    <div class="row-3"><div><span>收费站12个月考核得分总体变化趋势分析</span></div></div>
-    <div id="tollStation-year-assess" style="height: 100%;height:400px;"></div>
+    <div class="title-div"><span>收费站12个月考核得分总体变化趋势分析</span></div>
+    <div id="tollStation-year-assess" style="height:100%;height:400px;"></div>
     </div>
 
-    <div class="border-line">
+    <div class="row">
+        <div class="col-sm-6">
+            <div class="border-no">
+                <div class="title-div"><span>收费站考核扣分情况占比</span></div>
+                <div id="tollStation-points-assess" style="width:100%;height:400px;float:left;background-color: #fff;"></div>
+            </div>
+        </div>
+            <!-- <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 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> -->
+                <div id="progress-rank-assess" style="width:100%;height:400px;float:left;"></div>
+                <div id="backward-rank-assess" style="display:none;width:100%;height:400px;float:left;"></div>
+            </div>
+        </div>
+    </div>
+    <!-- <div class="border-line">
     <div class="row-4">
         <div class="col-1"><span>收费站考核扣分情况占比</span></div><div class="line-2"></div>
         <div class="col-1" id="progress"><span>考核进步Top5排行榜</span><div class="btn-change">
@@ -57,15 +76,29 @@
         <div id="progress-rank-assess" style="width:49%;height:400px;float:left;"></div>
         <div id="backward-rank-assess" style="display:none;width:49%;height:400px;float:left;"></div>
     </div>
-    </div>
+    </div> -->
 
     
     <div class="border-line">
-    <div class="row-6"><div><span>考核得分排行榜</span></div></div>
+    <div class="row-6"><div class="title-div"><span>考核得分排行榜</span></div></div>
     <div id="people-score-rank" style="height: 100%;height:400px;"></div>
     </div>
     
-  <div class="border-line">
+    <div class="row">
+        <div class="col-sm-6">
+            <div class="border-no">
+                <div class="title-div"><span>温馨服务检查问题类别占比</span></div>
+                <div id="server-check-type" style="width:100%;height:400px;float:left;"></div>
+            </div>
+        </div>
+        <div class="col-sm-6">
+            <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="row-7">
         <div class="col-1"><span>温馨服务检查问题类别占比</span></div><div class="line-2"></div>
         <div class="col-1"><span>各个问题类别的扣分情况</span></div>
@@ -75,7 +108,7 @@
         <div class="line-3"></div>
         <div id="each-people-points" style="width:49%;height:400px;float:left;"></div>
     </div>
-  </div>
+  </div> -->
   
 </div>
 <script>

VisualInspection/view/statistics/total_company_statistics.html

@@ -31,7 +31,7 @@
 
     <div class="border-line">
         <div class="row-3">
-            <div><span>公司12个月考核得分总体变化趋势分析</span></div>
+            <div class="title-div"><span>公司12个月考核得分总体变化趋势分析</span></div>
         </div>
         <div id="company-year-assess" style="height: 100%;height:400px;"></div>
     </div>
@@ -68,7 +68,7 @@
 
     <div class="border-line">
         <div class="row-6">
-            <div><span>公司全体收费站排名</span></div>
+            <div class="title-div"><span>公司全体收费站排名</span></div>
         </div>
         <div id="company-stationAll-rank" style="height: 100%;height:400px;"></div>
     </div>

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

@@ -490,7 +490,7 @@
          left join  check_score cs on (cs.task_id = t.id )
 
          WHERE
-         t.check_status != 22 and t.id not in <include refid="taskexclouddeleteUser"/> and (t.checked_person = #{user_id} or t.monitor_user_id = #{user_id})
+         t.check_status != 22 and t.id not in <include refid="taskexclouddeleteUser"/> and (cs.checked_person = #{user_id} or t.monitor_user_id = #{user_id})
          <if test="start_date !=null">
              AND  t.start_time >= #{start_date}
          </if>