稽核统计 0731

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

@@ -212,4 +212,35 @@ public class SmsCheckStatisticsController extends JeecgController<SmsStatisticsC
         return Result.OK(byId);
     }
 
+
+    /**
+     * 根据稽核点 查 稽核统计数
+     *
+     * @return 数据
+     */
+    @ApiOperation(value = "根据任务状态 查 任务状稽核类型统计数", notes = "根据任务状态 查 任务状稽核类型统计数")
+    @GetMapping(value = "/statusToCount")
+    @PermissionData(pageComponent = "statistics/SmsCheckStatistics")
+    public Result< Map<String, Object> > statusToCount(   HttpServletRequest request) {
+        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("*", "");
+
+        SmsStatisticsCheckVo smsStatisticsCheckVo=new SmsStatisticsCheckVo();
+        smsStatisticsCheckVo.setCustomerName(customerName);
+        smsStatisticsCheckVo.setCustomerNo(customerNo);
+        smsStatisticsCheckVo.setTaskName(taskName);
+        smsStatisticsCheckVo.setTaskState(taskState);
+         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

@@ -101,77 +101,77 @@ public class SmsStatisticsCheckVo {
     @ApiModelProperty(value = "员工三级部门编号")
     private String staffDeptLevel3No;
     /** 用户开通状态 (1：开通；2：拆机)*/
-    @Excel(name = "用户开通状态", width = 15)
+//    @Excel(name = "用户开通状态", width = 15)
     @ApiModelProperty(value = "用户开通状态")
     private Integer userOpenState;
     /** 码号 */
-    @Excel(name = "码号", width = 15)
+   // @Excel(name = "码号", width = 15)
     @ApiModelProperty(value = "码号")
     private String smsNumberPrefix;
     /** 号码详细用途 */
-    @Excel(name = "号码详细用途", width = 15)
+    //@Excel(name = "号码详细用途", width = 15)
     @ApiModelProperty(value = "号码详细用途")
     private String smsNumberUsage;
     /** 客户经理 */
-    @Excel(name = "客户经理", width = 15)
+   // @Excel(name = "客户经理", width = 15)
     @ApiModelProperty(value = "客户经理")
     private String accountManager;
     /** 客户经理手机号 */
-    @Excel(name = "客户经理手机号", width = 15)
+  //  @Excel(name = "客户经理手机号", width = 15)
     @ApiModelProperty(value = "客户经理手机号")
     private String accountManagerPhone;
     /** 码号使用单位联系人 */
-    @Excel(name = "码号使用单位联系人", width = 15)
+   // @Excel(name = "码号使用单位联系人", width = 15)
     @ApiModelProperty(value = "码号使用单位联系人")
     private String customerContacts;
     /** 码号使用单位联系人手机号 */
-    @Excel(name = "码号使用单位联系人手机号", width = 15)
+   // @Excel(name = "码号使用单位联系人手机号", width = 15)
     @ApiModelProperty(value = "码号使用单位联系人手机号")
     private String customerContactsPhone;
     /** 合同到期时间（YYYY-MM-DD） */
-    @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 contractExpireTime;
     /** 码号证书到期时间（YYYY-MM-DD） */
-    @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 smsNumberCertificateExpireTime;
     /** 备案通知到期时间（YYYY-MM-DD） */
-    @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 recordNoticeExpireTime;
     /** 增值业务许可证到期时间（YYYY-MM-DD） */
-    @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 valueAddedLicenceExpireTime;
     /** 营业执照到期时间（YYYY-MM-DD） */
-    @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 businessLicenceExpireTime;
     /** 合同签署主体与实际开通客户是否一致 */
-    @Excel(name = "合同签署主体与实际开通客户是否一致", width = 15)
+  //  @Excel(name = "合同签署主体与实际开通客户是否一致", width = 15)
     @ApiModelProperty(value = "合同签署主体与实际开通客户是否一致")
     private Integer contractOpenCustomerSame;
     /** 是否有集团价格审批 */
-    @Excel(name = "是否有集团价格审批", width = 15)
+   // @Excel(name = "是否有集团价格审批", width = 15)
     @ApiModelProperty(value = "是否有集团价格审批")
     private Integer groupPriceApproval;
     /** 资料是否完整 */
-    @Excel(name = "资料是否完整", width = 15)
+   // @Excel(name = "资料是否完整", width = 15)
     @ApiModelProperty(value = "资料是否完整")
     private Integer dataComplete;
     /** 是否完成整改 */
-    @Excel(name = "是否完成整改", width = 15)
+  //  @Excel(name = "是否完成整改", width = 15)
     @ApiModelProperty(value = "是否完成整改")
     private Integer rectifyReformOver;
     /** 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过； */
@@ -180,11 +180,11 @@ public class SmsStatisticsCheckVo {
     @ApiModelProperty(value = "稽核状态")
     private Integer checkState;
     /** 描述 */
-    @Excel(name = "描述", width = 15)
+   // @Excel(name = "描述", width = 15)
     @ApiModelProperty(value = "描述")
     private String description;
     /** 删除标识 */
-    @Excel(name = "删除标识", width = 15)
+   // @Excel(name = "删除标识", width = 15)
     @ApiModelProperty(value = "删除标识")
     private Integer delFlag;
     /** 创建人 */
@@ -220,7 +220,8 @@ public class SmsStatisticsCheckVo {
     private String taskName;
 
     /** 任务状态 */
-    @Excel(name = "任务状态", width = 15)
+    @Excel(name = "任务状态", width = 15,dicCode = "sms_check_task_state")
+    @Dict(dicCode = "sms_check_task_state")
     @ApiModelProperty(value = "任务状态")
     private String taskState;
 

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

@@ -48,4 +48,13 @@ public interface SmsCheckStaticsMapper  extends BaseMapper<SmsStatisticsCheckVo>
      */
      List<Map<String,Object>>  statisticsWorkLogById(@Param("Id") String id );
 
+    /**
+     *  根据任务状态 查 任务状稽核类型统计数
+     * @return
+     */
+    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);
+
 }

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

@@ -29,7 +29,14 @@
         <include refid="ifTest"/>
     </select>
 
-
+    <select id="statisticsStatusToCount" resultType="java.util.HashMap">
+        select    b.task_state,count(*) num
+        from sms_check_customer_info a
+        LEFT JOIN sms_check_task b   on a.task_id =b.id
+        where 1=1 and b.type in (1,2,3,4)  and a.del_flag =0
+        <include refid="ifTest"/>
+        GROUP BY b.task_state
+    </select>
 
 
 

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

@@ -22,6 +22,7 @@ public interface SmsCheckStatisticsService extends IService<SmsStatisticsCheckVo
 
     Map<String,Object>  statisticsCountListByType(String type,String startDate,String endDate,String infoId,SmsStatisticsCheckVo smsStatisticsCheckVo);
 
+   Map<String, Object>   statisticsStatusToCount(String type,String startDate,String endDate,String infoId,SmsStatisticsCheckVo smsStatisticsCheckVo);
 
     List<Map<String,Object>>  statisticsWorkLogById(String Id);
 

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

@@ -4,6 +4,7 @@ package org.jeecg.modules.smscheck.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.constant.enums.CheckTaskTypeEnum;
 import org.jeecg.modules.smscheck.entity.SmsStatisticsCheckVo;
 import org.jeecg.modules.smscheck.mapper.SmsCheckStaticsMapper;
@@ -75,11 +76,28 @@ public class SmsCheckStatisticsServiceImpl extends ServiceImpl<SmsCheckStaticsMa
         String customerNo = smsStatisticsCheckVo.getCustomerNo();
         String taskName = smsStatisticsCheckVo.getTaskName();
         String taskState = smsStatisticsCheckVo.getTaskState();
+        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);
+
+                    String s = value.name().toLowerCase();
+                    mapNums.put("totalNum",num);
+                    mapNums.put(s+"Num",num);
+                    return  mapNums;
+                }
+            }
+        }
+
         //总数
         Long totalNum = smsCheckStaticsMapper.selectTotal(null,startDate,endDate,infoId,customerName,customerNo,taskName,taskState);
 
         //1:行短稽核
         String line = CheckTaskTypeEnum.Line.getCode();
