稽核统计 chong gou

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

@@ -69,20 +69,7 @@ public class SmsCheckStatisticsController extends JeecgController<SmsStatisticsC
         String infoId = request.getParameterMap().get("infoId")==null?"": Arrays.toString(request.getParameterMap().get("infoId")).replace("[", "").replace("]", "").replace("*", "");
         String endDate = request.getParameterMap().get("endDate")==null?"": Arrays.toString(request.getParameterMap().get("endDate")).replace("[", "").replace("]", "").replace("*", "");
         String startDate = request.getParameterMap().get("startDate")==null?"": Arrays.toString(request.getParameterMap().get("startDate")).replace("[", "").replace("]", "").replace("*", "");
-        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);
+        SmsStatisticsCheckVo smsStatisticsCheckVo =getSmsStatisticsCheckVo(request);
         Map<String, Object> stringObjectMap = smsCheckStatisticsService.smsCheckStatisticsList(smsStatisticsCheckVo, page,startDate,endDate,infoId);
         return Result.OK(stringObjectMap);
     }
@@ -96,7 +83,6 @@ public class SmsCheckStatisticsController extends JeecgController<SmsStatisticsC
         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);
@@ -120,20 +106,7 @@ public class SmsCheckStatisticsController extends JeecgController<SmsStatisticsC
         String infoId = request.getParameterMap().get("infoId")==null?"": Arrays.toString(request.getParameterMap().get("infoId")).replace("[", "").replace("]", "").replace("*", "");
         String endDate = request.getParameterMap().get("endDate")==null?"": Arrays.toString(request.getParameterMap().get("endDate")).replace("[", "").replace("]", "").replace("*", "");
         String startDate = request.getParameterMap().get("startDate")==null?"": Arrays.toString(request.getParameterMap().get("startDate")).replace("[", "").replace("]", "").replace("*", "");
-        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);
+        SmsStatisticsCheckVo smsStatisticsCheckVo =getSmsStatisticsCheckVo(request);
         Map<String, Object> stringObjectMap = smsCheckStatisticsService.statisticsCountListByType(smsStatisticsCheckVo.getType(),  startDate,  endDate,infoId,smsStatisticsCheckVo);
 
         return Result.OK(stringObjectMap);
@@ -152,20 +125,7 @@ public class SmsCheckStatisticsController extends JeecgController<SmsStatisticsC
         String infoId = request.getParameterMap().get("infoId")==null?"": Arrays.toString(request.getParameterMap().get("infoId")).replace("[", "").replace("]", "").replace("*", "");
         String endDate = request.getParameterMap().get("endDate")==null?"": Arrays.toString(request.getParameterMap().get("endDate")).replace("[", "").replace("]", "").replace("*", "");
         String startDate = request.getParameterMap().get("startDate")==null?"": Arrays.toString(request.getParameterMap().get("startDate")).replace("[", "").replace("]", "").replace("*", "");
-        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);
+        SmsStatisticsCheckVo smsStatisticsCheckVo =getSmsStatisticsCheckVo(request);
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
         long totalNum = (long) smsCheckStatisticsService.statisticsCountListByType(null,endDate,startDate,infoId,smsStatisticsCheckVo).get("totalNum");
@@ -252,20 +212,7 @@ public class SmsCheckStatisticsController extends JeecgController<SmsStatisticsC
         String infoId = request.getParameterMap().get("infoId")==null?"": Arrays.toString(request.getParameterMap().get("infoId")).replace("[", "").replace("]", "").replace("*", "");
         String endDate = request.getParameterMap().get("endDate")==null?"": Arrays.toString(request.getParameterMap().get("endDate")).replace("[", "").replace("]", "").replace("*", "");
         String startDate = request.getParameterMap().get("startDate")==null?"": Arrays.toString(request.getParameterMap().get("startDate")).replace("[", "").replace("]", "").replace("*", "");
-        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);
+        SmsStatisticsCheckVo smsStatisticsCheckVo =getSmsStatisticsCheckVo(request);
          Map<String, Object>  stringObjectMap = smsCheckStatisticsService.statisticsStatusToCount(smsStatisticsCheckVo.getType(),  startDate,  endDate,infoId,smsStatisticsCheckVo);
 
         return Result.OK(stringObjectMap);