稽查员工作量修改

VisualInspection/js/statistics/check_workload_statistics.js

@@ -134,8 +134,9 @@ $(function() {
         }
         var user_id = $("#select-personal").val();
         // 表格
-        initAppealPage(start_date, end_date, user_id);
         checkman_info(start_date, end_date, user_id);
+        initAppealPage(start_date, end_date, user_id);
+
     });
 
     /**
@@ -154,9 +155,10 @@ $(function() {
                 sec.innerHTML = '';
             }
             var user_id = $("#select-personal").val();
+            checkman_info(start_date, end_date, user_id);
             // 初始化表格
             initAppealPage(start_date, end_date, user_id);
-            checkman_info(start_date, end_date, user_id);
+
         }, function(error) {
             return "";
         });
@@ -178,7 +180,10 @@ $(function() {
             "end_date": end_date,
             "checkman_id": user_id
         }
+
+
         post_common_service("statistics/checkman/info", param, function(data) {
+            console.log(data)
             if (data != null) {
                 WH(".all_check_task", GDV(data.all_task_num, 0));
                 WH(".all_check_minute", convertT(GDV(data.all_check_minute, 0)));

VisualInspection/view/statistics/check_workload_statistics.html

@@ -8,10 +8,14 @@
     <div class="row-2">
         <div>
             <div class="name1" style="width:70px;"><span>稽查人员：</span></div>
-            <div class="div-select"><select id="select-personal"></select></button></div>
-            <div class="div-start"><input placeholder="请选择考核开始时间"></input></div>
+            <div class="div-select"><select id="select-personal"></select></button>
+            </div>
+            <div class="name1" style="width:70px;"><span>考核时间：</span></div>
+            <div class="div-start" style='margin-left:0px'><input placeholder="请选择考核开始时间"></input>
+            </div>
             <div class="div-to"><label>-</label></div>
-            <div class="div-end"><input placeholder="请选择考核结束时间"></input></div>
+            <div class="div-end"><input placeholder="请选择考核结束时间"></input>
+            </div>
             <div class="div-select" style="margin-left:25px;"><select class="score-select">
                     <option value="">全部</option><option value="1" selected>扣分</option><option value="0">不扣分</option>
                 </select>
@@ -20,11 +24,11 @@
 
             <div style="margin-right:30px;float:right;" class="div-button"><button id="export-check-info">导出</button></div>
         </div>
-    </div> 
+    </div>
 
     <div class="row-3">
-       <table class="table table-bordered" style="text-align:center;">
-           <tr>
+        <table class="table table-bordered" style="text-align:center;">
+            <tr>
                 <td>总稽查任务数</td>
                 <td>扣分任务数</td>
                 <td>无效任务数</td>
@@ -34,22 +38,22 @@
                 <td>考核人员扣分数量</td>
                 <td>总扣分数</td>
             </tr>
-           <tr>
-               <td class="all_check_task"></td>
-               <td class="checked_task_num"></td>
-               <td class="unable_task_num"></td>            
-               <td class="all_check_minute"></td>
-               <td class="all_checkman"></td>
-               <td class="checked_num"></td>
-               <td class="checked_people_num"></td>
-               <td class="all_check_score"></td>
+            <tr>
+                <td class="all_check_task"></td>
+                <td class="checked_task_num"></td>
+                <td class="unable_task_num"></td>
+                <td class="all_check_minute"></td>
+                <td class="all_checkman"></td>
+                <td class="checked_num"></td>
+                <td class="checked_people_num"></td>
+                <td class="all_check_score"></td>
             </tr>
-       </table>
+        </table>
     </div>
 
-<div class="row" style="width:100%;margin:0 auto;">
-            <!-- 使用一个div来显示数据表格 -->
-            <div id="check_workload_table" class="datatable" data-checkable="true" data-sortable="true"></div>
+    <div class="row" style="width:100%;margin:0 auto;">
+        <!-- 使用一个div来显示数据表格 -->
+        <div id="check_workload_table" class="datatable" data-checkable="true" data-sortable="true"></div>
     </div>
-  
+
 </div>

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

@@ -571,6 +571,10 @@
 				WHERE
 				  t.check_time >= #{start_date}
 					AND t.check_time < #{end_date}
+
+        <if test="checkman_id!=null">
+            AND t.checkman = #{checkman_id}
+        </if>
     </select>
     
     
@@ -584,6 +588,9 @@
 				WHERE
 				  t.check_time >= #{start_date}
 					AND t.check_time &lt; #{end_date}
+        <if test="checkman_id!=null">
+            AND t.checkman = #{checkman_id}
+        </if>
     </select>
     
      <select id="selectCheckManInfo3" parameterType="com.xintong.visualinspection.bean.CheckmanStatisticsBean" resultType="com.xintong.visualinspection.bean.CheckmanStatisticsBean">
@@ -591,6 +598,9 @@
     		t.check_time >= #{start_date}
 			AND t.check_time &lt; #{end_date}
     		AND t.check_status = 22 and t.id not in <include refid="taskexclouddeleteUser"/>
+         <if test="checkman_id!=null">
+             AND t.checkman = #{checkman_id}
+         </if>
     </select>
     <!--稽查人员工作量统计 end  -->