错误导出

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.base.controller.JeecgController;
@@ -14,11 +15,14 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.smscheck.entity.SmsCheckCustomerInfoError;
 import org.jeecg.modules.smscheck.entity.SmsCheckTask;
+import org.jeecg.modules.smscheck.entity.errorExcel.SmsCheckCustomerInfoShortError;
+import org.jeecg.modules.smscheck.entity.errorExcel.SmsCheckCustomerInfoTruckError;
 import org.jeecg.modules.smscheck.service.ISmsCheckCustomerInfoErrorService;
 import org.jeecg.modules.smscheck.service.ISmsCheckTaskService;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,6 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -38,6 +43,8 @@ public class SmsCheckCustomerInfoErrorController extends JeecgController<SmsChec
     @Value("${jeecg.path.upload}")
     private String upLoadPath;
     @Autowired
+    private ISmsCheckTaskService taskService;
+    @Autowired
     private ISmsCheckCustomerInfoErrorService smsCheckCustomerInfoErrorService;
     /**
      * 导出excel
@@ -47,6 +54,8 @@ public class SmsCheckCustomerInfoErrorController extends JeecgController<SmsChec
      * @return excel文件
      */
     @RequestMapping(value = "/exportXls")
+    @PermissionData(pageComponent = "smscheck/modules/TaskList")
+    @RequiresPermissions("taskImportTruck:excelError")
     public ModelAndView exportXlsError(HttpServletRequest request, SmsCheckCustomerInfoError smsCheckCustomerInfoError) {
         return  exportXl(request, smsCheckCustomerInfoError, SmsCheckCustomerInfoError.class, "经分导出错误数据");
     }
@@ -64,20 +73,42 @@ public class SmsCheckCustomerInfoErrorController extends JeecgController<SmsChec
             smsCheckCustomerInfoError.setDelFlag(1);
         }
         smsCheckCustomerInfoErrorService.saveOrUpdateBatch(exportList);
-        for (SmsCheckCustomerInfoError smsCheckCustomerInfoError : exportList) {
-            smsCheckCustomerInfoError.setNetworkAccessTime(smsCheckCustomerInfoError.getNetworkAccessTime().replace("-",""));
-        }
-         // Step.3 AutoPoi 导出Excel
+        SmsCheckTask smsCheckTask = taskService.getById(object.getTaskId());
+
+
+        // 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 + "报表", title);
         exportParams.setImageBasePath(upLoadPath);
-        //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
-        mv.addObject(NormalExcelConstants.PARAMS,exportParams);
-        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+        //1:行短稽核 2：物联网业务稽核 3.复开审批 4.中继线稽核',
+        if (smsCheckTask.getType().equals(1)){
+            List<SmsCheckCustomerInfoShortError>errorList =new ArrayList<>();
+            for (SmsCheckCustomerInfoError smsCheckCustomerInfoError : exportList) {
+                smsCheckCustomerInfoError.setNetworkAccessTime(smsCheckCustomerInfoError.getNetworkAccessTime().replace("-",""));
+                SmsCheckCustomerInfoShortError smsCheckCustomerInfoShortError =new SmsCheckCustomerInfoShortError();
+                BeanUtils.copyProperties(smsCheckCustomerInfoError,smsCheckCustomerInfoShortError);
+                errorList.add(smsCheckCustomerInfoShortError);
+            }
+            mv.addObject(NormalExcelConstants.CLASS, SmsCheckCustomerInfoShortError.class);
+            mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+            mv.addObject(NormalExcelConstants.DATA_LIST, errorList);
+        }
+        if (smsCheckTask.getType().equals(4)){
+            List<SmsCheckCustomerInfoTruckError>errorList =new ArrayList<>();
+            for (SmsCheckCustomerInfoError smsCheckCustomerInfoError : exportList) {
+                smsCheckCustomerInfoError.setNetworkAccessTime(smsCheckCustomerInfoError.getNetworkAccessTime().replace("-",""));
+                smsCheckCustomerInfoError.setFirstActivationDate(smsCheckCustomerInfoError.getNetworkAccessTime().replace("-",""));
+                SmsCheckCustomerInfoTruckError smsCheckCustomerInfoTruckError =new SmsCheckCustomerInfoTruckError();
+                BeanUtils.copyProperties(smsCheckCustomerInfoError,smsCheckCustomerInfoTruckError);
+                errorList.add(smsCheckCustomerInfoTruckError);
+            }
+            mv.addObject(NormalExcelConstants.CLASS, SmsCheckCustomerInfoTruckError.class);
+            mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+            mv.addObject(NormalExcelConstants.DATA_LIST, errorList);
+
+        }
         return mv;
     }
 }

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

