居民村庄统计导出修改

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

@@ -299,7 +299,7 @@ public class TTaskInspectController extends BaseController
      */
     @PostMapping("/inspectNumStatisticByVillageExport")
     public AjaxResult inspectNumStatisticByVillageExport(@RequestBody Map<String,String> param){
-        List<InspectNumStatisticByVillageVo> list = tTaskInspectService.inspectNumStatisticByVillage(param);
+        List<InspectNumStatisticByVillageVo> list = tTaskInspectService.inspectNumStatisticByVillageExport(param);
         ExcelUtil<InspectNumStatisticByVillageVo> util = new ExcelUtil<>(InspectNumStatisticByVillageVo.class);
         return util.exportExcel(list, "居民村庄安检量统计数据");
     }

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

@@ -10,9 +10,6 @@ public class InspectNumStatisticByVillageVo {
     /** 姓名 */
     @Excel(name="村庄")
     private String name;
-    /** 待安检单数 */
-    //@Excel(name="待安检单数")
-    private String noInspectNum;
     /** 正常安检 */
     @Excel(name="正常安检")
     private int normalInspectNum;
@@ -43,14 +40,6 @@ public class InspectNumStatisticByVillageVo {
         this.name = name;
     }
 
-    public String getNoInspectNum() {
-        return noInspectNum;
-    }
-
-    public void setNoInspectNum(String noInspectNum) {
-        this.noInspectNum = noInspectNum;
-    }
-
     public int getNormalInspectNum() {
         return normalInspectNum;
     }

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

@@ -130,6 +130,12 @@ public interface ITTaskInspectService
      */
     List<InspectNumStatisticByVillageVo> inspectNumStatisticByVillage(Map<String,String> param);
 
+    /**
+     * 居民村庄安检量统计导出
+     * @param param 入参
+     * @return
+     */
+    List<InspectNumStatisticByVillageVo> inspectNumStatisticByVillageExport(Map<String,String> param);
 
 
     /**

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

@@ -370,6 +370,34 @@ public class TTaskInspectServiceImpl implements ITTaskInspectService
     }
 
 
+    /**
+     * 居民村庄安检量统计导出
+     * @param param 入参
+     * @return
+     */
+    @Override
+    public List<InspectNumStatisticByVillageVo> inspectNumStatisticByVillageExport(Map<String,String> param){
+        List<InspectNumStatisticByVillageVo> result = new ArrayList<>();
+        List<InspectNumStatisticByVillageVo> statisticInfoResultList = tTaskInspectMapper.inspectNumStatisticByVillage(param);
+        if(CollectionUtils.isEmpty(statisticInfoResultList)) return null;
+        //获取汇总信息 保证汇总在第一位
+        InspectNumStatisticByVillageVo statisticInfo = new InspectNumStatisticByVillageVo();
+        statisticInfo.setName("汇总");
+        result.add(statisticInfo);
+        result.addAll(statisticInfoResultList);
+        for(InspectNumStatisticByVillageVo info : statisticInfoResultList){
+            statisticInfo.setNormalInspectNum(statisticInfo.getNormalInspectNum() + info.getNormalInspectNum());
+            statisticInfo.setRefuseInspectNum(statisticInfo.getRefuseInspectNum() + info.getRefuseInspectNum());
+            statisticInfo.setStopInspectNum(statisticInfo.getStopInspectNum() + info.getStopInspectNum());
+            statisticInfo.setMissInspectNum(statisticInfo.getMissInspectNum() + info.getMissInspectNum());
+            statisticInfo.setDangerNum(statisticInfo.getDangerNum() + info.getDangerNum());
+            statisticInfo.setNoDangerNum(statisticInfo.getNoDangerNum() + info.getNoDangerNum());
+            statisticInfo.setTotal(statisticInfo.getTotal() + info.getTotal());
+        }
+        return result;
+    }
+
+
 
     /**
      * 工商业安检量统计

huaxin-system/src/main/resources/mapper/system/TTaskInspectMapper.xml

@@ -503,7 +503,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="inspectNumStatisticByVillage" parameterType="InspectNumStatisticByVillageVo" resultType="Map">
+    <select id="inspectNumStatisticByVillage" parameterType="Map" resultType="InspectNumStatisticByVillageVo">
         select
           co.name,
           COUNT(inspect.id) as total,