导出

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.dto.message.MessageDTO;
@@ -34,6 +35,7 @@ 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.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -41,6 +43,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.InvocationTargetException;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -54,13 +57,19 @@ import java.util.stream.Collectors;
 @RequestMapping("/smsCheck/customerInfo")
 @Slf4j
 public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCustomerInfo, ISmsCheckCustomerInfoService> {
+    @Value("${jeecg.path.upload}")
+    private String upLoadPath;
     @Autowired
     private ISmsCheckCustomerInfoService customerInfoService;
+    @Autowired
+    private ISmsCheckCustomerDataService customerDataService;
     @Autowired
 	private ISmsCheckWorkLogService workLogService;
     @Autowired
     private ISmsCheckCustomerInfoLogService infoLogService;
     @Autowired
+    private ISmsCheckCustomerDataLogService logService;
+    @Autowired
     private ISmsCheckTaskService taskService;
     @Autowired
     private ISysBaseAPI sysBaseAPI;
@@ -287,41 +296,204 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     @RequestMapping(value = "/exportXls")
     @PermissionData(pageComponent = "smscheck/modules/TaskCheckList")
     public ModelAndView exportXls(HttpServletRequest request, SmsCheckCustomerInfo smsCheckCustomerInfo) {
-        return  exportXls(request, smsCheckCustomerInfo, SmsCheckCustomerInfo.class, "客户信息");
+        return  exportXls(request, smsCheckCustomerInfo, SmsCheckCustomerDataAndLog.class, "客户信息");
     }
 
 
-//    protected ModelAndView exportXls(HttpServletRequest request, T object, Class<T> clazz, String title) {
-//        // Step.1 组装查询条件
-//        QueryWrapper<T> queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap());
-//        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-//
-//        // Step.2 获取导出数据
-//        List<T> pageList = service.list(queryWrapper);
-//        List<T> 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;
-//        }
-//
-//        // 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;
-//    }
+    protected ModelAndView exportXls(HttpServletRequest request, SmsCheckCustomerInfo object, Class<SmsCheckCustomerDataAndLog> 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<SmsCheckCustomerDataLog> logList = logService.list();
+
+        Map<String, SmsCheckCustomerDataLog> logMap
+                = logList.stream().collect(Collectors.toMap(v->v.getInfoId(), Function.identity(), (o, n) -> o));
+
+
+        List<SmsCheckCustomerData> dataList = customerDataService.list();
+        Map<String, SmsCheckCustomerData> dataMap
+                = dataList.stream().collect(Collectors.toMap(v->v.getInfoId(), Function.identity(), (o, n) -> o));
+
+        List<SmsCheckCustomerDataAndLog> pageList = new ArrayList<>();
+        for (SmsCheckCustomerInfo smsCheckCustomerInfo : infoList) {
+
+                SmsCheckCustomerDataLog smsCheckCustomerInfoLog = logMap.get(smsCheckCustomerInfo.getId());
+                SmsCheckCustomerData smsCheckCustomerData = dataMap.get(smsCheckCustomerInfo.getId());
+                SmsCheckCustomerDataAndLog smsCheckCustomerDataAndLog = new SmsCheckCustomerDataAndLog();
+                BeanUtil.copyProperties(smsCheckCustomerInfo,smsCheckCustomerDataAndLog);
+                BeanUtil.copyProperties(smsCheckCustomerInfoLog,smsCheckCustomerDataAndLog);
+                BeanUtil.copyProperties(smsCheckCustomerData,smsCheckCustomerDataAndLog);
+                //以dataid代替id
+                smsCheckCustomerDataAndLog.setDataId(smsCheckCustomerInfo.getId());
+                pageList.add(smsCheckCustomerDataAndLog);
+
+
+        }
+
+        List<SmsCheckCustomerDataAndLog> 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  List<SmsCheckCustomerDataAndLog> dataToResult(List<SmsCheckCustomerDataAndLog> exportList ){
+
+        for (SmsCheckCustomerDataAndLog smsCheckCustomerDataAndLog : exportList) {
+            //合同到期时间
+            if (StringUtils.isBlank(smsCheckCustomerDataAndLog.getContractDateDate())  ){
+                if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getContractDateDateIs())&& smsCheckCustomerDataAndLog.getContractDateDateIs().equals("1"))
+                smsCheckCustomerDataAndLog.setContractDateDate("长期");
+            }
+            //营业执照到期时间
+            if (StringUtils.isBlank(smsCheckCustomerDataAndLog.getBusinessLicenseDateDate())  ){
+                if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getBusinessLicenseDateDateIs())&& smsCheckCustomerDataAndLog.getBusinessLicenseDateDateIs().equals("1"))
+                    smsCheckCustomerDataAndLog.setBusinessLicenseDateDate("长期");
+            }
+            //码号证书到期时间
+            if (StringUtils.isBlank(smsCheckCustomerDataAndLog.getCodeNumberDateDate())  ){
+                if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getCodeNumberDateDateIs())&& smsCheckCustomerDataAndLog.getCodeNumberDateDateIs().equals("1"))
+                    smsCheckCustomerDataAndLog.setCodeNumberDateDate("长期");
+            }
+            //备案通知到期时间
+            if (StringUtils.isBlank(smsCheckCustomerDataAndLog.getFilingsDateDate())  ){
+                if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getFilingsDateDateIs())&& smsCheckCustomerDataAndLog.getFilingsDateDateIs().equals("1"))
+                    smsCheckCustomerDataAndLog.setFilingsDateDate("长期");
+            }
+            //是否为CSP商
+            if (smsCheckCustomerDataAndLog.getIsCsp()!=null &&smsCheckCustomerDataAndLog.getIsCsp().equals("1")){
+                smsCheckCustomerDataAndLog.setIsCsp("是");
+            }else {
+                smsCheckCustomerDataAndLog.setIsCsp("否");
+            }
+            //码号证书营业执照合同签约方主体是否一致
+            if (smsCheckCustomerDataAndLog.getCodeNumberBusinessLicense()!=null &&smsCheckCustomerDataAndLog.getCodeNumberBusinessLicense().equals("1")){
+                smsCheckCustomerDataAndLog.setCodeNumberBusinessLicense("是");
+            }else {
+                smsCheckCustomerDataAndLog.setCodeNumberBusinessLicense("否");
+            }
+            //签约号码与证书下发码号是否一致
+            if (smsCheckCustomerDataAndLog.getIsSigningNumber()!=null &&smsCheckCustomerDataAndLog.getIsSigningNumber().equals("1")){
+                smsCheckCustomerDataAndLog.setIsSigningNumber("是");
+            }else {
+                smsCheckCustomerDataAndLog.setIsSigningNumber("否");
+            }
+            //是否有法人/责任人证件
+            if (smsCheckCustomerDataAndLog.getCorporationCard()!=null &&!smsCheckCustomerDataAndLog.getCorporationCard().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setCorporationCard("有");
+            }else {
+                smsCheckCustomerDataAndLog.setCorporationCard("无");
+            }
+            //是否有责任人授权书证件
+            if (smsCheckCustomerDataAndLog.getPersonResponsible()!=null &&!smsCheckCustomerDataAndLog.getPersonResponsible().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setPersonResponsible("有");
+            }else {
+                smsCheckCustomerDataAndLog.setPersonResponsible("无");
+            }
+            //是否有经办人证件
+            if (smsCheckCustomerDataAndLog.getOperatorCard()!=null &&!smsCheckCustomerDataAndLog.getOperatorCard().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setOperatorCard("有");
+            }else {
+                smsCheckCustomerDataAndLog.setOperatorCard("无");
+            }
+            //是否有经办人证件
+            if (smsCheckCustomerDataAndLog.getOperatorCardPhone()!=null &&!smsCheckCustomerDataAndLog.getOperatorCardPhone().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setOperatorCardPhone("有");
+            }else {
+                smsCheckCustomerDataAndLog.setOperatorCardPhone("无");
+            }
+            //是否有机房设备照片
+            if (smsCheckCustomerDataAndLog.getDevicePhone()!=null &&!smsCheckCustomerDataAndLog.getDevicePhone().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setDevicePhone("有");
+            }else {
+                smsCheckCustomerDataAndLog.setDevicePhone("无");
+            }
+            //是否有短信模板
+            if (smsCheckCustomerDataAndLog.getTextMessage()!=null &&!smsCheckCustomerDataAndLog.getTextMessage().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setTextMessage("有");
+            }else {
+                smsCheckCustomerDataAndLog.setTextMessage("无");
+            }
+            //是否有端口类短信业务责任承诺书
+            if (smsCheckCustomerDataAndLog.getTextMessageBook()!=null &&!smsCheckCustomerDataAndLog.getTextMessageBook().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setTextMessageBook("有");
+            }else {
+                smsCheckCustomerDataAndLog.setTextMessageBook("无");
+            }
+            //是否有信息安全责任承诺书
+            if (smsCheckCustomerDataAndLog.getSecureBook()!=null &&!smsCheckCustomerDataAndLog.getSecureBook().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setSecureBook("有");
+            }else {
+                smsCheckCustomerDataAndLog.setSecureBook("无");
+            }
+            //是否有特殊资费审批（标准资费无需提供）
+            if (smsCheckCustomerDataAndLog.getSpecial()!=null &&!smsCheckCustomerDataAndLog.getSpecial().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setSpecial("有");
+            }else {
+                smsCheckCustomerDataAndLog.setSpecial("无");
+            }
+            //是否有入网签报
+            if (smsCheckCustomerDataAndLog.getNetworkAccess()!=null &&!smsCheckCustomerDataAndLog.getNetworkAccess().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setNetworkAccess("有");
+            }else {
+                smsCheckCustomerDataAndLog.setNetworkAccess("无");
+            }
+            //是否有集团价格审批
+            if (smsCheckCustomerDataAndLog.getGroupPriceApproval()!=null &&!smsCheckCustomerDataAndLog.getGroupPriceApproval().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setGroupPriceApproval("有");
+            }else {
+                smsCheckCustomerDataAndLog.setGroupPriceApproval("无");
+            }
+            //资料是否完整
+            if (smsCheckCustomerDataAndLog.getIsAll()!=null &&smsCheckCustomerDataAndLog.getIsAll().equals("1")){
+                smsCheckCustomerDataAndLog.setIsAll("是");
+            }else {
+                smsCheckCustomerDataAndLog.setIsAll("否");
+            }
+            //是否完成整改
+            if (smsCheckCustomerDataAndLog.getIsComplete()!=null &&smsCheckCustomerDataAndLog.getIsComplete().equals("1")){
+                smsCheckCustomerDataAndLog.setIsComplete("是");
+            }else {
+                smsCheckCustomerDataAndLog.setIsComplete("否");
+            }
+        }
+        return exportList;
+
+    }
+
+
+    private String getId(SmsCheckCustomerDataAndLog item) {
+        try {
+            return PropertyUtils.getProperty(item, "dataId").toString();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
     /**
      * 通过excel导入数据
      *

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 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;
 
@@ -18,128 +19,252 @@ public class SmsCheckCustomerDataAndLog  {
     private String dataId;
 
     /** 客户id */
-    @Excel(name = "客户id", width = 15)
+    //@Excel(name = "客户id", width = 15)
     @ApiModelProperty(value = "客户id")
     private String infoId;
 
+    @Excel(name = "客户编号", width = 15)
+    @ApiModelProperty(value = "客户id")
+    private String customerNo;
+
     @Excel(name = "用户编号", width = 15)
     @ApiModelProperty(value = "用户编号")
     private String userNo;
-    @ApiModelProperty(value = "基本信息稽核")
+    /** 入网时间 */
+    @Excel(name = "入网时间", width = 15)
+    @ApiModelProperty(value = "入网时间")
+    private String networkAccessTime;
+//    /** 用户发展员工 */
+//    @Excel(name = "用户发展员工", width = 15)
+//    @ApiModelProperty(value = "用户发展员工")
+//    private String staffInfo;
+    /** 员工编号 */
+    @Excel(name = "用户发展员工", width = 15)
+    @ApiModelProperty(value = "用户发展员工")
+    private String staffNo;
+    @ApiModelProperty(value = "基础信息稽核")
     private String infoResult;
-    @ApiModelProperty(value = "基本信息稽核结果备注")
+
+    @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 infoResultRemark;
     /** 员工id */
-    @Excel(name = "员工id", width = 15)
+    //@Excel(name = "员工id", width = 15)
     @ApiModelProperty(value = "员工id")
     private String staffId;
-    /** 员工编号 */
-    @Excel(name = "员工编号", width = 15)
-    @ApiModelProperty(value = "员工编号")
-    private String staffNo;
-    /** 创建人 */
-    @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 userState;
+    @Excel(name = "码号（接入开通码号95/96/10/11/12/106/400（不含拓展位长））", width = 25)
+    @ApiModelProperty(value = " 码号")
+    private String codeNumber;
+    @Excel(name = "号码详细用途", width = 15)
+    @ApiModelProperty(value = " 号码详细用途")
+    private String numberUse;
+    @Excel(name = "客户经理手机号", width = 15)
+    @ApiModelProperty(value = " 客户经理手机号")
+    private String managePhone;
+    @Excel(name = "码号使用单位联系人（业务合同码号使用单位联系人姓名）", width = 15)
+    @ApiModelProperty(value = " 码号使用单位联系人手机号")
+    private String codeNumberContactPhone;
 
+    @Excel(name = "合同到期时间", width = 15)
+    @ApiModelProperty(value = " 合同到期时间是否")
+    private String contractDateDate;
+    @ApiModelProperty(value = " 合同到期时间是否长期")
+    private String contractDateDateIs;
 
-    @ApiModelProperty(value = "合同到期时间资料")
-    private String contractDate;
+    @Excel(name = "营业执照到期时间", width = 15)
+    @ApiModelProperty(value = " 营业执照到期时间")
+    private String businessLicenseDateDate;
+    @ApiModelProperty(value = " 营业执照到期时间是否长期")
+    private String businessLicenseDateDateIs;
 
+    @Excel(name = "码号证书到期时间", width = 15)
+    @ApiModelProperty(value = " 码号证书到期时间")
+    private String codeNumberDateDate;
+    @ApiModelProperty(value = " 码号证书到期时间是否长期")
+    private String codeNumberDateDateIs;
 
-    @ApiModelProperty(value = " 营业执照到期时间资料")
-    private String businessLicenseDate;
+    @Excel(name = "备案通知到期时间", width = 15)
+    @ApiModelProperty(value = " 备案通知到期时间")
+    private String filingsDateDate;
+    @ApiModelProperty(value = " 备案通知到期时间是否长期")
+    private String filingsDateDateIs;
 
 
-    @ApiModelProperty(value = " 码号证书到期时间资料")
-    private String codeNumberDate;
 
+    @ApiModelProperty(value = "合同到期时间结果")
+    private String  contractDateResult;
+    @Excel(name = "合同资料稽核备注", width = 15)
+    @ApiModelProperty(value = "合同到期时间结果备注")
+    private String contractDateResultRemark;
 
-    @ApiModelProperty(value = " 备案通知到期时间资料")
-    private String filingsDate;
+    @ApiModelProperty(value = "营业执照到期时间结果")
+    private String businessLicenseDateResult;
+    @Excel(name = "营业执照稽核结果备注", width = 15)
+    @ApiModelProperty(value = "营业执照到期时间结果备注")
+    private String businessLicenseDateResultRemark;
+
+    @ApiModelProperty(value = "码号证书到期时间结果")
+    private String codeNumberDateResult;
+    @Excel(name = "码号证书稽核结果备注", width = 15)
+    @ApiModelProperty(value = "码号证书到期时间结果备注")
+    private String codeNumberDateResultRemark;
+
+    @ApiModelProperty(value = "备案通知到期时间结果备注")
+    private String filingsDateResultRemark;
+    @Excel(name = "备案通知稽核结果备注", width = 15)
+    @ApiModelProperty(value = "备案通知到期时间结果")
+    private String filingsDateResult;
+
+    @Excel(name = "是否为CSP商", width = 15)
+    @ApiModelProperty(value = " 是否为CSP商")
+    private String isCsp;
 
-    @ApiModelProperty(value = " 增值业务许可证到期时间资料")
-    private String permitDate;
 
+    @Excel(name = "增值业务许可证资料稽核备注", width = 15)
+    @ApiModelProperty(value = "增值业务许可证到期时间结果备注")
+    private String permitDateResultRemark;
+    @ApiModelProperty(value = "增值业务许可证到期时间结果")
+    private String permitDateResult;
+
+    @Excel(name = "增值业务许可证到期时间", width = 15)
+    @ApiModelProperty(value = " 增值业务许可证到期时间是否")
+    private String permitDateDate;
+    @ApiModelProperty(value = " 增值业务许可证到期时间是否长期")
+    private String permitDateDateIs;
+
+    @Excel(name = "码号证书营业执照合同签约方主体是否一致", width = 15)
+    @ApiModelProperty(value = " 码号证书营业执照合同签约方主体是否一致")
+    private String codeNumberBusinessLicense;
+
+    @Excel(name = "签约号码与证书下发码号是否一致", width = 15)
+    @ApiModelProperty(value = " 签约号码与证书下发码号是否一致")
+    private String isSigningNumber;
+
+    @Excel(name = "是否有法人/责任人证件", width = 15)
     @ApiModelProperty(value = " 法人/责任人证件")
     private String corporationCard;
 
+    @ApiModelProperty(value = "是否有法人/责任人证件稽核备注")
+    private String corporationCardResult;
+    @Excel(name = "法人/责任人证件 稽核备注", width = 15)
+    @ApiModelProperty(value = "法人/责任人证件结果备注")
+    private String corporationCardResultRemark;
+
+    @Excel(name = "是否有责任人授权书证件", width = 15)
     @ApiModelProperty(value = " 责任人授权书")
     private String personResponsible;
+    @Excel(name = "责任人授权书证件 稽核备注", width = 15)
+    @ApiModelProperty(value = "责任人授权书结果备注")
+    private String personResponsibleResultRemark;
+    @ApiModelProperty(value = "责任人授权书结果")
+    private String personResponsibleResult;
 
+    @Excel(name = "是否有经办人证件", width = 15)
     @ApiModelProperty(value = " 经办人证件")
     private String operatorCard;
+    @ApiModelProperty(value = "经办人证件结果")
+    private String operatorCardResult;
+    @Excel(name = "经办人证件稽核备注", width = 15)
+    @ApiModelProperty(value = "经办人证件结果备注")
+    private String operatorCardResultRemark;
 
+
+    @Excel(name = "是否有经办人手持身份证照片（背景需为电信营业厅或白墙）", width = 15)
     @ApiModelProperty(value = " 经办人手持身份证照片（背景需为电信营业厅或白墙）")
     private String operatorCardPhone;
+    @Excel(name = "经办人手持身份证照片稽核备注", width = 15)
+    @ApiModelProperty(value = "经办人手持身份证照片结果备注")
+    private String operatorCardPhoneResultRemark;
+    @ApiModelProperty(value = "经办人手持身份证照片结果")
+    private String operatorCardPhoneResult;
+
+
 
+    @Excel(name = "是否有机房设备照片", width = 15)
     @ApiModelProperty(value = " 机房设备照片")
     private String devicePhone;
+    @ApiModelProperty(value = "机房设备照片结果")
+    private String devicePhoneResult;
+    @Excel(name = "机房设备照片稽核备注", width = 15)
+    @ApiModelProperty(value = "是否有机房设备照片稽核备注")
+    private String devicePhoneResultRemark;
 
+
+    @Excel(name = "是否有短信模板", width = 15)
     @ApiModelProperty(value = " 短信模板")
     private String textMessage;
+    @ApiModelProperty(value = "短信模板结果")
+    private String textMessageResult;
+    @Excel(name = "是否有短信模板", width = 15)
+    @ApiModelProperty(value = " 短信模板稽核备注")
+    private String textMessageResultRemark;
 
-
+    @Excel(name = "是否有端口类短信业务责任承诺书", width = 15)
     @ApiModelProperty(value = " 端口类短信业务责任承诺书")
     private String textMessageBook;
+    @ApiModelProperty(value = "端口类短信业务责任承诺书结果")
+    private String textMessageBookResult;
+    @Excel(name = " 端口类短信业务责任承诺书稽核备注", width = 15)
+    @ApiModelProperty(value = "是否有端口类短信业务责任承诺书稽核备注")
+    private String textMessageBookResultRemark;
+
 
+    @Excel(name = "是否有信息安全责任承诺书", width = 15)
     @ApiModelProperty(value = " 信息安全责任承诺书")
     private String secureBook;
 
+
+    @ApiModelProperty(value = "信息安全责任承诺书结果")
+    private String secureBookResult;
+    @Excel(name = "信息安全责任承诺书稽核备注", width = 15)
+    @ApiModelProperty(value = "是否有信息安全责任承诺书稽核备注")
+    private String secureBookResultRemark;
+
+    @Excel(name = "是否有特殊资费审批（标准资费无需提供）", width = 15)
     @ApiModelProperty(value = " 特殊资费审批（标准资费无需提供）")
     private String special;
 
+    @ApiModelProperty(value = "特殊资费审批结果")
+    private String specialResult;
+    @Excel(name = "特殊资费审批结果备注", width = 15)
+    @ApiModelProperty(value = "特殊资费审批结果备注")
+    private String specialResultRemark;
+
+
+    @Excel(name = "是否有入网签报", width = 15)
     @ApiModelProperty(value = " 入网签报")
     private String networkAccess;
+    @ApiModelProperty(value = "入网签报结果")
+    private String networkAccessResult;
+    @Excel(name = "入网签报稽核备注", width = 15)
+    @ApiModelProperty(value = "入网签报结果备注")
+    private String networkAccessResultRemark;
+
 
+    @Excel(name = "是否有集团价格审批", width = 15)
     @ApiModelProperty(value = " 集团价格审批")
     private String groupPriceApproval;
-
-    @ApiModelProperty(value = " 码号")
-    private String codeNumber;
-
-    @ApiModelProperty(value = " 客户名称(全)")
-    private String customerName;
-
-    @ApiModelProperty(value = " 号码详细用途")
-    private String numberUse;
-
-    @ApiModelProperty(value = " 客户经理手机号")
-    private String managePhone;
-
-    @ApiModelProperty(value = " 码号使用单位联系人手机号")
-    private String codeNumberContactPhone;
-
-    @ApiModelProperty(value = " 是否为CSP商")
-    private String isCsp;
-
-
-    @ApiModelProperty(value = " 码号证书营业执照合同签约方主体是否一致")
-    private String codeNumberBusinessLicense;
-
-    @ApiModelProperty(value = " 签约号码与证书下发码号是否一致")
-    private String isSigningNumber;
-
+    @ApiModelProperty(value = "集团价格审批结果")
+    private String groupPriceApprovalResult;
+    @Excel(name = " 集团价格审批稽核备注", width = 15)
+    @ApiModelProperty(value = "集团价格审批结果备注")
+    private String groupPriceApprovalResultRemark;
+    @Excel(name = "资料是否完整", width = 15)
     @ApiModelProperty(value = " 资料是否完整")
     private String isAll;
-
+    @Excel(name = "是否完成整改", width = 15)
     @ApiModelProperty(value = " 是否完成整改")
     private String isComplete;
+
+
     @ApiModelProperty(value = "合同到期时间资料备注")
     private String contractDateRemark;
 
@@ -155,9 +280,70 @@ public class SmsCheckCustomerDataAndLog  {
     @ApiModelProperty(value = " 备案通知到期时间资料备注")
     private String filingsDateRemark;
 
+
+
+
+
     @ApiModelProperty(value = " 增值业务许可证到期时间资料备注")
     private String permitDateRemark;
 
+
+
+    /** 创建人 */
+    @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;
+
+
+    @ApiModelProperty(value = "合同到期时间资料")
+    private String contractDate;
+
+
+    @ApiModelProperty(value = " 营业执照到期时间资料")
+    private String businessLicenseDate;
+
+
+    @ApiModelProperty(value = " 码号证书到期时间资料")
+    private String codeNumberDate;
+
+
+    @ApiModelProperty(value = " 备案通知到期时间资料")
+    private String filingsDate;
+
+    @ApiModelProperty(value = " 增值业务许可证到期时间资料")
+    private String permitDate;
+
+
+
+
+
+
+
+    @ApiModelProperty(value = " 客户名称(全)")
+    private String customerName;
+
+
+
+
+
+
+
+
     @ApiModelProperty(value = " 法人/责任人证件备注")
     private String corporationCardRemark;
 
@@ -193,104 +379,24 @@ public class SmsCheckCustomerDataAndLog  {
     private String groupPriceApprovalRemark;
 
 
-    private String  contractDateResult;
-    @ApiModelProperty(value = "合同到期时间结果备注")
-    private String contractDateResultRemark;
 
-    @ApiModelProperty(value = "营业执照到期时间结果")
-    private String businessLicenseDateResult;
-    @ApiModelProperty(value = "营业执照到期时间结果备注")
-    private String businessLicenseDateResultRemark;
 
-    @ApiModelProperty(value = "码号证书到期时间结果")
-    private String codeNumberDateResult;
-    @ApiModelProperty(value = "码号证书到期时间结果备注")
-    private String codeNumberDateResultRemark;
 
-    @ApiModelProperty(value = "备案通知到期时间结果备注")
-    private String filingsDateResultRemark;
-    @ApiModelProperty(value = "备案通知到期时间结果")
-    private String filingsDateResult;
 
-    @ApiModelProperty(value = "增值业务许可证到期时间结果备注")
-    private String permitDateResultRemark;
-    @ApiModelProperty(value = "增值业务许可证到期时间结果")
-    private String permitDateResult;
 
-    @ApiModelProperty(value = "法人/责任人证件结果")
-    private String corporationCardResult;
-    @ApiModelProperty(value = "法人/责任人证件结果备注")
-    private String corporationCardResultRemark;
 
 
-    @ApiModelProperty(value = "责任人授权书结果备注")
-    private String personResponsibleResultRemark;
-    @ApiModelProperty(value = "责任人授权书结果")
-    private String personResponsibleResult;
 
-    @ApiModelProperty(value = "经办人证件结果")
-    private String operatorCardResult;
-    @ApiModelProperty(value = "经办人证件结果备注")
-    private String operatorCardResultRemark;
 
-    @ApiModelProperty(value = "经办人手持身份证照片结果备注")
-    private String operatorCardPhoneResultRemark;
-    @ApiModelProperty(value = "经办人手持身份证照片结果")
-    private String operatorCardPhoneResult;
 
-    @ApiModelProperty(value = "机房设备照片结果")
-    private String devicePhoneResult;
-    @ApiModelProperty(value = "机房设备照片结果备注")
-    private String devicePhoneResultRemark;
 
-    @ApiModelProperty(value = "短信模板结果")
-    private String textMessageResult;
-    @ApiModelProperty(value = "短信模板结果备注")
-    private String textMessageResultRemark;
 
-    @ApiModelProperty(value = "端口类短信业务责任承诺书结果")
-    private String textMessageBookResult;
-    @ApiModelProperty(value = "端口类短信业务责任承诺书结果备注")
-    private String textMessageBookResultRemark;
 
-    @ApiModelProperty(value = "信息安全责任承诺书结果")
-    private String secureBookResult;
-    @ApiModelProperty(value = "信息安全责任承诺书结果备注")
-    private String secureBookResultRemark;
 
-    @ApiModelProperty(value = "特殊资费审批结果")
-    private String specialResult;
-    @ApiModelProperty(value = "特殊资费审批结果备注")
-    private String specialResultRemark;
 
-    @ApiModelProperty(value = "入网签报结果")
-    private String networkAccessResult;
-    @ApiModelProperty(value = "入网签报结果备注")
-    private String networkAccessResultRemark;
 
-    @ApiModelProperty(value = "集团价格审批结果")
-    private String groupPriceApprovalResult;
-    @ApiModelProperty(value = "集团价格审批结果备注")
-    private String groupPriceApprovalResultRemark;
 
-    @ApiModelProperty(value = " 合同到期时间是否")
-    private String contractDateDate;
-    @ApiModelProperty(value = " 合同到期时间是否长期")
-    private String contractDateDateIs;
-    @ApiModelProperty(value = " 营业执照到期时间")
-    private String businessLicenseDateDate;
-    @ApiModelProperty(value = " 营业执照到期时间是否长期")
-    private String businessLicenseDateDateIs;
-    @ApiModelProperty(value = " 码号证书到期时间")
-    private String codeNumberDateDate;
-    @ApiModelProperty(value = " 码号证书到期时间是否长期")
-    private String codeNumberDateDateIs;
-    @ApiModelProperty(value = " 备案通知到期时间")
-    private String filingsDateDate;
-    @ApiModelProperty(value = " 备案通知到期时间是否长期")
-    private String filingsDateDateIs;
-    @ApiModelProperty(value = " 增值业务许可证到期时间是否长期")
-    private String permitDateDateIs;
-    @ApiModelProperty(value = " 增值业务许可证到期时间是否")
-    private String permitDateDate;
+
+
+
 }

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

@@ -122,7 +122,7 @@ public class SmsCheckCustomerInfo implements Serializable {
     @ApiModelProperty(value = "客户经理")
     private String accountManager;
 	/** 客户经理手机号 */
-    //@Excel(name = "客户经理手机号", width = 15)
+    @Excel(name = "客户经理手机号", width = 15)
     @ApiModelProperty(value = "客户经理手机号")
     private String accountManagerPhone;
 	/** 码号使用单位联系人 */