加载慢的问题

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

@@ -64,6 +64,12 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     @Autowired
     private SmcTruckCheckLogService smcTruckCheckLogService;
     @Autowired
+    private SmsLotCustomerService smsLotCustomerService;
+    @Autowired
+    private ISmsLotCustomerDataLogBillService iSmsLotCustomerDataLogBillService;
+    @Autowired
+    private SmcLotCheckLogService smcLotCheckLogService;
+    @Autowired
     private ISmsTrcukCustomerDataLogBillService trcukCustomerDataLogBillService;
     @Autowired
     private ISmsCheckCustomerDataLogBillService iSmsCheckCustomerDataLogBillService;
@@ -307,6 +313,68 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     public ModelAndView exportXls(HttpServletRequest request, SmsCheckCustomerInfo smsCheckCustomerInfo) {
         return  exportXls(request, smsCheckCustomerInfo, SmsCheckCustomerDataAndLog.class, "客户信息");
     }
+    @RequestMapping(value = "/exportXlsLot")
+    @PermissionData(pageComponent = "smscheck/modules/exportXlsLot")
+    public ModelAndView exportXlsLot(HttpServletRequest request, SmsCheckCustomerInfo smsCheckCustomerInfo) {
+        return  exportXlsLot(request, smsCheckCustomerInfo, SmsLotCheckCustomerDataAndLog.class, "客户信息");
+    }
+    protected ModelAndView exportXlsLot(HttpServletRequest request, SmsCheckCustomerInfo object, Class<SmsLotCheckCustomerDataAndLog> 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<SmcLotCheckLog> logList = smcLotCheckLogService.list();
+        Map<String, SmcLotCheckLog> logMap
+                = logList.stream().collect(Collectors.toMap(v->v.getInfoId(), Function.identity(), (o, n) -> o));
+        List<SmsLotCustomerData> dataList = smsLotCustomerService.list();
+        Map<String, SmsLotCustomerData> dataMap
+                = dataList.stream().collect(Collectors.toMap(v->v.getInfoId(), Function.identity(), (o, n) -> o));
+        List<SmsLotCheckCustomerDataAndLog> pageList = new ArrayList<>();
+        for (SmsCheckCustomerInfo smsCheckCustomerInfo : infoList) {
+            SmcLotCheckLog smsCheckCustomerInfoLog = logMap.get(smsCheckCustomerInfo.getId());
+            SmsLotCustomerData smsCheckCustomerData = dataMap.get(smsCheckCustomerInfo.getId());
+
+            SmsLotCheckCustomerDataAndLog dataAndLog = new SmsLotCheckCustomerDataAndLog();
+            BeanUtil.copyProperties(smsCheckCustomerInfo,dataAndLog);
+            BeanUtil.copyProperties(smsCheckCustomerInfoLog,dataAndLog);
+            BeanUtil.copyProperties(smsCheckCustomerData,dataAndLog);
+            //以dataid代替id
+            dataAndLog.setDataId(smsCheckCustomerInfo.getId());
+            if (smsCheckCustomerData!=null){
+                zgHisLot(dataAndLog,smsCheckCustomerData);
+            }
+            pageList.add(dataAndLog);
+        }
+        List<SmsLotCheckCustomerDataAndLog> 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(getLotId(item))).collect(Collectors.toList());
+        } else {
+            exportList = pageList;
+        }
+        exportList = dataToLotResult(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;
+
+
+    }
+
 
     @RequestMapping(value = "/exportXlsTruck")
     @PermissionData(pageComponent = "smscheck/modules/TaskCheckList")
@@ -504,6 +572,106 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
         return mv;
     }
 