@@ -404,6 +404,12 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
         DateTime accessTimeDate = DateUtil.parse(accessTime, "yyyyMMdd");
         vo.setNetworkAccessTime(accessTimeDate.toDateStr());
 
+        // 首次激活时间（固网起租时间）
+        String firstActivation = vo.getFirstActivationDate();
+        if (firstActivation!=null){
+            DateTime firstActivationDate = DateUtil.parse(firstActivation, "yyyyMMdd");
+            vo.setFirstActivationDate(firstActivationDate.toDateStr());
+        }
         //  员工工号
         String staffInfo = vo.getStaffInfo();
         vo.setStaffNo(staffInfo);

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

@@ -249,5 +249,19 @@ public class SmsCheckCustomerInfo implements Serializable {
     /**客户信息所属类型：1:行短稽核 2：物联网业务稽核 3.复开审批 4.中继线稽核*/
     @ApiModelProperty(value = "客户信息所属稽核")
     private Integer type;
+
+    @Excel(name = "首次激活时间（固网起租时间）", width = 15)
+    @ApiModelProperty(value = "首次激活时间")
+    private String firstActivationDate;
+    @Excel(name = "账户编码", width = 15)
+    @ApiModelProperty(value = "账户编码")
+    private String accountCode;
+    @Excel(name = "楼宇名称", width = 15)
+    @ApiModelProperty(value = "楼宇名称")
+    private String floorName;
+    @Excel(name = "楼宇编号", width = 15)
+    @ApiModelProperty(value = "楼宇编号")
+    private String floorCode;
+
 }
 

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

@@ -246,8 +246,24 @@ public class SmsCheckCustomerInfoError implements Serializable {
     @ApiModelProperty(value = "客户信息所属稽核")
     private Integer type;
 
+
+    @Excel(name = "首次激活时间（固网起租时间）", width = 15)
+    @ApiModelProperty(value = "首次激活时间")
+    private String firstActivationDate;
+    @Excel(name = "账户编码", width = 15)
+    @ApiModelProperty(value = "账户编码")
+    private String accountCode;
+    @Excel(name = "楼宇名称", width = 15)
+    @ApiModelProperty(value = "楼宇名称")
+    private String floorName;
+    @Excel(name = "楼宇编号", width = 15)
+    @ApiModelProperty(value = "楼宇编号")
+    private String floorCode;
     @Excel(name = "错误原因", width = 15)
     @ApiModelProperty(value = "错误原因")
     private String errorMsg;
+
+
+
 }
 

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

