稽核统计 0731 -2

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

@@ -74,6 +74,7 @@ public class SmsCheckStatisticsController extends JeecgController<SmsStatisticsC
         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);
@@ -81,6 +82,7 @@ public class SmsCheckStatisticsController extends JeecgController<SmsStatisticsC
         smsStatisticsCheckVo.setCustomerNo(customerNo);
         smsStatisticsCheckVo.setTaskName(taskName);
         smsStatisticsCheckVo.setTaskState(taskState);
+        smsStatisticsCheckVo.setCheckState(checkState);
         Map<String, Object> stringObjectMap = smsCheckStatisticsService.smsCheckStatisticsList(smsStatisticsCheckVo, page,startDate,endDate,infoId);
         return Result.OK(stringObjectMap);
     }
@@ -103,12 +105,14 @@ public class SmsCheckStatisticsController extends JeecgController<SmsStatisticsC
         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.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);
 
         return Result.OK(stringObjectMap);
@@ -132,6 +136,7 @@ public class SmsCheckStatisticsController extends JeecgController<SmsStatisticsC
         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.setCustomerName(customerName);
@@ -139,6 +144,7 @@ public class SmsCheckStatisticsController extends JeecgController<SmsStatisticsC
         smsStatisticsCheckVo.setTaskName(taskName);
         smsStatisticsCheckVo.setType(taskType);
         smsStatisticsCheckVo.setTaskState(taskState);
+        smsStatisticsCheckVo.setCheckState(checkState);
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
         long totalNum = (long) smsCheckStatisticsService.statisticsCountListByType(null,endDate,startDate,infoId,smsStatisticsCheckVo).get("totalNum");
@@ -230,12 +236,14 @@ public class SmsCheckStatisticsController extends JeecgController<SmsStatisticsC
         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.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);
 
         return Result.OK(stringObjectMap);

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

