安检量统计修改

huaxin-system/src/main/java/com/zehong/system/service/impl/TTaskInspectServiceImpl.java

@@ -226,7 +226,7 @@ public class TTaskInspectServiceImpl implements ITTaskInspectService
         //根据安检人和安检任务汇总
         List<Map<String,Object>> statisticResult = tTaskInspectMapper.inspectNumStatisticByInspector(param);
         //根据任务汇总同一个任务下的安检数量汇总并计算未安检量
-        statisticNoInspectNum(statisticResult);
+        statisticNoInspectNum(statisticResult,param);
         //根据安检人汇总安检量
         return statisticInspectByInspector(statisticResult);
     }
@@ -234,9 +234,19 @@ public class TTaskInspectServiceImpl implements ITTaskInspectService
     /**
      * 根据任务汇总未安检量
      * @param statisticResult 统计结果
+     * @param
      */
-    private void statisticNoInspectNum(List<Map<String,Object>> statisticResult){
-        Map<Object, List<Map<String, Object>>> groupByTask = statisticResult.stream().collect(Collectors.groupingBy(e ->e.get("taskId")));
+    private void statisticNoInspectNum(List<Map<String,Object>> statisticResult,Map<String,String> param){
+        Map<Object, List<Map<String, Object>>> groupByTask;
+        //筛选时间时重新计算未安检量
+        if(null != param.get("beginTime")){
+            Map<String,String> newParam = new HashMap<>();
+            newParam.put("village",param.get("village"));
+            List<Map<String,Object>> statisticResultNew = tTaskInspectMapper.inspectNumStatisticByInspector(newParam);
+            groupByTask = statisticResultNew.stream().collect(Collectors.groupingBy(e ->e.get("taskId")));
+        }else{
+            groupByTask = statisticResult.stream().collect(Collectors.groupingBy(e ->e.get("taskId")));
+        }
         for(Object key : groupByTask.keySet()){
             List<Map<String, Object>> inspectInfoList = groupByTask.get(key);
             //汇总任务安检量

huaxin-web/src/views/checktask/inspectnumstatisticbyinspector/index.vue

@@ -12,6 +12,7 @@
           size="small"
           @change="timeChange"
           value-format="yyyy-MM-dd HH:mm:ss"
+          :clearable="false"
         >
         </el-date-picker>
       </el-form-item>