中继线导出

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

@@ -60,6 +60,12 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     @Value("${jeecg.path.upload}")
     private String upLoadPath;
     @Autowired
+    private SmsTruckCustomerDataService smsTruckCustomerDataService;
+    @Autowired
+    private SmcTruckCheckLogService smcTruckCheckLogService;
+    @Autowired
+    private ISmsTrcukCustomerDataLogBillService trcukCustomerDataLogBillService;
+    @Autowired
     private ISmsCheckCustomerDataLogBillService iSmsCheckCustomerDataLogBillService;
     @Autowired
     private ISmsCheckCustomerInfoService customerInfoService;
@@ -302,7 +308,68 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         return  exportXls(request, smsCheckCustomerInfo, SmsCheckCustomerDataAndLog.class, "客户信息");
     }
 
+    @RequestMapping(value = "/exportXlsTruck")
+    @PermissionData(pageComponent = "smscheck/modules/TaskCheckList")
+    public ModelAndView exportXlsTruck(HttpServletRequest request, SmsCheckCustomerInfo smsCheckCustomerInfo) {
+        return  exportXlsTruck(request, smsCheckCustomerInfo, SmsTruckCheckCustomerDataAndLog.class, "客户信息");
+    }
+
+    protected ModelAndView exportXlsTruck(HttpServletRequest request, SmsCheckCustomerInfo object, Class<SmsTruckCheckCustomerDataAndLog> 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<SmcTruckCheckLog> logList = smcTruckCheckLogService.list();
+        Map<String, SmcTruckCheckLog> logMap
+                = logList.stream().collect(Collectors.toMap(v->v.getInfoId(), Function.identity(), (o, n) -> o));
+        List<SmsTruckCustomerData> dataList = smsTruckCustomerDataService.list();
+        Map<String, SmsTruckCustomerData> dataMap
+                = dataList.stream().collect(Collectors.toMap(v->v.getInfoId(), Function.identity(), (o, n) -> o));
+        List<SmsTruckCheckCustomerDataAndLog> pageList = new ArrayList<>();
+        for (SmsCheckCustomerInfo smsCheckCustomerInfo : infoList) {
+            SmcTruckCheckLog smsCheckCustomerInfoLog = logMap.get(smsCheckCustomerInfo.getId());
+            SmsTruckCustomerData smsCheckCustomerData = dataMap.get(smsCheckCustomerInfo.getId());
+
+            SmsTruckCheckCustomerDataAndLog dataAndLog = new SmsTruckCheckCustomerDataAndLog();
+            BeanUtil.copyProperties(smsCheckCustomerInfo,dataAndLog);
+            BeanUtil.copyProperties(smsCheckCustomerInfoLog,dataAndLog);
+            BeanUtil.copyProperties(smsCheckCustomerData,dataAndLog);
+            //以dataid代替id
+            dataAndLog.setDataId(smsCheckCustomerInfo.getId());
+            if (smsCheckCustomerData!=null){
+                zgHisTruck(dataAndLog,smsCheckCustomerData);
+            }
+            pageList.add(dataAndLog);
+        }
+        List<SmsTruckCheckCustomerDataAndLog> 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(getTruckId(item))).collect(Collectors.toList());
+        } else {
+            exportList = pageList;
+        }
+        exportList = dataToTruckResult(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;
+
+
+    }
     protected ModelAndView exportXls(HttpServletRequest request, SmsCheckCustomerInfo object, Class<SmsCheckCustomerDataAndLog> clazz, String title) {
         // Step.1 组装查询条件
         QueryWrapper<SmsCheckCustomerInfo> queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap());
@@ -437,7 +504,69 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         return mv;
     }
 
