1.特审复开

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/AsCheckCustomerInfoController.java → tnc-sms/src/main/java/org/jeecg/modules/smscheck/annotation/controller/AsCheckCustomerInfoController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.smscheck.controller;
+package org.jeecg.modules.smscheck.annotation.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/BusinessReminderCardController.java → tnc-sms/src/main/java/org/jeecg/modules/smscheck/annotation/controller/BusinessReminderCardController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.smscheck.controller;
+package org.jeecg.modules.smscheck.annotation.controller;
 
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.ObjectUtil;

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/DesensitizationTest.java → tnc-sms/src/main/java/org/jeecg/modules/smscheck/annotation/controller/DesensitizationTest.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.smscheck.controller;
+package org.jeecg.modules.smscheck.annotation.controller;
 
 import org.jeecg.modules.smscheck.entity.BusinessReminderCard;
 import org.jeecg.modules.smscheck.service.BusinessReminderCardService;

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCompanyController.java → tnc-sms/src/main/java/org/jeecg/modules/smscheck/annotation/controller/SmsCheckCompanyController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.smscheck.controller;
+package org.jeecg.modules.smscheck.annotation.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerDataController.java → tnc-sms/src/main/java/org/jeecg/modules/smscheck/annotation/controller/SmsCheckCustomerDataController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.smscheck.controller;
+package org.jeecg.modules.smscheck.annotation.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerInfoController.java → tnc-sms/src/main/java/org/jeecg/modules/smscheck/annotation/controller/SmsCheckCustomerInfoController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.smscheck.controller;
+package org.jeecg.modules.smscheck.annotation.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Dict;
@@ -546,7 +546,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     @ApiOperation(value = "客户信息-通过id查询 稽核统计数", notes = "客户信息-通过id查询 稽核统计数")
     @GetMapping(value = "/count")
     @PermissionData(pageComponent = "smscheck/modules/TaskCheckList")
