安检量统计未安检量统计

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

@@ -12,7 +12,7 @@ public class InspectNumStatisticByInspectorExportVo {
     private String inspector;
     /** 待安检单数 */
     @Excel(name="待安检单数")
-    private int noInspectNum;
+    private String noInspectNum;
     /** 正常安检 */
     @Excel(name="正常安检")
     private int normalInspectNum;
@@ -43,11 +43,11 @@ public class InspectNumStatisticByInspectorExportVo {
         this.inspector = inspector;
     }
 
-    public int getNoInspectNum() {
+    public String getNoInspectNum() {
         return noInspectNum;
     }
 
-    public void setNoInspectNum(int noInspectNum) {
+    public void setNoInspectNum(String noInspectNum) {
         this.noInspectNum = noInspectNum;
     }
 

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

@@ -316,13 +316,14 @@ public class TTaskInspectServiceImpl implements ITTaskInspectService
         List<Map<String,Object>> result = inspectNumStatisticByInspector(param);
         InspectNumStatisticByInspectorExportVo statisticInfo = new InspectNumStatisticByInspectorExportVo();
         statisticInfo.setInspector("汇总");
+        statisticInfo.setNoInspectNum("-");
         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.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"));

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

@@ -125,11 +125,11 @@
           this.loading = false;
           if(res.code == 200 && res.data){
               this.inspectStatisticInfoList = res.data;
-              let statistic = {inspector: "汇总",noInspectNum: 0,normalInspectNum: 0,refuseInspectNum: 0,stopInspectNum: 0,
+              let statistic = {inspector: "汇总",noInspectNum: "-",normalInspectNum: 0,refuseInspectNum: 0,stopInspectNum: 0,
                 missInspectNum: 0,dangerNum: 0,noDangerNum: 0,total: 0};
               this.inspectStatisticInfoList.forEach(item =>{
                 let total = item.normalInspectNum + item.refuseInspectNum + item.stopInspectNum + item.missInspectNum;
-                statistic.noInspectNum += item.noInspectNum;
+                //statistic.noInspectNum += item.noInspectNum;
                 statistic.normalInspectNum += item.normalInspectNum;
                 statistic.refuseInspectNum += item.refuseInspectNum;
                 statistic.stopInspectNum += item.stopInspectNum;