隐患标题修改及安检量导出

huaxin-admin/src/main/java/com/zehong/web/controller/checktask/TTaskInspectController.java

@@ -267,4 +267,16 @@ public class TTaskInspectController extends BaseController
     public AjaxResult inspectNumStatisticByInspector(@RequestBody Map<String,String> param){
         return AjaxResult.success(tTaskInspectService.inspectNumStatisticByInspector(param));
     }
+
+    /**
+     * 根据安检人统计安检量导出
+     * @param param
+     * @return
+     */
+    @PostMapping("/inspectNumStatisticByInspectorExport")
+    public AjaxResult inspectNumStatisticByInspectorExport(@RequestBody Map<String,String> param){
+        List<InspectNumStatisticByInspectorExportVo> list = tTaskInspectService.inspectNumStatisticByInspectorExport(param);
+        ExcelUtil<InspectNumStatisticByInspectorExportVo> util = new ExcelUtil<>(InspectNumStatisticByInspectorExportVo.class);
+        return util.exportExcel(list, "安检量统计数据");
+    }
 }

huaxin-system/src/main/java/com/zehong/system/domain/vo/InspectNumStatisticByInspectorExportVo.java

+package com.zehong.system.domain.vo;
+
+import com.zehong.common.annotation.Excel;
+
+/**
+ * 安检量统计导出
+ */
+public class InspectNumStatisticByInspectorExportVo {
+
+    /** 姓名 */
+    @Excel(name="姓名")
+    private String inspector;
+    /** 待安检单数 */
+    @Excel(name="待安检单数")
+    private int noInspectNum;
+    /** 正常安检 */
+    @Excel(name="正常安检")
+    private int normalInspectNum;
+    /** 拒绝安检 */
+    @Excel(name="拒绝安检")
+    private int refuseInspectNum;
+    /** 燃气停用 */
+    @Excel(name="燃气停用")
+    private int stopInspectNum;
+    /** 到访不遇 */
+    @Excel(name="到访不遇")
+    private int missInspectNum;
+    /** 有隐患单数 */
+    @Excel(name="有隐患单数")
+    private int dangerNum;
+    /** 无隐患单数 */
+    @Excel(name="无隐患单数")
+    private int noDangerNum;
+    /** 汇总 */
+    @Excel(name="汇总")
+    private int total;
+
+    public String getInspector() {
+        return inspector;
+    }
+
+    public void setInspector(String inspector) {
+        this.inspector = inspector;
+    }
+
+    public int getNoInspectNum() {
+        return noInspectNum;
+    }
+
+    public void setNoInspectNum(int noInspectNum) {
+        this.noInspectNum = noInspectNum;
+    }
+
+    public int getNormalInspectNum() {
+        return normalInspectNum;
+    }
+
+    public void setNormalInspectNum(int normalInspectNum) {
+        this.normalInspectNum = normalInspectNum;
+    }
+
+    public int getRefuseInspectNum() {
+        return refuseInspectNum;
+    }
+
+    public void setRefuseInspectNum(int refuseInspectNum) {
+        this.refuseInspectNum = refuseInspectNum;
+    }
+
+    public int getStopInspectNum() {
+        return stopInspectNum;
+    }
+
+    public void setStopInspectNum(int stopInspectNum) {
+        this.stopInspectNum = stopInspectNum;
+    }
+
+    public int getMissInspectNum() {
+        return missInspectNum;
+    }
+
+    public void setMissInspectNum(int missInspectNum) {
+        this.missInspectNum = missInspectNum;
+    }
+
+    public int getDangerNum() {
+        return dangerNum;
+    }
+
+    public void setDangerNum(int dangerNum) {
+        this.dangerNum = dangerNum;
+    }
+
+    public int getNoDangerNum() {
+        return noDangerNum;
+    }
+
+    public void setNoDangerNum(int noDangerNum) {
+        this.noDangerNum = noDangerNum;
+    }
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+}

huaxin-system/src/main/java/com/zehong/system/service/ITTaskInspectService.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.zehong.system.domain.TTaskInspect;
+import com.zehong.system.domain.vo.InspectNumStatisticByInspectorExportVo;
 import com.zehong.system.domain.vo.UserTaskInspect;
 import com.zehong.system.domain.vo.Userinstpect;
 
@@ -105,4 +106,11 @@ public interface ITTaskInspectService
      * @return
      */
     List<Map<String,Object>> inspectNumStatisticByInspector(Map<String,String> param);
+
+    /**
+     * 安检量统计导出
+     * @param param 入参
+     * @return
+     */
+    List<InspectNumStatisticByInspectorExportVo> inspectNumStatisticByInspectorExport(Map<String,String> param);
 }

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

@@ -4,10 +4,13 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.zehong.common.utils.DateUtils;
 import com.zehong.common.utils.SecurityUtils;
+import com.zehong.common.utils.bean.BeanUtils;
 import com.zehong.system.domain.TTask;
 import com.zehong.system.domain.TUserInspect;
