稽核统计 0731 -3

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckStatisticsController.java

@@ -88,6 +88,26 @@ public class SmsCheckStatisticsController extends JeecgController<SmsStatisticsC
     }
 
 
+    private SmsStatisticsCheckVo getSmsStatisticsCheckVo(HttpServletRequest request ){
+        String taskType = request.getParameterMap().get("taskType")==null?"": Arrays.toString(request.getParameterMap().get("taskType")).replace("[", "").replace("]", "").replace("*", "");
+        String customerNo = request.getParameterMap().get("customerNo")==null?"": Arrays.toString(request.getParameterMap().get("customerNo")).replace("[", "").replace("]", "").replace("*", "");
+        String customerName = request.getParameterMap().get("customerName")==null?"": Arrays.toString(request.getParameterMap().get("customerName")).replace("[", "").replace("]", "").replace("*", "");
+        String taskName = request.getParameterMap().get("taskName")==null?"": Arrays.toString(request.getParameterMap().get("taskName")).replace("[", "").replace("]", "").replace("*", "");
+        String taskState = request.getParameterMap().get("taskState")==null?"": Arrays.toString(request.getParameterMap().get("taskState")).replace("[", "").replace("]", "").replace("*", "");
+        String checkState = request.getParameterMap().get("checkState")==null?"": Arrays.toString(request.getParameterMap().get("checkState")).replace("[", "").replace("]", "").replace("*", "");
+
+
+        SmsStatisticsCheckVo smsStatisticsCheckVo=new SmsStatisticsCheckVo();
+        smsStatisticsCheckVo.setType(taskType);
+        smsStatisticsCheckVo.setCustomerName(customerName);
+        smsStatisticsCheckVo.setCustomerNo(customerNo);
+        smsStatisticsCheckVo.setTaskName(taskName);
+        smsStatisticsCheckVo.setTaskState(taskState);
+        smsStatisticsCheckVo.setCheckState(checkState);
+        return smsStatisticsCheckVo;
+    }
+
+
     /**
      * 根据稽核点 查 稽核统计数
      *
@@ -108,12 +128,13 @@ public class SmsCheckStatisticsController extends JeecgController<SmsStatisticsC
         String checkState = request.getParameterMap().get("checkState")==null?"": Arrays.toString(request.getParameterMap().get("checkState")).replace("[", "").replace("]", "").replace("*", "");
 
         SmsStatisticsCheckVo smsStatisticsCheckVo=new SmsStatisticsCheckVo();
+        smsStatisticsCheckVo.setType(taskType);
         smsStatisticsCheckVo.setCustomerName(customerName);
         smsStatisticsCheckVo.setCustomerNo(customerNo);
         smsStatisticsCheckVo.setTaskName(taskName);
         smsStatisticsCheckVo.setTaskState(taskState);
         smsStatisticsCheckVo.setCheckState(checkState);
-        Map<String, Object> stringObjectMap = smsCheckStatisticsService.statisticsCountListByType(taskType,  startDate,  endDate,infoId,smsStatisticsCheckVo);
+        Map<String, Object> stringObjectMap = smsCheckStatisticsService.statisticsCountListByType(smsStatisticsCheckVo.getType(),  startDate,  endDate,infoId,smsStatisticsCheckVo);
 
         return Result.OK(stringObjectMap);
     }
@@ -139,10 +160,10 @@ public class SmsCheckStatisticsController extends JeecgController<SmsStatisticsC
         String checkState = request.getParameterMap().get("checkState")==null?"": Arrays.toString(request.getParameterMap().get("checkState")).replace("[", "").replace("]", "").replace("*", "");
 
         SmsStatisticsCheckVo smsStatisticsCheckVo=new SmsStatisticsCheckVo();
+        smsStatisticsCheckVo.setType(taskType);
         smsStatisticsCheckVo.setCustomerName(customerName);
         smsStatisticsCheckVo.setCustomerNo(customerNo);
         smsStatisticsCheckVo.setTaskName(taskName);
-        smsStatisticsCheckVo.setType(taskType);
         smsStatisticsCheckVo.setTaskState(taskState);
         smsStatisticsCheckVo.setCheckState(checkState);
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -239,12 +260,13 @@ public class SmsCheckStatisticsController extends JeecgController<SmsStatisticsC
         String checkState = request.getParameterMap().get("checkState")==null?"": Arrays.toString(request.getParameterMap().get("checkState")).replace("[", "").replace("]", "").replace("*", "");
 
         SmsStatisticsCheckVo smsStatisticsCheckVo=new SmsStatisticsCheckVo();
+        smsStatisticsCheckVo.setType(taskType);
         smsStatisticsCheckVo.setCustomerName(customerName);
         smsStatisticsCheckVo.setCustomerNo(customerNo);
         smsStatisticsCheckVo.setTaskName(taskName);
         smsStatisticsCheckVo.setTaskState(taskState);
         smsStatisticsCheckVo.setCheckState(checkState);
-         Map<String, Object>  stringObjectMap = smsCheckStatisticsService.statisticsStatusToCount(taskType,  startDate,  endDate,infoId,smsStatisticsCheckVo);
+         Map<String, Object>  stringObjectMap = smsCheckStatisticsService.statisticsStatusToCount(smsStatisticsCheckVo.getType(),  startDate,  endDate,infoId,smsStatisticsCheckVo);
 
         return Result.OK(stringObjectMap);
     }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsStatisticsCheckVo.java

@@ -240,7 +240,7 @@ public class SmsStatisticsCheckVo {
     private Date taskEndTime;
 
     /** 客户总数 */
-    @Excel(name = "客户总数", width = 15)
+    //@Excel(name = "客户总数", width = 15)
     @ApiModelProperty(value = "客户总数")
     private String customerCount;