+
         Long lineNum = smsCheckStaticsMapper.selectTotal(line,startDate,endDate,infoId,customerName,customerNo,taskName,taskState);
 
         //2：物联网业务稽核
@@ -94,7 +112,7 @@ public class SmsCheckStatisticsServiceImpl extends ServiceImpl<SmsCheckStaticsMa
         String trunkLineAudit = CheckTaskTypeEnum.TrunkLineAudit.getCode();
         Long trunkLineAuditNum = smsCheckStaticsMapper.selectTotal(trunkLineAudit,startDate,endDate,infoId,customerName,customerNo,taskName,taskState);
 
-        Map<String,Object> mapNums = new HashMap<>();
+
 
 
         // 根据日期选择
@@ -108,6 +126,23 @@ public class SmsCheckStatisticsServiceImpl extends ServiceImpl<SmsCheckStaticsMa
         return mapNums;
     }
 
+    @Override
+    public  Map<String, Object> statisticsStatusToCount(String type, String startDate, String endDate, String infoId, SmsStatisticsCheckVo smsStatisticsCheckVo) {
+        Map<String,Object>mapCount = new HashMap<>();
+        String customerName = smsStatisticsCheckVo.getCustomerName();
+        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);
+        int num = 0;
+        for (Map<String, Object> map : maps ) {
+            mapCount.put(map.get("task_state").toString(),map.get("num").toString());
+            num+=Integer.valueOf(map.get("num").toString());
+        }
+        mapCount.put("num",num);
+        return mapCount;
+    }
+
     @Override
     public List<Map<String,Object>> statisticsWorkLogById(String Id) {
         return  smsCheckStaticsMapper.statisticsWorkLogById(Id);