Просмотр исходного кода

UI:稽查人员工作统计 排序

温红权 8 лет назад
Родитель
Сommit
ccec236e67

+ 6 - 2
VisualInspection/js/statistics/check_workload_statistics.js

@@ -87,7 +87,7 @@ $(function() {
             { width: 60, height: 60, text: '考核部门', flex: true, colClass: 'text-center', field: 'feeStationName' },
             { width: 40, height: 60, text: '扣分数', flex: true, colClass: 'text-center', field: 'score' },
             { width: 60, height: 60, text: '考核类型', flex: true, colClass: 'text-center', field: 'parent_name' },
-            { width: 60, height: 60, text: '考核完成时间', flex: true, colClass: 'text-center', field: 'update_time' },
+            { width: 60, height: 60, text: '考核提交时间', flex: true, colClass: 'text-center', field: 'update_time' },
             { width: 100, height: 60, text: '考核项', flex: true, colClass: 'text-center', field: 'name' },
             { width: 200, height: 60, text: '扣分凭证', type: 'imagedd', flex: true, field: 'pics' },
         ];
@@ -241,7 +241,11 @@ function jumptodetail(id) {
         $.zui.store.set('store_param_' + current_url, pdata);
 
         url = "/view/mytask/taskDetail.html"
-        changePage(url);
+
+        post_common_service("/checkAppeal/getByTaskId", { "task_id": id }, function(data) {
+            $.checkTask.appeal = data;
+            changePage(url);
+        });
     }, function(error) {
 
     });

+ 2 - 2
VisualInspection/view/statistics/check_workload_statistics.html

@@ -10,7 +10,7 @@
             <div class="name1" style="width:70px;"><span>稽查人员:</span></div>
             <div class="div-select"><select id="select-personal"></select></button>
             </div>
-            <div class="name1" style="width:70px;"><span>考核时间:</span></div>
+            <div class="name1" style="width:90px;"><span>考核提交时间:</span></div>
             <div class="div-start" style='margin-left:0px'><input placeholder="请选择考核开始时间"></input>
             </div>
             <div class="div-to"><label>-</label></div>
@@ -35,7 +35,7 @@
                 <td>总稽查时长</td>
                 <td>稽查扣分次数</td>
                 <td>考核人员数量</td>
-                <td>考核人员扣分数量</td>
+                <td>扣分人员数量</td>
                 <td>总扣分数</td>
             </tr>
             <tr>

+ 4 - 0
VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/StatisticsMapper.xml

@@ -535,6 +535,10 @@
 			<if test="score_flag!=null and score_flag == 0">
 				AND cs.check_item_score IS  NULL  
 			</if>
+
+         <if test="queryType!=null and queryType==1">
+            ORDER  BY cst.update_time desc
+         </if>
      </select>
      
       <select id="selectCheckManInfo" parameterType="com.xintong.visualinspection.bean.CheckmanStatisticsBean" resultType="com.xintong.visualinspection.bean.CheckmanStatisticsBean">