+    private void zgHisLot(SmsLotCheckCustomerDataAndLog smsCheckCustomerDataAndLog,SmsLotCustomerData smsCheckCustomerData){
+        // 判断是否整改过
+
+        LambdaQueryWrapper<SmsLotCheckCustomerDataLogBill> querySaWrapper = new LambdaQueryWrapper<SmsLotCheckCustomerDataLogBill>();
+        //全部人员
+        querySaWrapper.eq(SmsLotCheckCustomerDataLogBill::getInfoId,smsCheckCustomerDataAndLog.getInfoId()).orderByDesc(SmsLotCheckCustomerDataLogBill::getCreateDate);
+        List<SmsLotCheckCustomerDataLogBill> list = iSmsLotCustomerDataLogBillService.list(querySaWrapper);
+        for (SmsLotCheckCustomerDataLogBill smsCheckCustomerDataLogBill : list) {
+            //不相等 说明整改
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getInfoResult())&&!smsCheckCustomerDataAndLog.getInfoResult().equals(smsCheckCustomerDataLogBill.getInfoResult())){
+                smsCheckCustomerDataAndLog.setInfoResultIs("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getTestCardResult())&&!smsCheckCustomerDataAndLog.getTestCardResult().equals(smsCheckCustomerDataLogBill.getTestCardResult())){
+                smsCheckCustomerDataAndLog.setTestCardResultIs("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getContractResult())&&!smsCheckCustomerDataAndLog.getContractResult().equals(smsCheckCustomerDataLogBill.getContractResult())){
+                smsCheckCustomerDataAndLog.setContractResultIs("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getHandlingContractResult())&&!smsCheckCustomerDataAndLog.getHandlingContractResult().equals(smsCheckCustomerDataLogBill.getHandlingContractResult())){
+                smsCheckCustomerDataAndLog.setHandlingContractResultIs("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getHandlingCardResult())&&!smsCheckCustomerDataAndLog.getHandlingCardResult().equals(smsCheckCustomerDataLogBill.getHandlingCardResult())){
+                smsCheckCustomerDataAndLog.setHandlingCardResultIs("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getCustomerCardScanningResult())&&!smsCheckCustomerDataAndLog.getCustomerCardScanningResult().equals(smsCheckCustomerDataLogBill.getCustomerCardScanningResult())){
+                smsCheckCustomerDataAndLog.setCustomerCardScanningResultIs("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getRiskTableResult())&&!smsCheckCustomerDataAndLog.getRiskTableResult().equals(smsCheckCustomerDataLogBill.getRiskTableResult())){
+                smsCheckCustomerDataAndLog.setRiskTableResultIs("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getPriceTableResult())&&!smsCheckCustomerDataAndLog.getPriceTableResult().equals(smsCheckCustomerDataLogBill.getPriceTableResult())){
+                smsCheckCustomerDataAndLog.setPriceTableResult("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getCommitmentResult())&&!smsCheckCustomerDataAndLog.getCommitmentResult().equals(smsCheckCustomerDataLogBill.getCommitmentResult())){
+                smsCheckCustomerDataAndLog.setCommitmentResultIs("是");
+            }
+
+        }
+        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  List<SmsLotCheckCustomerDataAndLog> dataToLotResult( List<SmsLotCheckCustomerDataAndLog>exportList ){
+
+        for (SmsLotCheckCustomerDataAndLog smsCheckCustomerDataAndLog : exportList) {
+
+            if (smsCheckCustomerDataAndLog.getTestCard()!=null &&!smsCheckCustomerDataAndLog.getTestCard().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setTestCard("有");
+            }else {
+                smsCheckCustomerDataAndLog.setTestCard("无");
+            }
+            if (smsCheckCustomerDataAndLog.getContract()!=null &&!smsCheckCustomerDataAndLog.getContract().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setContract("有");
+            }else {
+                smsCheckCustomerDataAndLog.setContract("无");
+            }
+            if (smsCheckCustomerDataAndLog.getHandlingContract()!=null &&!smsCheckCustomerDataAndLog.getHandlingContract().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setHandlingContract("有");
+            }else {
+                smsCheckCustomerDataAndLog.setHandlingContract("无");
+            }
+            if (smsCheckCustomerDataAndLog.getHandlingCard()!=null &&!smsCheckCustomerDataAndLog.getHandlingCard().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setHandlingCard("有");
+            }else {
+                smsCheckCustomerDataAndLog.setHandlingCard("无");
+            }
+            if (smsCheckCustomerDataAndLog.getCustomerCardScanning()!=null &&!smsCheckCustomerDataAndLog.getCustomerCardScanning().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setCustomerCardScanning("有");
+            }else {
+                smsCheckCustomerDataAndLog.setCustomerCardScanning("无");
+            }
+            if (smsCheckCustomerDataAndLog.getRiskTable()!=null &&!smsCheckCustomerDataAndLog.getRiskTable().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setRiskTable("有");
+            }else {
+                smsCheckCustomerDataAndLog.setRiskTable("无");
+            }
+            if (smsCheckCustomerDataAndLog.getPriceTable()!=null &&!smsCheckCustomerDataAndLog.getPriceTable().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setPriceTable("有");
+            }else {
+                smsCheckCustomerDataAndLog.setPriceTable("无");
+            }
+            if (smsCheckCustomerDataAndLog.getCommitment()!=null &&!smsCheckCustomerDataAndLog.getCommitment().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setCommitment("有");
+            }else {
+                smsCheckCustomerDataAndLog.setCommitment("无");
+            }
+
+        }
+        return exportList;
+
+    }
+
     private void zgHisTruck(SmsTruckCheckCustomerDataAndLog smsCheckCustomerDataAndLog,SmsTruckCustomerData smsCheckCustomerData){
         // 判断是否整改过
 
@@ -913,6 +1081,14 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
             return null;
         }
     }
+    private String getLotId(SmsLotCheckCustomerDataAndLog 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/SmsLotCheckCustomerDataAndLog.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 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;
 
@@ -23,10 +24,9 @@ public class SmsLotCheckCustomerDataAndLog {
 
     private String stepsNow;
 
-    /**卡类型 0测试卡；1正式卡*/
-    private String blockType;
+
     /**是否突破价格管控*/
-    private String control;
+
     /**合同文件*/
 //    @TableField(updateStrategy = FieldStrategy.IGNORED)
 //    private String contract;
@@ -84,15 +84,20 @@ public class SmsLotCheckCustomerDataAndLog {
     @ApiModelProperty(value = "是否完成整改")
     private String isComplete;
     @ApiModelProperty(value = "使用场景")
+    @Excel(name = "使用场景", width = 15)
     private String scene;
     @ApiModelProperty(value = "部门经理")
+    @Excel(name = "部门经理", width = 15)
     private String manage;
     @ApiModelProperty(value = "部门经理手机号")
+    @Excel(name = "部门经理手机号", width = 15)
     private String managePhone;
 
     @ApiModelProperty(value = "服务号码（全）")
+    @Excel(name = "服务号码（全）", width = 15)
     private String smsNumber;
     @ApiModelProperty(value = "客户编号")
+    @Excel(name = "客户编号", width = 15)
     private String customerNo;
     @ApiModelProperty(value = "用户编号")
     private String userNo;
@@ -105,41 +110,14 @@ public class SmsLotCheckCustomerDataAndLog {
     @Excel(name = "员工编号", width = 15)
     @ApiModelProperty(value = "员工编号")
     private String staffNo;
-    @ApiModelProperty(value = "测试卡申请单资料上传")
-    private String testCard;
-    @ApiModelProperty(value = "测试卡申请单资料上传备注")
-    private String testCardRemark;
-    @ApiModelProperty(value = "合同资料上传")
-    private String contract;
-    @ApiModelProperty(value = "合同资料上传备注")
-    private String contractRemark;
-    @ApiModelProperty(value = "责任人和经办人授权书上传资料")
-    private String handlingContract;
-    @ApiModelProperty(value = "责任人和经办人授权书上传资料备注")
-    private String handlingContractRemark;
-    @ApiModelProperty(value = "责任人和经办人身份证上传资料")
-    private String handlingCard;
-    @ApiModelProperty(value = "责任人和经办人身份证上传资料备注")
-    private String handlingCardRemark;
-    @ApiModelProperty(value = "客户证件扫描资料上传")
-    private String customerCardScanning;
-    @ApiModelProperty(value = "客户证件扫描资料上传备注")
-    private String customerCardScanningRemark;
-    @ApiModelProperty(value = "风险评估表资料上传")
-    private String riskTable;
-    @ApiModelProperty(value = "风险评估表资料上传备注")
-    private String riskTableRemark;
-    @ApiModelProperty(value = "省/集团价格审批表资料上传")
-    private String priceTable;
-    @ApiModelProperty(value = "省/集团价格审批表资料上传备注")
-    private String priceTableRemark;
-    @ApiModelProperty(value = "其他材料资料上传")
-    private String commitment;
-    @ApiModelProperty(value = "其他材料资料上传备注")
-    private String commitmentRemark;
-
+    @Excel(name = "是否有集团价格审批", width = 15)
+    private String control;
+    /**卡类型 0测试卡；1正式卡*/
+    @Excel(name = "卡类型", width = 15)
+    private String blockType;
 
     /**员工姓名*/
+    @Excel(name = "员工姓名", width = 15)
     private String staffName;
 
     /**合同稽核状态*/
@@ -174,22 +152,150 @@ public class SmsLotCheckCustomerDataAndLog {
     private Integer commitmentState;
     /**承诺函、其它材料 稽核备注*/
     private String commitmentNote;
+
+
+    @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(width = 15,name = "测试卡申请单资料上传")
+    @ApiModelProperty(value = "测试卡申请单资料上传")
+    private String testCard;
+    @ApiModelProperty(value = "测试卡申请单资料上传备注")
+    @Excel(width = 15,name = "测试卡申请单资料上传备注")
+    private String testCardRemark;
+    @ApiModelProperty(value = "测试卡申请单资料稽核结果")
+    @Excel(name = "测试卡申请单资料稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
     private String testCardResult;
+    @ApiModelProperty(value = "测试卡申请单资料稽核结果备注")
+    @Excel(name = "测试卡申请单资料稽核结果备注", width = 15)
     private String testCardResultRemark;
+
+    @ApiModelProperty(value = "合同资料上传")
+    @Excel(width = 15,name = "合同资料上传")
+    private String contract;
+    @ApiModelProperty(value = "合同资料上传备注")
+    @Excel(width = 15,name = "合同资料上传备注")
+    private String contractRemark;
+    @ApiModelProperty(value = "合同上传资料稽核结果")
+    @Excel(name = "合同上传资料稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
     private String contractResult;
+    @ApiModelProperty(value = "合同资料上传稽核结果备注")
+    @Excel(width = 15,name ="合同资料上传稽核结果备注")
     private String contractResultRemark;
+
+    @ApiModelProperty(value = "责任人和经办人授权书上传资料")
+    @Excel(width = 15,name = "责任人和经办人授权书上传资料")
+    private String handlingContract;
+    @ApiModelProperty(value = "责任人和经办人授权书上传资料备注")
+    @Excel(width = 15,name = "责任人和经办人授权书上传资料备注")
+    private String handlingContractRemark;
+    @ApiModelProperty(value = "责任人和经办人授权书上传资料稽核结果")
+    @Excel(name = "责任人和经办人授权书上传资料稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
     private String handlingContractResult;
+    @ApiModelProperty(value = "责任人和经办人授权书资料上传稽核结果备注")
+    @Excel(width = 15,name ="责任人和经办人授权书资料上传稽核结果备注")
     private String handlingContractResultRemark;
+
+    @ApiModelProperty(value = "责任人和经办人身份证上传资料")
+    @Excel(width = 15,name = "责任人和经办人身份证上传资料")
+    private String handlingCard;
+    @ApiModelProperty(value = "责任人和经办人身份证上传资料备注")
+    @Excel(width = 15,name = "责任人和经办人身份证上传资料备注")
+    private String handlingCardRemark;
+    @ApiModelProperty(value = "责任人和经办人授权书上传资料稽核结果")
+    @Excel(name = "责任人和经办人授权书上传资料稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
     private String handlingCardResult;
+    @ApiModelProperty(value = "责任人和经办人身份证资料上传稽核结果备注")
+    @Excel(width = 15,name = "责任人和经办人身份证资料上传稽核结果备注")
     private String handlingCardResultRemark;
+
+    @ApiModelProperty(value = "客户证件扫描资料上传")
+    @Excel(width = 15,name = "客户证件扫描资料上传")
+    private String customerCardScanning;
+    @ApiModelProperty(value = "客户证件扫描资料上传备注")
+    @Excel(width = 15,name = "客户证件扫描资料上传备注")
+    private String customerCardScanningRemark;
+    @ApiModelProperty(value = "客户证件扫描上传资料稽核结果")
+    @Excel(name = "客户证件扫描上传资料稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
     private String customerCardScanningResult;
+    @ApiModelProperty(value = "客户证件扫描资料上传稽核结果备注")
+    @Excel(width = 15,name = "客户证件扫描资料上传稽核结果备注")
     private String customerCardScanningResultRemark;
+
+    @ApiModelProperty(value = "风险评估表资料上传")
+    @Excel(width = 15,name = "风险评估表资料上传")
+    private String riskTable;
+    @ApiModelProperty(value = "风险评估表资料上传备注")
+    @Excel(width = 15,name ="风险评估表资料上传备注")
+    private String riskTableRemark;
+    @ApiModelProperty(value = "风险评估表上传资料稽核结果")
+    @Excel(name = "风险评估表上传资料稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
     private String riskTableResult;
+    @ApiModelProperty(value = "风险评估表资料上传稽核结果备注")
+    @Excel(width = 15,name = "风险评估表资料上传稽核结果备注")
     private String riskTableResultRemark;
+
+    @ApiModelProperty(value = "省/集团价格审批表资料上传")
+    @Excel(width = 15,name = "省/集团价格审批表资料上传")
+    private String priceTable;
+    @ApiModelProperty(value = "省/集团价格审批表资料上传备注")
+    @Excel(width = 15,name = "省/集团价格审批表资料上传备注")
+    private String priceTableRemark;
+    @ApiModelProperty(value = "省/集团价格审批表上传资料稽核结果")
+    @Excel(name = "省/集团价格审批表上传资料稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
     private String priceTableResult;
+    @ApiModelProperty(value = "省/集团价格审批表资料上传稽核结果备注")
+    @Excel(width = 15,name = "省/集团价格审批表资料上传稽核结果备注")
     private String priceTableResultRemark;
+
+    @ApiModelProperty(value = "其他材料资料上传")
+    @Excel(width = 15,name  = "其他材料资料上传")
+    private String commitment;
+    @ApiModelProperty(value = "其他材料资料上传备注")
+    @Excel(width = 15,name = "其他材料资料上传备注")
+    private String commitmentRemark;
+    @ApiModelProperty(value = "风险评估表上传资料稽核结果")
+    @Excel(name = "风险评估表上传资料稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
     private String commitmentResult;
+    @ApiModelProperty(value = "其他材料资料上传稽核结果备注")
+    @Excel(width = 15,name = "其他材料资料上传稽核结果备注")
     private String commitmentResultRemark;
+
+
+    @Excel(name = "基本信息是否整改过", width = 15)
+    private String infoResultIs;
+    @Excel(name = "测试卡申请单是否整改过", width = 15)
+    private String testCardResultIs;
+    @Excel(name = "测试卡申请单是否整改过", width = 15)
+    private String contractResultIs;
+    @Excel(name = "责任人和经办人授权书是否整改过", width = 15)
+    private String handlingContractResultIs;
+
+    @Excel(name = "责任人和经办人身份证资料是否整改过", width = 15)
+    private String handlingCardResultIs;
+    @Excel(name = "客户证件扫描上传资料是否整改过", width = 15)
+    private String customerCardScanningResultIs;
+    @Excel(name = "风险评估表上传资料是否整改过", width = 15)
+    private String riskTableResultIs;
+    @Excel(name = "省/集团价格审批表上传资料是否整改过", width = 15)
+    private String priceTableResultIs;
+    @Excel(name = "其他材料上传资料是否整改过", width = 15)
+    private String commitmentResultIs;
+
+    @Excel(name = "整改历史", width = 40)
+    private String zgShow;
 }

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

@@ -111,5 +111,5 @@ public class SmsLotCheckCustomerDataLogBill {
     private String commitmentResult;
     private String commitmentResultRemark;
     private Date createDate;
-
+    private String infoResult;
 }