@@ -0,0 +1,258 @@
+package org.jeecg.modules.smscheck.entity.errorExcel;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="sms_check_customer_info_error对象", description="行短客户错误信息")
+public class SmsCheckCustomerInfoShortError implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    @ApiModelProperty(value = "资料id")
+    private String dataId;
+    @ApiModelProperty(value = "资料稽核判断id")
+    private String dataLogId;
+    /** 任务id */
+    @ApiModelProperty(value = "任务id")
+    private String taskId;
+    /** 客户编号 */
+    @Excel(name = "客户编号", width = 15)
+    @ApiModelProperty(value = "客户编号")
+    private String customerNo;
+    /** 客户名称 */
+    //@Excel(name = "客户名称", width = 15)
+    @ApiModelProperty(value = "客户名称")
+    private String customerName;
+    /** 服务号码（全） */
+    // @Excel(name = "服务号码（全）", width = 15)
+    @ApiModelProperty(value = "服务号码（全）")
+    private String smsNumber;
+    /** 用户编号 */
+    @Excel(name = "用户编号", width = 15)
+    @ApiModelProperty(value = "用户编号")
+    private String userNo;
+    /** 入网时间 */
+    @Excel(name = "入网时间", width = 15)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyyMMdd")
+    @DateTimeFormat(pattern="yyyyMMdd")
+    @ApiModelProperty(value = "入网时间")
+    private String networkAccessTime;
+    /** 用户状态 */
+    //@Excel(name = "用户状态", width = 15)
+    @ApiModelProperty(value = "用户状态")
+    private String userState;
+    /** 用户发展员工 */
+    @Excel(name = "用户发展员工", width = 15)
+    @ApiModelProperty(value = "用户发展员工")
+    private String staffInfo;
+    /** 员工姓名 */
+    // @Excel(name = "员工姓名", width = 15)
+    @ApiModelProperty(value = "员工姓名")
+    private String staffUsername;
+    /** 员工姓名 */
+    //@Excel(name = "员工姓名", width = 15)
+    @ApiModelProperty(value = "员工姓名")
+    private String staffName;
+    /** 员工编号 */
+    //@Excel(name = "员工姓名", width = 15)
+    @ApiModelProperty(value = "员工编号")
+    private String staffNo;
+    /** 用户发展二级部门 */
+    // @Excel(name = "用户发展二级部门", width = 15)
+    @ApiModelProperty(value = "用户发展二级部门")
+    private String staffDeptLevel2;
+    /** 员工二级部门 */
+    // @Excel(name = "员工二级部门", width = 15)
+    @ApiModelProperty(value = "员工二级部门")
+    private String staffDeptLevel2Name;
+    /** 员工二级部门编号 */
+    //   @Excel(name = "员工二级部门编号", width = 15)
+    @ApiModelProperty(value = "员工二级部门编号")
+    private String staffDeptLevel2No;
+    /** 用户发展三级部门 */
+    // @Excel(name = "用户发展三级部门", width = 15)
+    @ApiModelProperty(value = "用户发展三级部门")
+    private String staffDeptLevel3;
+    /** 员工三级部门 */
+    // @Excel(name = "员工三级部门", width = 15)
+    @ApiModelProperty(value = "员工三级部门")
+    private String staffDeptLevel3Name;
+    /** 员工三级部门编号 */
+    //@Excel(name = "员工三级部门编号", width = 15)
+    @ApiModelProperty(value = "员工三级部门编号")
+    private String staffDeptLevel3No;
+    /** 用户开通状态 (1：开通；2：拆机)*/
+    //@Excel(name = "用户开通状态", width = 15)
+    @ApiModelProperty(value = "用户开通状态")
+    private Integer userOpenState;
+    /** 码号 */
+    //@Excel(name = "码号", width = 15)
+    @ApiModelProperty(value = "码号")
+    private String smsNumberPrefix;
+    /** 号码详细用途 */
+    //@Excel(name = "号码详细用途", width = 15)
+    @ApiModelProperty(value = "号码详细用途")
+    private String smsNumberUsage;
+    /** 客户经理 */
+    //@Excel(name = "客户经理", width = 15)
+    @ApiModelProperty(value = "客户经理")
+    private String accountManager;
+    /** 客户经理手机号 */
+    //@Excel(name = "客户经理手机号", width = 15)
+    @ApiModelProperty(value = "客户经理手机号")
+    private String accountManagerPhone;
+    /** 码号使用单位联系人 */
+    //@Excel(name = "码号使用单位联系人", width = 15)
+    @ApiModelProperty(value = "码号使用单位联系人")
+    private String customerContacts;
+    /** 码号使用单位联系人手机号 */
+    // @Excel(name = "码号使用单位联系人手机号", width = 15)
+    @ApiModelProperty(value = "码号使用单位联系人手机号")
+    private String customerContactsPhone;
+    /** 合同到期时间（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")
+    @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")
+    @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")
+    @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")
+    @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)
+    @ApiModelProperty(value = "合同签署主体与实际开通客户是否一致")
+    private Integer contractOpenCustomerSame;
+    /** 是否有集团价格审批 */
+    //@Excel(name = "是否有集团价格审批", width = 15)
+    @ApiModelProperty(value = "是否有集团价格审批")
+    private Integer groupPriceApproval;
+    /** 资料是否完整 */
+    //@Excel(name = "资料是否完整", width = 15)
+    @ApiModelProperty(value = "资料是否完整")
+    private Integer dataComplete;
+    /** 是否完成整改 */
+    //@Excel(name = "是否完成整改", width = 15)
+    @ApiModelProperty(value = "是否完成整改")
+    private Integer rectifyReformOver;
+    /** 稽核状态 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;
+    /** 描述 */
+    //@Excel(name = "描述", width = 15)
+    @ApiModelProperty(value = "描述")
+    private String description;
+    /** 删除标识 */
+    // @Excel(name = "删除标识", width = 15)
+    @ApiModelProperty(value = "删除标识")
+    private Integer delFlag;
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /** 创建日期 */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /** 更新日期 */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+    /** 所属部门 */
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+
+    /**提交材料日期*/
+    // @Excel(name = "提交材料日期", width = 15)
+    @ApiModelProperty(value = "提交材料日期")
+    private String submitSpecialDate;
+
+    /**关停标签*/
+    // @Excel(name = "关停标签", width = 15)
+    @ApiModelProperty(value = "关停标签)")
+    private String shutdownLabel;
+
+    /**漫游被关停日期(ABM查询)*/
+    // @Excel(name = "漫游被关停日期(ABM查询)", width = 15)
+    @ApiModelProperty(value = "漫游被关停日期(ABM查询))")
+    private Date shutdownLabelDate;
+
+    /** 复开时间 */
+    // @Excel(name = "复开时间", width = 15)
+    @ApiModelProperty(value = "复开时间")
+    private Date reopenTime;
+
+    /** 有无特审单 */
+    //@Excel(name = "有无特审单", width = 15)
+    @ApiModelProperty(value = "有无特审单/签报")
+    private String materialLabel;
+
+    /** 有无特审单 */
+    // @Excel(name = "是否自查实名制合规", width = 15)
+    @ApiModelProperty(value = "是否自查实名制合规")
+    private String nameFindCompliance;
+
+    /**客户信息所属类型：1:行短稽核 2：物联网业务稽核 3.复开审批 4.中继线稽核*/
+    @ApiModelProperty(value = "客户信息所属稽核")
+    private Integer type;
+
+
+
+    @ApiModelProperty(value = "首次激活时间")
+    private String firstActivationDate;
+    @ApiModelProperty(value = "账户编码")
+    private String accountCode;
+    @ApiModelProperty(value = "楼宇名称")
+    private String floorName;
+    @ApiModelProperty(value = "楼宇编号")
+    private String floorCode;
+    @Excel(name = "错误原因", width = 15)
+    @ApiModelProperty(value = "错误原因")
+    private String errorMsg;
+}
+

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