@@ -178,7 +178,7 @@ public class SmsStatisticsCheckVo {
     @Excel(name = "稽核状态", width = 15, dicCode = "sms_check_check_state")
     @Dict(dicCode = "sms_check_check_state")
     @ApiModelProperty(value = "稽核状态")
-    private Integer checkState;
+    private String checkState;
     /** 描述 */
    // @Excel(name = "描述", width = 15)
     @ApiModelProperty(value = "描述")
@@ -226,14 +226,14 @@ public class SmsStatisticsCheckVo {
     private String taskState;
 
     /** 任务开始时间 */
-    @Excel(name = "任务开始时间（YYYY-MM-DD）", width = 15, format = "yyyy-MM-dd")
+  //  @Excel(name = "任务开始时间（YYYY-MM-DD）", width = 15, format = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "任务开始时间（YYYY-MM-DD）")
     private Date taskStartTime;
 
     /** 任务开始时间 */
-    @Excel(name = "任务结束时间（YYYY-MM-DD）", width = 15, format = "yyyy-MM-dd")
+   // @Excel(name = "任务结束时间（YYYY-MM-DD）", width = 15, format = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "任务结束时间（YYYY-MM-DD）")
@@ -246,12 +246,12 @@ public class SmsStatisticsCheckVo {
 
 
     /** 待稽核数 */
-    @Excel(name = "待稽核数", width = 15)
+   // @Excel(name = "待稽核数", width = 15)
     @ApiModelProperty(value = "待稽核数")
     private String uncheckCount;
 
     /** 已稽核数 */
-    @Excel(name = "已稽核数", width = 15)
+  //  @Excel(name = "已稽核数", width = 15)
     @ApiModelProperty(value = "已稽核数")
     private String checkCount;
 

tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/SmsCheckStaticsMapper.java

@@ -27,7 +27,7 @@ public interface SmsCheckStaticsMapper  extends BaseMapper<SmsStatisticsCheckVo>
                                                     @Param("size") Long size, @Param("startDate")String startDate,
                                                     @Param("endDate")String endDate,@Param("taskId") String taskId,
                                                     @Param("customerName") String customerName,@Param("customerNo") String customerNo,
-                                                    @Param("taskName") String taskName,@Param("taskState")String taskState);
+                                                    @Param("taskName") String taskName,@Param("taskState")String taskState,@Param("checkState") String checkState);
 
     /**
      * 获取总记录条数
@@ -36,7 +36,7 @@ public interface SmsCheckStaticsMapper  extends BaseMapper<SmsStatisticsCheckVo>
     Long selectTotal(@Param("type") String type,@Param("startDate")String startDate,
                      @Param("endDate")String endDate,@Param("taskId") String taskId,
                      @Param("customerName") String customerName,@Param("customerNo") String customerNo,
-                     @Param("taskName") String taskName,@Param("taskState")String taskState);
+                     @Param("taskName") String taskName,@Param("taskState")String taskState,@Param("checkState") String checkState);
 
 
 
@@ -55,6 +55,6 @@ public interface SmsCheckStaticsMapper  extends BaseMapper<SmsStatisticsCheckVo>
     List<Map<String,Object>> statisticsStatusToCount(@Param("type") String type,@Param("startDate")String startDate,
                                                     @Param("endDate")String endDate,@Param("taskId") String taskId,
                                                     @Param("customerName") String customerName,@Param("customerNo") String customerNo,
-                                                    @Param("taskName") String taskName,@Param("taskState")String taskState);
+                                                    @Param("taskName") String taskName,@Param("taskState")String taskState,@Param("checkState") String checkState);
 
 }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/xml/SmsCheckStaticsMapper.xml

@@ -86,5 +86,6 @@
         <if test="customerNo != null   and customerNo!='' "> and  a.customer_no = #{customerNo} </if>
         <if test="taskName != null   and taskName!='' "> and  b.task_name = #{taskName} </if>
         <if test="taskState != null   and taskState!='' "> and  b.task_state = #{taskState} </if>
+        <if test="checkState != null   and checkState!='' "> and  a.check_state = #{checkState} </if>
     </sql>
 </mapper>

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/impl/SmsCheckStatisticsServiceImpl.java

@@ -46,9 +46,10 @@ public class SmsCheckStatisticsServiceImpl extends ServiceImpl<SmsCheckStaticsMa
         String customerNo = smsStatisticsCheckVo.getCustomerNo();
         String taskName = smsStatisticsCheckVo.getTaskName();
         String taskState = smsStatisticsCheckVo.getTaskState();
-        List<Map<String, Object>> maps = smsCheckStaticsMapper.selectCheckStaticsList(smsStatisticsCheckVo.getType(), start,size,startDate,endDate,taskId,customerName,customerNo,taskName,taskState);
+        String checkState = smsStatisticsCheckVo.getCheckState();
+        List<Map<String, Object>> maps = smsCheckStaticsMapper.selectCheckStaticsList(smsStatisticsCheckVo.getType(), start,size,startDate,endDate,taskId,customerName,customerNo,taskName,taskState,checkState);
 
-        Long total = smsCheckStaticsMapper.selectTotal(smsStatisticsCheckVo.getType(),startDate,endDate,taskId,customerName,customerNo,taskName,taskState);
+        Long total = smsCheckStaticsMapper.selectTotal(smsStatisticsCheckVo.getType(),startDate,endDate,taskId,customerName,customerNo,taskName,taskState,checkState);
 
         //构建返回对象内容
         mapResult.put("current",current);
@@ -76,13 +77,14 @@ public class SmsCheckStatisticsServiceImpl extends ServiceImpl<SmsCheckStaticsMa
         String customerNo = smsStatisticsCheckVo.getCustomerNo();
         String taskName = smsStatisticsCheckVo.getTaskName();
         String taskState = smsStatisticsCheckVo.getTaskState();
+        String checkState = smsStatisticsCheckVo.getCheckState();
         Map<String,Object> mapNums = new HashMap<>();
         if(StringUtils.isNotBlank(type)){
             CheckTaskTypeEnum[] values = CheckTaskTypeEnum.values();
             for (CheckTaskTypeEnum value : values) {
                 if (value.getCode().equals(type)){
 
-                    Long num = smsCheckStaticsMapper.selectTotal(value.getCode(),startDate,endDate,infoId,customerName,customerNo,taskName,taskState);
+                    Long num = smsCheckStaticsMapper.selectTotal(value.getCode(),startDate,endDate,infoId,customerName,customerNo,taskName,taskState,checkState);
 
                     String s = value.name().toLowerCase();
                     mapNums.put("totalNum",num);
@@ -93,24 +95,24 @@ public class SmsCheckStatisticsServiceImpl extends ServiceImpl<SmsCheckStaticsMa
         }
 
         //总数
-        Long totalNum = smsCheckStaticsMapper.selectTotal(null,startDate,endDate,infoId,customerName,customerNo,taskName,taskState);
+        Long totalNum = smsCheckStaticsMapper.selectTotal(null,startDate,endDate,infoId,customerName,customerNo,taskName,taskState,checkState);
 
         //1:行短稽核
         String line = CheckTaskTypeEnum.Line.getCode();
 
-        Long lineNum = smsCheckStaticsMapper.selectTotal(line,startDate,endDate,infoId,customerName,customerNo,taskName,taskState);
+        Long lineNum = smsCheckStaticsMapper.selectTotal(line,startDate,endDate,infoId,customerName,customerNo,taskName,taskState,checkState);
 
         //2：物联网业务稽核
         String business = CheckTaskTypeEnum.Business.getCode();
-        Long businessNum = smsCheckStaticsMapper.selectTotal(business,startDate,endDate,infoId,customerName,customerNo,taskName,taskState);
+        Long businessNum = smsCheckStaticsMapper.selectTotal(business,startDate,endDate,infoId,customerName,customerNo,taskName,taskState,checkState);
 
         //3.复开审批
         String reopening = CheckTaskTypeEnum.Reopening.getCode();
-        Long reopeningNum = smsCheckStaticsMapper.selectTotal(reopening,startDate,endDate,infoId,customerName,customerNo,taskName,taskState);
+        Long reopeningNum = smsCheckStaticsMapper.selectTotal(reopening,startDate,endDate,infoId,customerName,customerNo,taskName,taskState,checkState);
 
         //4.中继线稽核
         String trunkLineAudit = CheckTaskTypeEnum.TrunkLineAudit.getCode();
-        Long trunkLineAuditNum = smsCheckStaticsMapper.selectTotal(trunkLineAudit,startDate,endDate,infoId,customerName,customerNo,taskName,taskState);
+        Long trunkLineAuditNum = smsCheckStaticsMapper.selectTotal(trunkLineAudit,startDate,endDate,infoId,customerName,customerNo,taskName,taskState,checkState);
 
 
 
@@ -133,7 +135,8 @@ public class SmsCheckStatisticsServiceImpl extends ServiceImpl<SmsCheckStaticsMa
         String customerNo = smsStatisticsCheckVo.getCustomerNo();
         String taskName = smsStatisticsCheckVo.getTaskName();
         String taskState = smsStatisticsCheckVo.getTaskState();
-        List<Map<String, Object>> maps = smsCheckStaticsMapper.statisticsStatusToCount(type, startDate, endDate, infoId, customerName, customerNo, taskName, taskState);
+        String checkState = smsStatisticsCheckVo.getCheckState();
+        List<Map<String, Object>> maps = smsCheckStaticsMapper.statisticsStatusToCount(type, startDate, endDate, infoId, customerName, customerNo, taskName, taskState,checkState);
         int num = 0;
         for (Map<String, Object> map : maps ) {
             mapCount.put(map.get("task_state").toString(),map.get("num").toString());