+import com.zehong.system.domain.vo.InspectNumStatisticByInspectorExportVo;
 import com.zehong.system.domain.vo.UserTaskInspect;
 import com.zehong.system.domain.vo.Userinstpect;
 import com.zehong.system.mapper.TDangerMapper;
@@ -299,4 +302,36 @@ public class TTaskInspectServiceImpl implements ITTaskInspectService
         }
         return result;
     }
+
+
+    /**
+     * 安检量统计导出
+     * @param param 入参
+     * @return
+     */
+    @Override
+    public List<InspectNumStatisticByInspectorExportVo> inspectNumStatisticByInspectorExport(Map<String,String> param){
+        List<InspectNumStatisticByInspectorExportVo> export = new ArrayList<>();
+        //获取汇总信息
+        List<Map<String,Object>> result = inspectNumStatisticByInspector(param);
+        InspectNumStatisticByInspectorExportVo statisticInfo = new InspectNumStatisticByInspectorExportVo();
+        statisticInfo.setInspector("汇总");
+        export.add(statisticInfo);
+        for(Map info : result){
+            ObjectMapper objectMapper = new ObjectMapper();
+            InspectNumStatisticByInspectorExportVo exportInfo = objectMapper.convertValue(info,InspectNumStatisticByInspectorExportVo.class);
+            int total = (int)info.get("normalInspectNum") + (int)info.get("refuseInspectNum") + (int)info.get("stopInspectNum") + (int)info.get("missInspectNum");
+            exportInfo.setTotal(total);
+            statisticInfo.setNoInspectNum(statisticInfo.getNoInspectNum() + (int) info.get("noInspectNum"));
+            statisticInfo.setNormalInspectNum(statisticInfo.getNormalInspectNum() + (int) info.get("normalInspectNum"));
+            statisticInfo.setRefuseInspectNum(statisticInfo.getRefuseInspectNum() + (int) info.get("refuseInspectNum"));
+            statisticInfo.setStopInspectNum(statisticInfo.getStopInspectNum() + (int) info.get("stopInspectNum"));
+            statisticInfo.setMissInspectNum(statisticInfo.getMissInspectNum() + (int) info.get("missInspectNum"));
+            statisticInfo.setDangerNum(statisticInfo.getDangerNum() + (int) info.get("dangerNum"));
+            statisticInfo.setNoDangerNum(statisticInfo.getNoDangerNum() + (int) info.get("noDangerNum"));
+            statisticInfo.setTotal(statisticInfo.getTotal() + total);
+            export.add(exportInfo);
+        }
+        return export;
+    }
 }

huaxin-web/src/api/checktask/inspect.js

@@ -140,3 +140,12 @@ export function inspectNumStatisticByInspector(data) {
     data: data
   })
 }
+
+//根据安检人统计安检量导出
+export function inspectNumStatisticByInspectorExport(data) {
+  return request({
+    url: '/checktask/inspect/inspectNumStatisticByInspectorExport',
+    method: 'post',
+    data: data
+  })
+}

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

@@ -84,7 +84,11 @@
 
     <el-table v-loading="loading" :data="dangerList">
       <el-table-column label="序号" align="center" prop="id" v-if="!$store.state.user.roles.includes('visitor')"/>
-      <el-table-column label="隐患标题" align="center" prop="title" width="150" :show-overflow-tooltip="true"/>
+      <el-table-column label="隐患标题" align="center" prop="title" width="150" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.title + (scope.row.remark ? '-' + scope.row.remark : '')}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="隐患来源" align="center" prop="type" :formatter="typeFormatter"/>
       <el-table-column label="责任归属" align="center" prop="flag">
         <template slot-scope="scope">

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

@@ -49,6 +49,19 @@
       </el-form-item>
     </el-form>
 
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+    </el-row>
+
     <el-table v-loading="loading" :data="inspectStatisticInfoList">
       <el-table-column label="姓名" align="center" prop="inspector"/>
       <el-table-column label="待安检单数" align="center" prop="noInspectNum"/>
@@ -64,7 +77,7 @@
 </template>
 
 <script>
-  import {inspectNumStatisticByInspector} from "@/api/checktask/inspect";
+  import {inspectNumStatisticByInspector, inspectNumStatisticByInspectorExport} from "@/api/checktask/inspect";
   import { communityList } from "@/api/baseinfo/community";
   import { aLLAreaListInfo } from "@/api/baseinfo/area";
   import moment from 'moment';
@@ -82,7 +95,8 @@
         inspectStatisticInfoList: [],
         time: [moment(moment().startOf('day').toDate()).format("YYYY-MM-DD HH:mm:ss"),moment(moment().endOf('day').toDate()).format("YYYY-MM-DD HH:mm:ss")],
         communityData: [],
-        streetData: []
+        streetData: [],
+        exportLoading: false
       }
     },
     created(){
@@ -152,7 +166,22 @@
       changeStreet(){
         this.queryParams.village = null;
         this.getCommunityInfo();
-      }
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        const queryParams = this.queryParams;
+        this.$confirm('是否确认导出所有安检量统计数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return inspectNumStatisticByInspectorExport(queryParams);
+        }).then(response => {
+            this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+      },
     }
   }
 </script>