@@ -0,0 +1,266 @@
+package org.jeecg.modules.smscheck.entity.errorExcel;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * syze
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="sms_check_customer_info_error对象", description="行短客户错误信息")
+public class SmsCheckCustomerInfoTruckError implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/** 主键 */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    @ApiModelProperty(value = "资料id")
+    private String dataId;
+    @ApiModelProperty(value = "资料稽核判断id")
+    private String dataLogId;
+	/** 任务id */
+    @ApiModelProperty(value = "任务id")
+    private String taskId;
+	/** 客户编号 */
+    @Excel(name = "客户编号", width = 15)
+    @ApiModelProperty(value = "客户编号")
+    private String customerNo;
+	/** 客户名称 */
+    //@Excel(name = "客户名称", width = 15)
+    @ApiModelProperty(value = "客户名称")
+    private String customerName;
+	/** 服务号码（全） */
+   // @Excel(name = "服务号码（全）", width = 15)
+    @ApiModelProperty(value = "服务号码（全）")
+    private String smsNumber;
+	/** 用户编号 */
+    @Excel(name = "用户编号", width = 15)
+    @ApiModelProperty(value = "用户编号")
+    private String userNo;
+	/** 入网时间 */
+    @Excel(name = "入网时间", width = 15)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyyMMdd")
+    @DateTimeFormat(pattern="yyyyMMdd")
+    @ApiModelProperty(value = "入网时间")
+    private String networkAccessTime;
+	/** 用户状态 */
+    //@Excel(name = "用户状态", width = 15)
+    @ApiModelProperty(value = "用户状态")
+    private String userState;
+	/** 用户发展员工 */
+    @Excel(name = "用户发展员工", width = 15)
+    @ApiModelProperty(value = "用户发展员工")
+    private String staffInfo;
+    /** 员工姓名 */
+   // @Excel(name = "员工姓名", width = 15)
+    @ApiModelProperty(value = "员工姓名")
+    private String staffUsername;
+    /** 员工姓名 */
+    //@Excel(name = "员工姓名", width = 15)
+    @ApiModelProperty(value = "员工姓名")
+    private String staffName;
+    /** 员工编号 */
+    //@Excel(name = "员工姓名", width = 15)
+    @ApiModelProperty(value = "员工编号")
+    private String staffNo;
+	/** 用户发展二级部门 */
+   // @Excel(name = "用户发展二级部门", width = 15)
+    @ApiModelProperty(value = "用户发展二级部门")
+    private String staffDeptLevel2;
+    /** 员工二级部门 */
+   // @Excel(name = "员工二级部门", width = 15)
+    @ApiModelProperty(value = "员工二级部门")
+    private String staffDeptLevel2Name;
+    /** 员工二级部门编号 */
+ //   @Excel(name = "员工二级部门编号", width = 15)
+    @ApiModelProperty(value = "员工二级部门编号")
+    private String staffDeptLevel2No;
+	/** 用户发展三级部门 */
+   // @Excel(name = "用户发展三级部门", width = 15)
+    @ApiModelProperty(value = "用户发展三级部门")
+    private String staffDeptLevel3;
+    /** 员工三级部门 */
+   // @Excel(name = "员工三级部门", width = 15)
+    @ApiModelProperty(value = "员工三级部门")
+    private String staffDeptLevel3Name;
+    /** 员工三级部门编号 */
+    //@Excel(name = "员工三级部门编号", width = 15)
+    @ApiModelProperty(value = "员工三级部门编号")
+    private String staffDeptLevel3No;
+	/** 用户开通状态 (1：开通；2：拆机)*/
+    //@Excel(name = "用户开通状态", width = 15)
+    @ApiModelProperty(value = "用户开通状态")
+    private Integer userOpenState;
+	/** 码号 */
+    //@Excel(name = "码号", width = 15)
+    @ApiModelProperty(value = "码号")
+    private String smsNumberPrefix;
+	/** 号码详细用途 */
+    //@Excel(name = "号码详细用途", width = 15)
+    @ApiModelProperty(value = "号码详细用途")
+    private String smsNumberUsage;
+	/** 客户经理 */
+    //@Excel(name = "客户经理", width = 15)
+    @ApiModelProperty(value = "客户经理")
+    private String accountManager;
+	/** 客户经理手机号 */
+    //@Excel(name = "客户经理手机号", width = 15)
+    @ApiModelProperty(value = "客户经理手机号")
+    private String accountManagerPhone;
+	/** 码号使用单位联系人 */
+    //@Excel(name = "码号使用单位联系人", width = 15)
+    @ApiModelProperty(value = "码号使用单位联系人")
+    private String customerContacts;
+	/** 码号使用单位联系人手机号 */
+   // @Excel(name = "码号使用单位联系人手机号", width = 15)
+    @ApiModelProperty(value = "码号使用单位联系人手机号")
+    private String customerContactsPhone;
+	/** 合同到期时间（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")
+    @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")
+    @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")
+    @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")
+    @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)
+    @ApiModelProperty(value = "合同签署主体与实际开通客户是否一致")
+    private Integer contractOpenCustomerSame;
+	/** 是否有集团价格审批 */
+    //@Excel(name = "是否有集团价格审批", width = 15)
+    @ApiModelProperty(value = "是否有集团价格审批")
+    private Integer groupPriceApproval;
+	/** 资料是否完整 */
+    //@Excel(name = "资料是否完整", width = 15)
+    @ApiModelProperty(value = "资料是否完整")
+    private Integer dataComplete;
+	/** 是否完成整改 */
+    //@Excel(name = "是否完成整改", width = 15)
+    @ApiModelProperty(value = "是否完成整改")
+    private Integer rectifyReformOver;
+    /** 稽核状态 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;
+	/** 描述 */
+    //@Excel(name = "描述", width = 15)
+    @ApiModelProperty(value = "描述")
+    private String description;
+	/** 删除标识 */
+   // @Excel(name = "删除标识", width = 15)
+    @ApiModelProperty(value = "删除标识")
+    private Integer delFlag;
+	/** 创建人 */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/** 创建日期 */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/** 更新人 */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/** 更新日期 */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+	/** 所属部门 */
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+
+    /**提交材料日期*/
+   // @Excel(name = "提交材料日期", width = 15)
+    @ApiModelProperty(value = "提交材料日期")
+    private String submitSpecialDate;
+
+    /**关停标签*/
+   // @Excel(name = "关停标签", width = 15)
+    @ApiModelProperty(value = "关停标签)")
+    private String shutdownLabel;
+
+    /**漫游被关停日期(ABM查询)*/
+   // @Excel(name = "漫游被关停日期(ABM查询)", width = 15)
+    @ApiModelProperty(value = "漫游被关停日期(ABM查询))")
+    private Date shutdownLabelDate;
+
+    /** 复开时间 */
+   // @Excel(name = "复开时间", width = 15)
+    @ApiModelProperty(value = "复开时间")
+    private Date reopenTime;
+
+    /** 有无特审单 */
+    //@Excel(name = "有无特审单", width = 15)
+    @ApiModelProperty(value = "有无特审单/签报")
+    private String materialLabel;
+
+    /** 有无特审单 */
+   // @Excel(name = "是否自查实名制合规", width = 15)
+    @ApiModelProperty(value = "是否自查实名制合规")
+    private String nameFindCompliance;
+
+    /**客户信息所属类型：1:行短稽核 2：物联网业务稽核 3.复开审批 4.中继线稽核*/
+    @ApiModelProperty(value = "客户信息所属稽核")
+    private Integer type;
+
+
+    @Excel(name = "首次激活时间（固网起租时间）", width = 15)
+    @ApiModelProperty(value = "首次激活时间")
+    private String firstActivationDate;
+    @Excel(name = "账户编码", width = 15)
+    @ApiModelProperty(value = "账户编码")
+    private String accountCode;
+    @Excel(name = "楼宇名称", width = 15)
+    @ApiModelProperty(value = "楼宇名称")
+    private String floorName;
+    @Excel(name = "楼宇编号", width = 15)
+    @ApiModelProperty(value = "楼宇编号")
+    private String floorCode;
+    @Excel(name = "错误原因", width = 15)
+    @ApiModelProperty(value = "错误原因")
+    private String errorMsg;
+
+}
+

tnc-sms/src/main/java/org/jeecg/modules/smscheck/vo/SmsCheckCustomerInfoVo.java

@@ -107,5 +107,18 @@ public class SmsCheckCustomerInfoVo implements Serializable {
     @ApiModelProperty(value = "稽核进度")
     private String checkState;
 
+    @Excel(name = "首次激活时间（固网起租时间）", width = 15)
+    @ApiModelProperty(value = "首次激活时间")
+    private String firstActivationDate;
+    @Excel(name = "账户编码", width = 15)
+    @ApiModelProperty(value = "账户编码")
+    private String accountCode;
+    @Excel(name = "楼宇名称", width = 15)
+    @ApiModelProperty(value = "楼宇名称")
+    private String floorName;
+    @Excel(name = "楼宇编号", width = 15)
+    @ApiModelProperty(value = "楼宇编号")
+    private String floorCode;
+
 }