-    public Result<Dict> count(@RequestParam(name = "id") String id,HttpServletRequest request) {
+    public Result<Dict> count(String id,HttpServletRequest request) {
         Dict dict = Dict.create();
         // 客户总数
         QueryWrapper<SmsCheckCustomerInfo> countQueryWrapper = QueryGenerator.initQueryWrapper(new SmsCheckCustomerInfo(), request.getParameterMap());

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerInfoErrorController.java → tnc-sms/src/main/java/org/jeecg/modules/smscheck/annotation/controller/SmsCheckCustomerInfoErrorController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.smscheck.controller;
+package org.jeecg.modules.smscheck.annotation.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerInfoLogController.java → tnc-sms/src/main/java/org/jeecg/modules/smscheck/annotation/controller/SmsCheckCustomerInfoLogController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.smscheck.controller;
+package org.jeecg.modules.smscheck.annotation.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckIndexController.java → tnc-sms/src/main/java/org/jeecg/modules/smscheck/annotation/controller/SmsCheckIndexController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.smscheck.controller;
+package org.jeecg.modules.smscheck.annotation.controller;
 
 
 import cn.hutool.core.bean.BeanUtil;

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckSmsNumberController.java → tnc-sms/src/main/java/org/jeecg/modules/smscheck/annotation/controller/SmsCheckSmsNumberController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.smscheck.controller;
+package org.jeecg.modules.smscheck.annotation.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.smscheck.controller;
+package org.jeecg.modules.smscheck.annotation.controller;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckTaskController.java → tnc-sms/src/main/java/org/jeecg/modules/smscheck/annotation/controller/SmsCheckTaskController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.smscheck.controller;
+package org.jeecg.modules.smscheck.annotation.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckWorkLogController.java → tnc-sms/src/main/java/org/jeecg/modules/smscheck/annotation/controller/SmsCheckWorkLogController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.smscheck.controller;
+package org.jeecg.modules.smscheck.annotation.controller;
 
 import com.alibaba.druid.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsLotCustomerController.java → tnc-sms/src/main/java/org/jeecg/modules/smscheck/annotation/controller/SmsLotCustomerController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.smscheck.controller;
+package org.jeecg.modules.smscheck.annotation.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsTruckCustomerDataController.java → tnc-sms/src/main/java/org/jeecg/modules/smscheck/annotation/controller/SmsTruckCustomerDataController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.smscheck.controller;
+package org.jeecg.modules.smscheck.annotation.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SpecialExaminationContrller.java → tnc-sms/src/main/java/org/jeecg/modules/smscheck/annotation/controller/SpecialExaminationContrller.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.smscheck.controller;
+package org.jeecg.modules.smscheck.annotation.controller;
 
 
 import cn.hutool.core.bean.BeanUtil;
@@ -6,6 +6,7 @@ import cn.hutool.core.lang.Dict;
 import cn.hutool.core.lang.Tuple;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.druid.sql.visitor.functions.If;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,6 +16,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -35,13 +37,18 @@ import org.jeecg.modules.smscheck.configs.CheckStateCode;
 import org.jeecg.modules.smscheck.configs.CheckTypeCode;
 import org.jeecg.modules.smscheck.configs.ShutdownLabelByCode;
 import org.jeecg.modules.smscheck.entity.*;
+import org.jeecg.modules.smscheck.entity.excel.SpecialExaminationExport;
 import org.jeecg.modules.smscheck.service.*;
 import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoVo;
 import org.jeecg.modules.smscheck.vo.SpecialExaminationCustomerVo;
 import org.jeecg.modules.smscheck.vo.SpecialExaminationVo;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -51,17 +58,17 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 @Api(tags = "特审复开审批")
 @RestController
 @RequestMapping("/special/examination")
 @Slf4j
 public class SpecialExaminationContrller extends JeecgController<SmsCheckCustomerSpeciaInfo, SmsCheckCustomerSpeciaInfoService> {
-
+    @Value("${jeecg.path.upload}")
+    private String upLoadPath;
     @Resource
     private SpecialExaminationService specialExaminationService;
 
@@ -260,7 +267,7 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody SpecialExamination specialExamination) {
         //关停标签
-        Integer shutdownLabel = specialExamination.getShutdownLabel();
+        String shutdownLabel = specialExamination.getShutdownLabel();
         //材料标签
         Integer materialLabel = specialExamination.getMaterialLabel();
         //用户标签
@@ -280,6 +287,12 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
         if (StrUtil.isBlank(infoId)) {
             return Result.error("暂存失败");
         }
+        // 互获取客户信息
+        SmsCheckCustomerInfo customerInfo = infoService.getById(infoId);
+        Integer checkState = customerInfo.getCheckState();
+        if (!CheckStateCode.CHECK_STSTE_0.equals(checkState) && !CheckStateCode.CHECK_STSTE_1.equals(checkState)){
+            return Result.error("暂存失败，该客户状态不允许暂存");
+        }
         SpecialExamination specialExamination = new SpecialExamination();
         BeanUtil.copyProperties(specialExaminationVo,specialExamination);
         // 暂存特审复开数据
@@ -291,7 +304,7 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
             specialExaminationService.updateById(specialExamination);
         }
         // 修改客户状态
-        SmsCheckCustomerInfo customerInfo = infoService.getById(infoId);
+
         customerInfo.setCheckState(CheckStateCode.CHECK_STSTE_1);
         customerInfo.setShutdownLabel(specialExamination.getShutdownLabel().toString());
         customerInfo.setShutdownLabelDate(specialExamination.getShutdownTime());
@@ -420,12 +433,12 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
     public Result<?> importCustomerData(@PathVariable String taskId, @RequestBody List<SpecialExaminationCustomerVo> list) {
         // 获取当前登录用户
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        ISysBaseAPI iSysBaseAPI = SpringContextUtils.getBean(ISysBaseAPI.class);
-        List<String> departNamesByUsername = iSysBaseAPI.getDepartNamesByUsername(sysUser.getUsername());
         // 随斤生成任务ID，批量上传关联文件包
         String generate = UUIDGenerator.generate();
-        //导入数据
+        // 导入数据
         List<SpecialExaminationCustomerVo> listExcel = new ArrayList<>();
+        // 当前已存入数据
+        HashMap<String, SpecialExaminationCustomerVo> saveLogMap = new HashMap<>();
         int customerCount = 0;
         for (SpecialExaminationCustomerVo infoVo : list) {
             SmsCheckCustomerInfo info = new SmsCheckCustomerInfo();
@@ -437,7 +450,11 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
             // 0：未处理；1：未完善；2：待稽核；3：待整改；4：已整改；5：稽核通过；
             info.setCheckState(CheckStateCode.CHECK_STSTE_0);
             info.setType(CheckTypeCode.CHECK_TYPE_3);
-            if (StringUtils.isNotEmpty(info.getCustomerName())
+            if (saveLogMap.get(info.getSmsNumber()) != null){
+                infoVo.setResult("0");
+                infoVo.setErrorMsg("本次已导入过此号码");
+
+            } else if (StringUtils.isNotEmpty(info.getCustomerName())
                     && StringUtils.isNotEmpty(info.getSmsNumber())
                     && StringUtils.isNotEmpty(info.getMaterialLabel())
                     && StringUtils.isNotEmpty(info.getNameFindCompliance())
@@ -453,6 +470,7 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
                     String materialLabel = info.getMaterialLabel();
                     specialExamination.setMaterialLabel("有".equals(materialLabel) ? 0 : 1);
                     specialExaminationService.save(specialExamination);
+                    saveLogMap.put(info.getSmsNumber(),infoVo);
                 }
             } else {
                 infoVo.setResult("0");
@@ -524,10 +542,10 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
         return Result.ok(one);
     }
 
-    @RequestMapping(value = "/exportXls")
+    /*@RequestMapping(value = "/exportXls")
     public ModelAndView exportXlsSpecial(HttpServletRequest request, SmsCheckCustomerSpeciaInfo smsCheckCustomerSpeciaInfo) {
         return super.exportXls(request, smsCheckCustomerSpeciaInfo, SmsCheckCustomerSpeciaInfo.class, "特审复开客户信息");
-    }
+    }*/
 
     /**
      * 通过id查询 稽核统计数
@@ -592,4 +610,114 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
         return Result.OK(dict);
     }
 
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, SmsCheckCustomerInfo smsCheckCustomerInfo) {
+        smsCheckCustomerInfo.setType(3);
+        return  exportXls(request, smsCheckCustomerInfo, SpecialExaminationExport.class, "特审复开信息");
+    }
+
+    protected ModelAndView exportXls(HttpServletRequest request, SmsCheckCustomerInfo object, Class<SpecialExaminationExport> clazz, String title) {
+        // Step.1 组装查询条件
+        QueryWrapper<SmsCheckCustomerInfo> queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap());
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+        // Step.2 获取导出数据
+        List<SmsCheckCustomerInfo> infoList = customerInfoService.list(queryWrapper);
+        // 获取上传资料数据
+        List<SpecialExamination> logList = specialExaminationService.list();
+        Map<String, SpecialExamination> logMap
+                = logList.stream().collect(Collectors.toMap(v->v.getInfoId(), Function.identity(), (o, n) -> o));
+
+        // 获取稽核资料数据
+        List<SmcSpecialCheckLog> dataList = smcSpecialCheckLogService.list();
+        Map<String, SmcSpecialCheckLog> dataMap
+                = dataList.stream().collect(Collectors.toMap(v->v.getInfoId(), Function.identity(), (o, n) -> o));
+
+        List<SpecialExaminationExport> pageList = new ArrayList<>();
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        for (SmsCheckCustomerInfo smsCheckCustomerInfo : infoList) {
+            SpecialExamination specialExamination = logMap.get(smsCheckCustomerInfo.getId());
+            SmcSpecialCheckLog smcSpecialCheckLog = dataMap.get(smsCheckCustomerInfo.getId());
+            SpecialExaminationExport specialExaminationExport = new SpecialExaminationExport();
+            BeanUtil.copyProperties(specialExamination,specialExaminationExport);
+            BeanUtil.copyProperties(smcSpecialCheckLog,specialExaminationExport);
+            BeanUtil.copyProperties(smsCheckCustomerInfo,specialExaminationExport);
+            String shutdownLabel = specialExaminationExport.getShutdownLabel();
+            if (StringUtils.isNotEmpty(shutdownLabel)){
+                String name = "";
+                String[] split = shutdownLabel.split(",");
+                for (String lable:split){
+                    if (lable.equals("0")){
+                        name = name + " " + "安防停机（高危漫游地）";
+                    }
+                    if (lable.equals( "1")){
+                        name = name + " " + "安防关停（紫名单）";
+                    }
+                    if (lable.equals("2")){
+                        name = name + " " + "安防停机（专班研判）";
+                    }
+                    if (lable.equals("3")){
+                        name = name + " " + "安防停机（可复开）";
+                    }
+                    if (lable.equals("4")){
+                        name = name + " " + "沉默移动卡保护性单停";
+                    }
+                    if (lable.equals("5")){
+                        name = name + " " + "集团一点停复机（单停）";
+                    }
+                    if (lable.equals("6")){
+                        name = name + " " + "大数据保护停机单停 ";
+                    }
+                    if (lable.equals("7")){
+                        name = name + " " + "工信部断卡单停 ";
+                    }
+                    if (lable.equals("8")){
+                        name = name + " " + "实人核验未通过关停（单停）";
+                    }
+                    if (lable.equals("999")){
+                        name = name + " " + "其它 ";
+                    }
+                }
+                specialExaminationExport.setShutdownLabel(name);
+            }
+            specialExaminationExport.setDataId(smsCheckCustomerInfo.getDataId());
+            //以dataid代替id
+            //smsCheckCustomerDataAndLog.setDataId(smsCheckCustomerInfo.getId());
+            pageList.add(specialExaminationExport);
+        }
+
+        List<SpecialExaminationExport> exportList = null;
+
+        // 过滤选中数据
+        String selections = request.getParameter("selections");
+        if (oConvertUtils.isNotEmpty(selections)) {
+            List<String> selectionList = Arrays.asList(selections.split(","));
+            exportList = pageList.stream().filter(item -> selectionList.contains(getId(item))).collect(Collectors.toList());
+        } else {
+            exportList = pageList;
+        }
+        //exportList = dataToResult(exportList);
+        // Step.3 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        //此处设置的filename无效 ,前端会重更新设置一下
+        mv.addObject(NormalExcelConstants.FILE_NAME, title);
+        mv.addObject(NormalExcelConstants.CLASS, clazz);
+        //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
+        ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
+        exportParams.setImageBasePath(upLoadPath);
+        //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
+        mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+        return mv;
+    }
+
+    private String getId(SpecialExaminationExport item) {
+        try {
+            return PropertyUtils.getProperty(item, "dataId").toString();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
 }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SysCompanyController.java → tnc-sms/src/main/java/org/jeecg/modules/smscheck/annotation/controller/SysCompanyController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.smscheck.controller;
+package org.jeecg.modules.smscheck.annotation.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

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

@@ -13,7 +13,7 @@ import lombok.experimental.Accessors;
 public class SmcSpecialCheckLogStateVo {
 
     /** 基础信息稽核结果 */
-    private Integer basicinfoState;
+    private Integer basicInfoState;
     /** 系统实名制截图 */
     private Integer nameFindComplianceState;
     /** 特审单 */

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

@@ -25,7 +25,7 @@ public class SmsCheckCustomerDataAndLog  {
     private String infoId;
 
     @Excel(name = "客户编号", width = 15)
-    @ApiModelProperty(value = "客户id")
+    @ApiModelProperty(value = "客户编号")
     private String customerNo;
 
     @Excel(name = "用户编号", width = 15)

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

@@ -231,6 +231,9 @@ public class SmsCheckCustomerInfo implements Serializable {
     /** 复开时间 */
    // @Excel(name = "复开时间", width = 15)
     @ApiModelProperty(value = "复开时间")
+    @Excel(name = "提交材料日期", width = 15)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date reopenTime;
 
     /** 有无特审单 */

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

@@ -47,7 +47,7 @@ public class SpecialExamination implements Serializable {
     private String staffNo;
 
     @ApiModelProperty(value = "关停标签")
-    private Integer shutdownLabel;
+    private String shutdownLabel;
     private String shutdownLabelOther;
 
     @ApiModelProperty(value = "材料标签")

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

@@ -0,0 +1,99 @@
+package org.jeecg.modules.smscheck.entity.excel;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class SpecialExaminationExport {
+    /** 客户资料ID */
+    private String dataId;
+    /**提交材料日期*/
+    @Excel(name = "提交材料日期", width = 15)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private String createTime;
+    /** 客户名称 */
+    @Excel(name = "机主姓名", width = 15)
+    private String customerName;
+    @Excel(name = "服务号码（全）", width = 15)
+    @ApiModelProperty(value = "号码")
+    private String smsNumber;
+    @Excel(name = "最后一次关停时间", width = 15)
+    private String shutdownLabelDate;
+    @Excel(name = "有无特审单", width = 15)
+    private String materialLabel;
+    @Excel(name = "是否自查实名制合规", width = 20)
+    private String nameFindCompliance;
+    @Excel(name = "负责人", width = 15)
+    private String staffName;
+    @Excel(name = "负责人工号", width = 15)
+    private String staffNo;
+    @Excel(name = "复开时间", width = 15)
+    private String reopenTime;
+    @Excel(name = "关停标签", width = 20)
+    private String shutdownLabel;
+    @Excel(name = "系统实名制截图稽核结果", width = 20 , dicCode = "special_check_state")
+    private Integer nameFindComplianceState;
+    @Excel(name = "系统实名制截图稽核备注", width = 20)
+    private String nameFindComplianceNote;
+    @Excel(name = "特审单稽核结果", width = 20 , dicCode = "special_check_state")
+    private Integer specialReviewFormState;
+    @Excel(name = "特审单稽核备注", width = 20)
+    private String specialReviewFormNote;
+    /** 身份证照片/正反面 */
+    @Excel(name = "身份证照片稽核结果", width = 20 , dicCode = "special_check_state")
+    private Integer idCardState;
+    @Excel(name = "身份证照片稽核备注", width = 20)
+    private String idCardNote;
+    /** 手持证件半身照片 */
+    @Excel(name = "手持证件半身照片稽核结果", width = 20 , dicCode = "special_check_state")
+    private Integer handCertificateState;
+    @Excel(name = "手持证件半身照片稽核备注", width = 20)
+    private String handCertificateNote;
+    @Excel(name = "号卡稽核结果", width = 20 , dicCode = "special_check_state")
+    private Integer numberCardState;
+    @Excel(name = "号卡稽核备注", width = 20)
+    private String numberCardNote;
+    /** 防诈骗承诺函 */
+    @Excel(name = "防诈骗承诺函稽核结果", width = 20 , dicCode = "special_check_state")
+    private Integer letterCommitmentState;
+    @Excel(name = "防诈骗承诺函稽核备注", width = 20)
+    private String letterCommitmentNote;
+    /** 营业执照副本 */
+    @Excel(name = "营业执照副本稽核结果", width = 20 , dicCode = "special_check_state")
+    private Integer businessLicenseState;
+    @Excel(name = "营业执照副本稽核备注", width = 20)
+    private String businessLicenseNote;
+    /** 介绍信 */
+    @Excel(name = "介绍信稽核结果", width = 20 , dicCode = "special_check_state")
+    private Integer letterIntroductionState;
+    @Excel(name = "介绍信稽核备注", width = 20)
+    private String letterIntroductionNote;
+    @Excel(name = "使用人证件稽核结果", width = 20 , dicCode = "special_check_state")
+    private Integer userCertificateState;
+    @Excel(name = "使用人证件稽核备注", width = 20)
+    private String userCertificateNote;
+    /** 防诈骗承诺 */
+    @Excel(name = "防诈骗承诺稽核结果", width = 20 , dicCode = "special_check_state")
+    private Integer fraudPreventionState;
+    @Excel(name = "防诈骗承诺稽核备注", width = 20)
+    private String fraudPreventionNote;
+    /** 消费凭证 */
+    @Excel(name = "消费凭证稽核结果", width = 20 , dicCode = "special_check_state")
+    private Integer consumptionVoucherState;
+    @Excel(name = "消费凭证稽核备注", width = 20)
+    private String consumptionVoucherNote;
+
+
+    /** 稽核状态 0：未处理；1：未完善；2：待稽核；3：已整改；4：待整改；5：稽核通过； */
+    @Excel(name = "稽核状态", width = 15, dicCode = "sms_check_check_state")
+    @Dict(dicCode = "sms_check_check_state")
+    @ApiModelProperty(value = "稽核状态")
+    private Integer checkState;
+}

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

@@ -15,5 +15,7 @@ public interface SmcSpecialCheckLogService extends IService<SmcSpecialCheckLog>
      * @return
      * @throws IllegalAccessException
      */
-    Boolean reflectCheck(SmcSpecialCheckLogStateVo SmcSpecialCheckLogStateVo) throws IllegalAccessException;
+    Boolean reflectCheck(SmcSpecialCheckLogStateVo smcSpecialCheckLogStateVo) throws IllegalAccessException;
+
+    SmcSpecialCheckLogStateVo reflectCheckExcel(SmcSpecialCheckLogStateVo smcSpecialCheckLogStateVo) throws IllegalAccessException;
 }

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

@@ -39,4 +39,9 @@ public class SmcSpecialCheckLogServiceImpl extends ServiceImpl<SmcSpecialCheckLo
         return stateBoolean.get();
     }
 
+    @Override
+    public SmcSpecialCheckLogStateVo reflectCheckExcel(SmcSpecialCheckLogStateVo smcSpecialCheckLogStateVo) throws IllegalAccessException {
+        return null;
+    }
+
 }

tnc-system/src/main/java/org/jeecg/modules/quartz/job/CustomerCheckJob.java

@@ -3,19 +3,14 @@ package org.jeecg.modules.quartz.job;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.DateUtils;
-import org.jeecg.modules.smscheck.controller.SmsCheckCustomerDataController;
 import org.jeecg.modules.smscheck.entity.SmsCheckCinfoResult;
-import org.jeecg.modules.smscheck.entity.SmsCheckCustomerData;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfo;
 import org.jeecg.modules.smscheck.entity.SmsCheckTask;
 import org.jeecg.modules.smscheck.service.ISmsCheckCinfoResultService;
-import org.jeecg.modules.smscheck.service.ISmsCheckCustomerDataService;
 import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoService;
 import org.jeecg.modules.smscheck.service.ISmsCheckTaskService;
 import org.quartz.Job;