+    private void zgHisTruck(SmsTruckCheckCustomerDataAndLog smsCheckCustomerDataAndLog,SmsTruckCustomerData smsCheckCustomerData){
+        // 判断是否整改过
 
+        LambdaQueryWrapper<SmsTruckCheckCustomerDataLogBill> querySaWrapper = new LambdaQueryWrapper<SmsTruckCheckCustomerDataLogBill>();
+        //全部人员
+        querySaWrapper.eq(SmsTruckCheckCustomerDataLogBill::getInfoId,smsCheckCustomerDataAndLog.getInfoId()).orderByDesc(SmsTruckCheckCustomerDataLogBill::getCreateDate);
+        List<SmsTruckCheckCustomerDataLogBill> list = trcukCustomerDataLogBillService.list(querySaWrapper);
+        for (SmsTruckCheckCustomerDataLogBill smsCheckCustomerDataLogBill : list) {
+            //不相等 说明整改
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getInfoResult())&&!smsCheckCustomerDataAndLog.getInfoResult().equals(smsCheckCustomerDataLogBill.getInfoResult())){
+                smsCheckCustomerDataAndLog.setInfoResultIs("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getApplySignResult())&&!smsCheckCustomerDataAndLog.getApplySignResult().equals(smsCheckCustomerDataLogBill.getApplySignResult())){
+                smsCheckCustomerDataAndLog.setApplySignResultIs("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getTrunkContractResult())&&!smsCheckCustomerDataAndLog.getTrunkContractResult().equals(smsCheckCustomerDataLogBill.getTrunkContractResult())){
+                smsCheckCustomerDataAndLog.setTrunkContractResultIs("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getThreePhotosResult())&&!smsCheckCustomerDataAndLog.getThreePhotosResult().equals(smsCheckCustomerDataLogBill.getThreePhotosResult())){
+                smsCheckCustomerDataAndLog.setThreePhotosResultIs("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getCommitmentBookResult())&&!smsCheckCustomerDataAndLog.getCommitmentBookResult().equals(smsCheckCustomerDataLogBill.getCommitmentBookResult())){
+                smsCheckCustomerDataAndLog.setCommitmentBookResult("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getIsPriceApprovalResult())&&!smsCheckCustomerDataAndLog.getIsPriceApprovalResult().equals(smsCheckCustomerDataLogBill.getIsPriceApprovalResult())){
+                smsCheckCustomerDataAndLog.setIsPriceApprovalResult("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getLegalIdCardResult())&&!smsCheckCustomerDataAndLog.getLegalIdCardResult().equals(smsCheckCustomerDataLogBill.getLegalIdCardResult())){
+                smsCheckCustomerDataAndLog.setLegalIdCardResultIs("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getOperatorIdCardResult())&&!smsCheckCustomerDataAndLog.getOperatorIdCardResult().equals(smsCheckCustomerDataLogBill.getOperatorIdCardResult())){
+                smsCheckCustomerDataAndLog.setOperatorIdCardResultIs("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getAuthorizeBookResult())&&!smsCheckCustomerDataAndLog.getAuthorizeBookResult().equals(smsCheckCustomerDataLogBill.getAuthorizeBookResult())){
+                smsCheckCustomerDataAndLog.setAuthorizeBookResult("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getZZBusinessLicenseResult())&&!smsCheckCustomerDataAndLog.getZZBusinessLicenseResult().equals(smsCheckCustomerDataLogBill.getZZBusinessLicenseResult())){
+                smsCheckCustomerDataAndLog.setZZBusinessLicenseResultIs("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getCenterBusinessResult())&&!smsCheckCustomerDataAndLog.getCenterBusinessResult().equals(smsCheckCustomerDataLogBill.getCenterBusinessResult())){
+                smsCheckCustomerDataAndLog.setCenterBusinessResultIs("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getContractOrProveResult())&&!smsCheckCustomerDataAndLog.getContractOrProveResult().equals(smsCheckCustomerDataLogBill.getContractOrProveResult())){
+                smsCheckCustomerDataAndLog.setContractOrProveResultIs("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getRiskTableResult())&&!smsCheckCustomerDataAndLog.getRiskTableResult().equals(smsCheckCustomerDataLogBill.getRiskTableResult())){
+                smsCheckCustomerDataAndLog.setRiskTableResultIs("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getTrunkTableResult())&&!smsCheckCustomerDataAndLog.getTrunkTableResult().equals(smsCheckCustomerDataLogBill.getTrunkTableResult())){
+                smsCheckCustomerDataAndLog.setTrunkTableResultIs("是");
+            }
+
+        }
+        LambdaQueryWrapper<SmsCheckZGHistory> lambdaQueryWrapper = new LambdaQueryWrapper<SmsCheckZGHistory>();
+        //全部人员
+        lambdaQueryWrapper.eq(SmsCheckZGHistory::getDataId,smsCheckCustomerData.getId());
+        List<SmsCheckZGHistory> list1 = smsCheckZGHistoryService.list(lambdaQueryWrapper);
+        String context ="";
+        for (SmsCheckZGHistory smsCheckZGHistory : list1) {
+            context+="(修改时间："+smsCheckZGHistory.getUpdateDate()+" 字段："+smsCheckZGHistory.getUpdateField()+"  "+smsCheckZGHistory.getContext()+");   \n";
+        }
+        smsCheckCustomerDataAndLog.setZgShow(context);
+    }
     private void zgHis(SmsCheckCustomerDataAndLog smsCheckCustomerDataAndLog,SmsCheckCustomerData smsCheckCustomerData){
         // 判断是否整改过
 
@@ -510,6 +639,95 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
             smsCheckCustomerDataAndLog.setZgShow(context);
     }
 
+
+    private  List<SmsTruckCheckCustomerDataAndLog> dataToTruckResult(List<SmsTruckCheckCustomerDataAndLog> exportList ){
+
+        for (SmsTruckCheckCustomerDataAndLog smsCheckCustomerDataAndLog : exportList) {
+            //风险评估等级
+            if (smsCheckCustomerDataAndLog.getRiskGrade()!=null){
+                if (smsCheckCustomerDataAndLog.getRiskGrade().equals("0")){
+                    smsCheckCustomerDataAndLog.setRiskGrade("较低风险");
+                }
+                if (smsCheckCustomerDataAndLog.getRiskGrade().equals("1")){
+                    smsCheckCustomerDataAndLog.setRiskGrade("低风险");
+                }
+                if (smsCheckCustomerDataAndLog.getRiskGrade().equals("2")){
+                    smsCheckCustomerDataAndLog.setRiskGrade("中风险");
+                }
+                if (smsCheckCustomerDataAndLog.getRiskGrade().equals("3")){
+                    smsCheckCustomerDataAndLog.setRiskGrade("高风险");
+                }
+            }
+
+            if (smsCheckCustomerDataAndLog.getApplySign()!=null &&!smsCheckCustomerDataAndLog.getApplySign().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setApplySign("有");
+            }else {
+                smsCheckCustomerDataAndLog.setApplySign("无");
+            }
+            if (smsCheckCustomerDataAndLog.getTrunkContract()!=null &&!smsCheckCustomerDataAndLog.getTrunkContract().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setTrunkContract("有");
+            }else {
+                smsCheckCustomerDataAndLog.setTrunkContract("无");
+            }
+            if (smsCheckCustomerDataAndLog.getThreePhotos()!=null &&!smsCheckCustomerDataAndLog.getThreePhotos().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setThreePhotos("有");
+            }else {
+                smsCheckCustomerDataAndLog.setThreePhotos("无");
+            }
+            if (smsCheckCustomerDataAndLog.getCommitmentBook()!=null &&!smsCheckCustomerDataAndLog.getCommitmentBook().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setCommitmentBook("有");
+            }else {
+                smsCheckCustomerDataAndLog.setCommitmentBook("无");
+            }
+            if (smsCheckCustomerDataAndLog.getIsPriceApproval()!=null &&!smsCheckCustomerDataAndLog.getIsPriceApproval().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setIsPriceApproval("有");
+            }else {
+                smsCheckCustomerDataAndLog.setIsPriceApproval("无");
+            }
+            if (smsCheckCustomerDataAndLog.getLegalIdCard()!=null &&!smsCheckCustomerDataAndLog.getLegalIdCard().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setLegalIdCard("有");
+            }else {
+                smsCheckCustomerDataAndLog.setLegalIdCard("无");
+            }
+            if (smsCheckCustomerDataAndLog.getOperatorIdCard()!=null &&!smsCheckCustomerDataAndLog.getOperatorIdCard().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setOperatorIdCard("有");
+            }else {
+                smsCheckCustomerDataAndLog.setOperatorIdCard("无");
+            }
+            if (smsCheckCustomerDataAndLog.getAuthorizeBook()!=null &&!smsCheckCustomerDataAndLog.getAuthorizeBook().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setAuthorizeBook("有");
+            }else {
+                smsCheckCustomerDataAndLog.setAuthorizeBook("无");
+            }
+            if (smsCheckCustomerDataAndLog.getZZBusinessLicense()!=null &&!smsCheckCustomerDataAndLog.getZZBusinessLicense().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setZZBusinessLicense("有");
+            }else {
+                smsCheckCustomerDataAndLog.setZZBusinessLicense("无");
+            }
+            if (smsCheckCustomerDataAndLog.getCenterBusiness()!=null &&!smsCheckCustomerDataAndLog.getCenterBusiness().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setCenterBusiness("有");
+            }else {
+                smsCheckCustomerDataAndLog.setCenterBusiness("无");
+            }
+            if (smsCheckCustomerDataAndLog.getContractOrProve()!=null &&!smsCheckCustomerDataAndLog.getContractOrProve().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setContractOrProve("有");
+            }else {
+                smsCheckCustomerDataAndLog.setContractOrProve("无");
+            }
+            if (smsCheckCustomerDataAndLog.getRiskTable()!=null &&!smsCheckCustomerDataAndLog.getRiskTable().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setRiskTable("有");
+            }else {
+                smsCheckCustomerDataAndLog.setRiskTable("无");
+            }
+            if (smsCheckCustomerDataAndLog.getTrunkTable()!=null &&!smsCheckCustomerDataAndLog.getTrunkTable().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setTrunkTable("有");
+            }else {
+                smsCheckCustomerDataAndLog.setTrunkTable("无");
+            }
+        }
+        return exportList;
+
+    }
     private  List<SmsCheckCustomerDataAndLog> dataToResult(List<SmsCheckCustomerDataAndLog> exportList ){
 
         for (SmsCheckCustomerDataAndLog smsCheckCustomerDataAndLog : exportList) {
@@ -629,7 +847,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
             }else {
                 smsCheckCustomerDataAndLog.setSecureBook("无");
             }
-            //是否有特殊资费审批（标准资费无需提供）
+            //是否有特殊资费审批(标准资费无需提供）
             if (smsCheckCustomerDataAndLog.getSpecial()!=null &&!smsCheckCustomerDataAndLog.getSpecial().equals("[{}]")){
                 smsCheckCustomerDataAndLog.setSpecial("有");
             }else {
@@ -664,7 +882,14 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
 
     }
 
-
+    private String getTruckId(SmsTruckCheckCustomerDataAndLog item) {
+        try {
+            return PropertyUtils.getProperty(item, "dataId").toString();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
     private String getId(SmsCheckCustomerDataAndLog item) {
         try {
             return PropertyUtils.getProperty(item, "dataId").toString();

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

@@ -4,13 +4,14 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
 
 import java.util.Date;
 
 @Data
 public class SmsTruckCheckCustomerDataAndLog {
 
-
     private String id;
     /** 任务id */
     private String taskId;
@@ -18,48 +19,17 @@ public class SmsTruckCheckCustomerDataAndLog {
     private String infoId;
     /** 客户资料ID */
     private String dataId;
-    @ApiModelProperty(value = "基本信息稽核稽核结果")
-    private String infoResult;
-    @ApiModelProperty(value = "基本信息结果备注")
-    private String infoResultRemark;
-
-    private String applySignResult;
-    private String applySignResultRemark;
-    //三张现场照片 threePhotos
-    private String threePhotosResult;
-    private String threePhotosResultRemark;
-    //责任承诺书
-    private String commitmentBookResult;
-    private String commitmentBookResultRemark;
-    //突破客户经理管控价是否有固网价格审批
-    private String isPriceApprovalResult;
-    private String isPriceApprovalResultRemark;
-    //法人身份证
-    private String legalIdCardResult;
-    private String legalIdCardResultRemark;
-    //经办人身份证.
-    private String operatorIdCardResult;
-    private String operatorIdCardResultRemark;
-    //授权函.
-    private String authorizeBookResult;
-    private String authorizeBookResultRemark;
-    //经营性呼叫中心增值业务许可证.
-    private String zZBusinessLicenseResult;
-    private String zZBusinessLicenseResultRemark;
-    //呼叫中心业务说明.
-    private String centerBusinessResult;
-    private String centerBusinessResultRemark;
-    //房屋租赁合同或房产证明.
-    private String contractOrProveResult;
-    private String contractOrProveResultRemark;
-    //风险评估表
-    private String riskTableResult;
-    private String riskTableResultRemark;
     private String logId;
     /** 客户类型;0:一类客户 ，1:二类客户 */
-    private Integer customType;
+
+    @Excel(name = "客户类型", width = 15,dicCode = "custom_type")
+    @Dict(dicCode = "custom_type")
+    private String customType;
     /** 使用场景;0:办公自用，1:自用型呼叫中心，2:经营型呼叫中心，3:经济型会议电话 */
-    private Integer scene;
+
+    @Excel(name = "使用场景", width = 15,dicCode = "scene")
+    @Dict(dicCode = "scene")
+    private String scene;
     /** 客户营业执照 */
     private String businessLicense;
     /** 经办人介绍信和身份证复印件 */
@@ -95,106 +65,303 @@ public class SmsTruckCheckCustomerDataAndLog {
     /** 更新时间 */
     private Date updateTime;
     /**员工编号*/
+    @Excel(name = "员工编号", width = 15)
     private String staffNo;
 
     //客户经理手机号
+    @Excel(name = "客户经理手机号", width = 15)
     private String managePhone;
     //房屋租赁合同到期时间
+    @Excel(name = "房屋租赁合同到期时间", width = 15)
     private String houseDate;
     //经营型呼叫中心增值许可证到期日
+    @Excel(name = "经营型呼叫中心增值许可证到期日", width = 15)
     private String zZBusinessLicenseDate;
-    //营业执照到期时间 是否长期
+    //营业执照到期时间是否长期
+    @Excel(name = "营业执照到期时间是否长期", width = 15,dicCode = "is_long")
+    @Dict(dicCode = "is_long")
     private String businessLicenseDateIs;
     //营业执照到期时间
+    @Excel(name = "营业执照到期时间", width = 15)
     private String businessLicenseDate;
     //合同到期时间
+    @Excel(name = "合同到期时间", width = 15)
     private String contractDate;
     //风险评估等级（非办公自用需提供)
+    @Excel(name = "风险评估等级（非办公自用需提供)", width = 15)
     private String riskGrade;
     //实际装机地址
+    @Excel(name = "实际装机地址", width = 15)
     private String installationAddress;
     //楼宇名称
+    @Excel(name = "楼宇名称", width = 15)
     private String floorName;
     //首次激活时间
+    @Excel(name = "首次激活时间", width = 15)
     private String firstActivationDate;
     //客户编号
+    @Excel(name = "客户编号", width = 15)
     private String customerNo;
     //用户编号
+    @Excel(name = "用户编号", width = 15)
     private String userNo;
     //入网时间
+    @Excel(name = "入网时间", width = 15)
     private String networkAccessTime;
     //客户名称
+    @Excel(name = "客户名称", width = 15)
     private String customerName;
     //用户状态
+    @Dict(dicCode = "user_status")
+    @Excel(name = "用户状态", width = 15,dicCode = "user_status")
     private String userState;
     //合同到期时间是否长期
+    @Dict(dicCode = "is_long")
+    @Excel(name = "合同到期时间是否长期", width = 15,dicCode = "is_long")
     private String contractDateIs;
     //
-    //private String codeNumber;
+    @ApiModelProperty(value = " 码号")
+    @Excel(name = "码号", width = 15)
+    private String codeNumber;
     //账户编码
+    @Excel(name = "账户编码", width = 15)
     private String accountCode;
     //楼宇编号
+    @Excel(name = "楼宇编号", width = 15)
     private String floorCode;
     //用户号码
+    @Excel(name = "用户号码", width = 15)
     private String userCode;
+    @ApiModelProperty(value = "基本信息稽核稽核结果")
+    @Excel(name = "基本信息稽核稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    private String infoResult;
+
+    @ApiModelProperty(value = "基本信息稽核结果备注")
+    @Excel(name = "基本信息结果备注", width = 15)
+    private String infoResultRemark;
+
+    @Excel(name = "入网申请签报稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    private String applySignResult;
+    @Excel(name = "入网申请签报稽核结果备注", width = 15)
+    private String applySignResultRemark;
     //入网申请签报 applySign
+    @Excel(name = "是否有入网申请签报资料", width = 15)
     private String applySign;
     //入网申请签报备注
+    @Excel(name = "入网申请签报备注", width = 15)
     private String applySignRemark;
+
+    //三张现场照片 threePhotos
+    @Excel(name = "三张现场照片稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    private String threePhotosResult;
+    @Excel(name = "三张现场照片稽核结果备注", width = 15)
+    private String threePhotosResultRemark;
     //三张现场照片 threePhotos
+    @Excel(name = "是否有三张现场照片资料", width = 15)
     private String threePhotos;
     //三张现场照片备注
+    @Excel(name = "三张现场照片备注", width = 15)
     private String threePhotosRemark;
+
+
     //责任承诺书
+    @Excel(name = "责任承诺书稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    private String commitmentBookResult;
+    @Excel(name = "责任承诺书稽核结果备注", width = 15)
+    private String commitmentBookResultRemark;
+    //责任承诺书
+    @Excel(name = "是否有责任承诺书资料", width = 15)
     private String commitmentBook;
     //责任承诺书备注
+    @Excel(name = "责任承诺书备注", width = 15)
     private String commitmentBookRemark;
+
     //突破客户经理管控价是否有固网价格审批
+    @Excel(name = "突破客户经理管控价是否有固网价格审批稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    private String isPriceApprovalResult;
+    @Excel(name = "突破客户经理管控价是否有固网价格审批稽核结果备注", width = 15)
+    private String isPriceApprovalResultRemark;
+    //突破客户经理管控价是否有固网价格审批
+    @Excel(name = "是否有突破客户经理管控价是否有固网价格审批资料", width = 15)
     private String isPriceApproval;
     //突破客户经理管控价是否有固网价格审批备注
+    @Excel(name = "突破客户经理管控价是否有固网价格审批备注", width = 15)
     private String isPriceApprovalRemark;
     //法人身份证
+    @Excel(name = "法人身份证稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    private String legalIdCardResult;
+    @Excel(name = "法人身份证稽核结果备注", width = 15)
+    private String legalIdCardResultRemark;
+    //法人身份证
+    @Excel(name = "是否有法人身份证资料", width = 15)
     private String legalIdCard;
     //法人身份证备注
+    @Excel(name = "法人身份证备注", width = 15)
     private String legalIdCardRemark;
+
+    //经办人身份证.
+    @Excel(name = "经办人身份证稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    private String operatorIdCardResult;
+    @Excel(name = "经办人身份证稽核结果备注", width = 15)
+    private String operatorIdCardResultRemark;
     //经办人身份证.
+    @Excel(name = "是否有经办人身份证资料", width = 15)
     private String operatorIdCard;
     //经办人身份证备注
+    @Excel(name = "经办人身份证备注", width = 15)
     private String operatorIdCardRemark;
     //授权函.
+    @Excel(name = "授权函稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    private String authorizeBookResult;
+    @Excel(name = "授权函稽核结果备注", width = 15)
+    private String authorizeBookResultRemark;
+    //授权函.
+    @Excel(name = "是否有授权函资料", width = 15)
     private String authorizeBook;
     //授权函备注
+    @Excel(name = "授权函备注", width = 15)
     private String authorizeBookRemark;
+    //经营性呼叫中心增值业务许可证.
+    @Excel(name = "经营性呼叫中心增值业务许可证稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    private String zZBusinessLicenseResult;
+    @Excel(name = "经营性呼叫中心增值业务许可证稽核结果备注", width = 15)
+    private String zZBusinessLicenseResultRemark;
     //经营性呼叫中心增值业务许可证
+    @Excel(name = "是否有经营性呼叫中心增值业务许可证资料", width = 15)
     private String zZBusinessLicense;
     //经营性呼叫中心增值业务许可证备注
+    @Excel(name = "经营性呼叫中心增值业务许可证备注", width = 15)
     private String zZBusinessLicenseRemark;
     //呼叫中心业务说明.
+    @Excel(name = "呼叫中心业务说明稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    private String centerBusinessResult;
+    @Excel(name = "呼叫中心业务说明稽核结果备注", width = 15)
+    private String centerBusinessResultRemark;
+    //呼叫中心业务说明.
+    @Excel(name = "是否有呼叫中心业务说明资料", width = 15)
     private String centerBusiness;
     //呼叫中心业务说明备注
+    @Excel(name = "呼叫中心业务说明备注", width = 15)
     private String centerBusinessRemark;
     //房屋租赁合同或房产证明.
+    @Excel(name = "房屋租赁合同或房产证明稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    private String contractOrProveResult;
+    @Excel(name = "房屋租赁合同或房产证明稽核结果备注", width = 15)
+    private String contractOrProveResultRemark;
+    //房屋租赁合同或房产证明.
+    @Excel(name = "是否有房屋租赁合同或房产证明资料", width = 15)
     private String contractOrProve;
     //房屋租赁合同或房产证明备注
+    @Excel(name = "房屋租赁合同或房产证明备注", width = 15)
     private String contractOrProveRemark;
     //风险评估表
+    @Excel(name = "风险评估表稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    private String riskTableResult;
+    @Excel(name = "风险评估表稽核结果备注", width = 15)
+    private String riskTableResultRemark;
+    //风险评估表
+    @Excel(name = "是否有风险评估表资料", width = 15)
     private String riskTable;
     //风险评估表备注
+    @Excel(name = "风险评估表备注", width = 15)
     private String riskTableRemark;
+
+
+
+
     //中继线预审表
+    @Excel(name = "是否有中继线预审表资料", width = 15)
     private String trunkTable;
     //中继线预审表备注
+    @Excel(name = "中继线预审表备注", width = 15)
     private String trunkTableRemark;
+    //中继线预审表
+    @Excel(name = "中继线预审表稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    private String trunkTableResult;
+    @Excel(name = "中继线预审表稽核结果备注", width = 15)
+    private String trunkTableResultRemark;
     //中继线合同
+    @Excel(name = "是否有中继线合同资料", width = 15)
     private String trunkContract;
     //中继线合同备注
+    @Excel(name = "中继线合同备注", width = 15)
     private String trunkContractRemark;
-    //中继线预审表
-    private String trunkTableResult;
-    private String trunkTableResultRemark;
+
     //中继线合同
+    @Dict(dicCode = "check_result")
+    @Excel(name = "中继线合同稽核结果", width = 15,dicCode = "check_result")
     private String trunkContractResult;
+    @Excel(name = "中继线合同稽核结果备注", width = 15)
     private String trunkContractResultRemark;
 
 
+    @Excel(name = "基本信息稽核稽核是否整改过", width = 15)
+    private String infoResultIs;
+
+    @Excel(name = "入网申请签报稽核是否整改过", width = 15)
+    private String applySignResultIs;
+
+
+    @Excel(name = "中继线合同稽核是否整改过", width = 15)
+    private String trunkContractResultIs;
+
+
+    @Excel(name = "三张现场照片稽核结果是否整改过", width = 15)
+    private String threePhotosResultIs;
+
+    //责任承诺书
+    @Excel(name = "责任承诺书稽核结果是否整改过", width = 15)
+    private String commitmentBookResultIs;
+
+
+    //突破客户经理管控价是否有固网价格审批
+    @Excel(name = "突破客户经理管控价是否有固网价格审批稽核结果是否整改过", width = 15)
+    private String isPriceApprovalResultIs;
+
+
+    //法人身份证
+    @Excel(name = "法人身份证稽核结果是否整改过", width = 15)
+    private String legalIdCardResultIs;
+
+    @Excel(name = "经办人身份证稽核结果是否整改过", width = 15)
+    private String operatorIdCardResultIs;
+
+    //授权函.
+    @Excel(name = "授权函稽核结果是否整改过", width = 15)
+    private String authorizeBookResultIs;
+
+    //经营性呼叫中心增值业务许可证.
+    @Excel(name = "经营性呼叫中心增值业务许可证稽核结果是否整改过", width = 15)
+    private String zZBusinessLicenseResultIs;
+
+    //呼叫中心业务说明.
+    @Excel(name = "呼叫中心业务说明稽核结果是否整改过", width = 15)
+    private String centerBusinessResultIs;
+
+    //房屋租赁合同或房产证明.
+    @Excel(name = "房屋租赁合同或房产证明稽核结果是否整改过", width = 15)
+    private String contractOrProveResultIs;
+
+    @Excel(name = "风险评估表稽核结果是否整改过", width = 15)
+    private String riskTableResultIs;
+
+    //中继线预审表
+    @Excel(name = "中继线预审表稽核结果是否整改过", width = 15)
+    private String trunkTableResultIs;
+
+    private String zgShow;
+
 }