导出与其它

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

@@ -143,6 +143,21 @@ public class SmsCheckCustomerDataController extends JeecgController<SmsCheckCust
         smsCheckCustomerDataLog.setDataId(byId.getDataId());
         boolean saveLog = checkCustomerDataLogService.saveOrUpdate(smsCheckCustomerDataLog);
         boolean saveData = customerDataService.saveOrUpdate(smsCheckCustomerData);
+
+        //如果id不是空的 则存在以前数据
+        if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getId())){
+            SmsCheckCustomerDataLog byId1 = checkCustomerDataLogService.getById(smsCheckCustomerDataLog.getId());
+            Map<String, Object> diffProperties = ObjectComparator.compareObjects(person1, person2);
+            for (Map.Entry<String, Object> entry : diffProperties.entrySet()) {
+                System.out.println("Property: " + entry.getKey() + ", Value: " + entry.getValue());
+            }
+        }
+
+
+
+
+
+
         if (saveLog && saveData){
             Map<String, String> mapByResult = getMapByResult(smsCheckCustomerDataLog);
             // 修改客户状态为     未完善/未上传

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

@@ -408,6 +408,36 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
             }else {
                 smsCheckCustomerDataAndLog.setCorporationCard("无");
             }
+            //是否有合同资料
+            if (smsCheckCustomerDataAndLog.getContractDate()!=null &&!smsCheckCustomerDataAndLog.getContractDate().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setContractDate("有");
+            }else {
+                smsCheckCustomerDataAndLog.setContractDate("无");
+            }
+            //是否有营业执照资料
+            if (smsCheckCustomerDataAndLog.getBusinessLicenseDate()!=null &&!smsCheckCustomerDataAndLog.getBusinessLicenseDate().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setBusinessLicenseDate("有");
+            }else {
+                smsCheckCustomerDataAndLog.setBusinessLicenseDate("无");
+            }
+            //是否有码号证书资料
+            if (smsCheckCustomerDataAndLog.getCodeNumberDate()!=null &&!smsCheckCustomerDataAndLog.getCodeNumberDate().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setCodeNumberDate("有");
+            }else {
+                smsCheckCustomerDataAndLog.setCodeNumberDate("无");
+            }
+            //是否有备案通知稽核资料
+            if (smsCheckCustomerDataAndLog.getFilingsDate()!=null &&!smsCheckCustomerDataAndLog.getFilingsDate().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setFilingsDate("有");
+            }else {
+                smsCheckCustomerDataAndLog.setFilingsDate("无");
+            }
+            //是否有增值业务许可证资料
+            if (smsCheckCustomerDataAndLog.getPermitDate()!=null &&!smsCheckCustomerDataAndLog.getPermitDate().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setPermitDate("有");
+            }else {
+                smsCheckCustomerDataAndLog.setPermitDate("无");
+            }
             //是否有责任人授权书证件
             if (smsCheckCustomerDataAndLog.getPersonResponsible()!=null &&!smsCheckCustomerDataAndLog.getPersonResponsible().equals("[{}]")){
                 smsCheckCustomerDataAndLog.setPersonResponsible("有");

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

@@ -382,7 +382,7 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
             boolean b = smsCheckCustomerInfoErrorService.saveOrUpdateBatch(smsCheckCustomerInfoErrors);
             int i=0;
         }
-        return Result.OK("导入成功！导入条数" + customerCount, listErro);
+        return Result.OK("导入成功！导入成功条数" + customerCount+"。 导入失败条数"+(list.size()-customerCount), listErro);
     }
 
     /**

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

@@ -10,6 +10,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
+import java.util.Objects;
 
 @Data
 public class SmsCheckCustomerDataAndLog  {
@@ -42,13 +43,17 @@ public class SmsCheckCustomerDataAndLog  {
     @Excel(name = "用户发展员工", width = 15)
     @ApiModelProperty(value = "用户发展员工")
     private String staffNo;
-    @ApiModelProperty(value = "基础信息稽核")
-    private String infoResult;
 
+    @ApiModelProperty(value = " 客户名称(全)")
+    @Excel(name = "客户名称", width = 15)
+    private String customerName;
     @Excel(name = "稽核状态", width = 15, dicCode = "sms_check_check_state")
     @Dict(dicCode = "sms_check_check_state")
     @ApiModelProperty(value = "稽核状态")
     private Integer checkState;
+    @ApiModelProperty(value = "基础信息稽核")
+    @Excel(name = "基础信息稽核结果", width = 15,dicCode = "check_result")
+    private String infoResult;
     @Excel(name = "基础信息稽核备注", width = 15)
     @ApiModelProperty(value = "基础信息稽核备注")
     private String infoResultRemark;
@@ -73,6 +78,22 @@ public class SmsCheckCustomerDataAndLog  {
     @ApiModelProperty(value = " 码号使用单位联系人手机号")
     private String codeNumberContactPhone;
 
+
+
+    @Excel(name = "是否为CSP商", width = 15)
+    @ApiModelProperty(value = " 是否为CSP商")
+    private String isCsp;
+
+
+    @Excel(name = "资料是否完整", width = 15)
+    @ApiModelProperty(value = " 资料是否完整")
+    private String isAll;
+    @Excel(name = "是否完成整改", width = 15)
+    @ApiModelProperty(value = " 是否完成整改")
+    private String isComplete;
+
+
+
     @Excel(name = "合同到期时间", width = 15)
     @ApiModelProperty(value = " 合同到期时间是否")
     private String contractDateDate;
@@ -98,42 +119,90 @@ public class SmsCheckCustomerDataAndLog  {
     private String filingsDateDateIs;
 
 
+    @Excel(name = "码号证书营业执照合同签约方主体是否一致", width = 15)
+    @ApiModelProperty(value = " 码号证书营业执照合同签约方主体是否一致")
+    private String codeNumberBusinessLicense;
+
+    @Excel(name = "签约号码与证书下发码号是否一致", width = 15)
+    @ApiModelProperty(value = " 签约号码与证书下发码号是否一致")
+    private String isSigningNumber;
+
+    
 
+    @Excel(name = "合同资料稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
     @ApiModelProperty(value = "合同到期时间结果")
     private String  contractDateResult;
     @Excel(name = "合同资料稽核备注", width = 15)
     @ApiModelProperty(value = "合同到期时间结果备注")
     private String contractDateResultRemark;
+    @Excel(name = "是否有合同资料", width = 15)
+    @ApiModelProperty(value = "合同到期时间资料")
+    private String contractDate;
+    @Excel(name = "合同资料上传备注", width = 15)
+    @ApiModelProperty(value = "合同到期时间资料备注")
+    private String contractDateRemark;
+
 
+    @Excel(name = "营业执照资料稽核结果", width = 15,dicCode = "check_result")
     @ApiModelProperty(value = "营业执照到期时间结果")
+    @Dict(dicCode = "check_result")
     private String businessLicenseDateResult;
     @Excel(name = "营业执照稽核结果备注", width = 15)
     @ApiModelProperty(value = "营业执照到期时间结果备注")
     private String businessLicenseDateResultRemark;
+    @Excel(name = "是否有营业执照资料", width = 15)
+    @ApiModelProperty(value = " 营业执照到期时间资料")
+    private String businessLicenseDate;
+    @Excel(name = "营业执照资料上传备注", width = 15)
+    @ApiModelProperty(value = " 营业执照到期时间资料备注")
+    private String businessLicenseDateRemark;
+
+
 
     @ApiModelProperty(value = "码号证书到期时间结果")
+    @Dict(dicCode = "check_result")
+    @Excel(name = "码号证书稽核结果", width = 15,dicCode = "check_result")
     private String codeNumberDateResult;
     @Excel(name = "码号证书稽核结果备注", width = 15)
     @ApiModelProperty(value = "码号证书到期时间结果备注")
     private String codeNumberDateResultRemark;
+    @Excel(name = "码号证书到期时间资料备注", width = 15)
+    @ApiModelProperty(value = " 码号证书到期时间资料备注")
+    private String codeNumberDateRemark;
+    @Excel(name = "是否有码号证书到期时间资料", width = 15)
+    @ApiModelProperty(value = " 码号证书到期时间资料")
+    private String codeNumberDate;
 
+    @Excel(name = "备案通知稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    @ApiModelProperty(value = "备案通知到期时间结果")
+    private String filingsDateResult;
     @Excel(name = "备案通知稽核结果备注", width = 15)
     @ApiModelProperty(value = "备案通知到期时间结果备注")
     private String filingsDateResultRemark;
-
-    @ApiModelProperty(value = "备案通知到期时间结果")
-    private String filingsDateResult;
-
-    @Excel(name = "是否为CSP商", width = 15)
-    @ApiModelProperty(value = " 是否为CSP商")
-    private String isCsp;
+    @Excel(name = "是否有备案通知稽核资料", width = 15)
+    @ApiModelProperty(value = " 备案通知到期时间资料")
+    private String filingsDate;
+    @Excel(name = "上传备案通知资料备注", width = 15)
+    @ApiModelProperty(value = " 备案通知到期时间资料备注")
+    private String filingsDateRemark;
 
 
+    @Excel(name = "增值业务许可证资料稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    @ApiModelProperty(value = "增值业务许可证到期时间结果")
+    private String permitDateResult;
     @Excel(name = "增值业务许可证资料稽核备注", width = 15)
     @ApiModelProperty(value = "增值业务许可证到期时间结果备注")
     private String permitDateResultRemark;
-    @ApiModelProperty(value = "增值业务许可证到期时间结果")
-    private String permitDateResult;
+    @Excel(name = "是否有增值业务许可证到期时间资料", width = 15)
+    @ApiModelProperty(value = " 增值业务许可证到期时间资料")
+    private String permitDate;
+    @Excel(name = "上传增值业务许可证资料备注", width = 15)
+    @ApiModelProperty(value = " 增值业务许可证到期时间资料备注")
+    private String permitDateRemark;
+
 
     @Excel(name = "增值业务许可证到期时间", width = 15)
     @ApiModelProperty(value = " 增值业务许可证到期时间是否")
@@ -141,153 +210,176 @@ public class SmsCheckCustomerDataAndLog  {
     @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;
 
+    @Excel(name = "法人/责任人证件 稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
     @ApiModelProperty(value = "是否有法人/责任人证件稽核备注")
     private String corporationCardResult;
     @Excel(name = "法人/责任人证件 稽核备注", width = 15)
     @ApiModelProperty(value = "法人/责任人证件结果备注")
     private String corporationCardResultRemark;
+    @Excel(name = "上传法人/责任人证件资料备注", width = 15)
+    @ApiModelProperty(value = " 法人/责任人证件备注")
+    private String corporationCardRemark;
+    @Excel(name = "是否有法人/责任人证件", width = 15)
+    @ApiModelProperty(value = " 法人/责任人证件")
+    private String corporationCard;
+
 
+    @Excel(name = "责任人授权书证件稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    @ApiModelProperty(value = "责任人授权书结果")
+    private String personResponsibleResult;
     @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 personResponsibleRemark;
+
+
 
+    @Excel(name = "经办人证件稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    @ApiModelProperty(value = "经办人证件稽核结果")
+    private String operatorCardResult;
     @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 operatorCardRemark;
 
 
-    @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 networkAccess;
+    @Excel(name = "入网签报稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    @ApiModelProperty(value = "入网签报稽核结果")
+    private String networkAccessResult;
+    @Excel(name = "入网签报稽核备注", width = 15)
+    @ApiModelProperty(value = "入网签报结果备注")
+    private String networkAccessResultRemark;
+    @Excel(name = "上传入网签报资料备注", width = 15)
+    @ApiModelProperty(value = " 上传入网签报资料备注")
+    private String networkAccessRemark;
+
+
+    @Dict(dicCode = "check_result")
+    @Excel(name = "集团价格审批稽核结果", width = 15,dicCode = "check_result")
+    @ApiModelProperty(value = "集团价格审批结果")
+    private String groupPriceApprovalResult;
+    @Excel(name = "是否有集团价格审批", width = 15)
+    @ApiModelProperty(value = " 集团价格审批")
+    private String groupPriceApproval;
+    @Excel(name = " 集团价格审批稽核备注", width = 15)
+    @ApiModelProperty(value = "集团价格审批结果备注")
+    private String groupPriceApprovalResultRemark;
+    @Excel(name = "上传集团价格审批资料备注", width = 15)
+    @ApiModelProperty(value = " 集团价格审批备注")
+    private String groupPriceApprovalRemark;
 
 
 
+    @Excel(name = "机房设备照片稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    @ApiModelProperty(value = "机房设备照片结果")
+    private String devicePhoneResult;
     @Excel(name = "是否有机房设备照片", width = 15)
     @ApiModelProperty(value = " 机房设备照片")
     private String devicePhone;
-    @ApiModelProperty(value = "机房设备照片结果")
-    private String devicePhoneResult;
+    @Excel(name = "上传有机房设备照片备注", width = 15)
+    @ApiModelProperty(value = " 上传有机房设备照片备注")
+    private String devicePhoneRemark;
     @Excel(name = "机房设备照片稽核备注", width = 15)
     @ApiModelProperty(value = "是否有机房设备照片稽核备注")
     private String devicePhoneResultRemark;
 
 
-    @Excel(name = "是否有短信模板", width = 15)
-    @ApiModelProperty(value = " 短信模板")
-    private String textMessage;
+
+    @Excel(name = "短信模板稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
     @ApiModelProperty(value = "短信模板结果")
     private String textMessageResult;
-    @Excel(name = "是否有短信模板", width = 15)
+    @Excel(name = "是否有短信模板资料", width = 15)
+    @ApiModelProperty(value = " 短信模板")
+    private String textMessage;
+    @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 textMessageRemark;
 
 
+    @Excel(name = "信息安全责任承诺书稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    @ApiModelProperty(value = "信息安全责任承诺书结果")
+    private String secureBookResult;
     @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 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;
-
-
-    @ApiModelProperty(value = " 营业执照到期时间资料备注")
-    private String businessLicenseDateRemark;
-
-
-    @ApiModelProperty(value = " 码号证书到期时间资料备注")
-    private String codeNumberDateRemark;
+    @Excel(name = "上传信息安全责任承诺书资料备注", width = 15)
+    @ApiModelProperty(value = " 信息安全责任承诺书备注")
+    private String secureBookRemark;
 
 
-    @ApiModelProperty(value = " 备案通知到期时间资料备注")
-    private String filingsDateRemark;
+    @Excel(name = "经办人手持身份证照片稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    @ApiModelProperty(value = "经办人手持身份证照片结果")
+    private String operatorCardPhoneResult;
+    @Excel(name = "是否有经办人手持身份证照片（背景需为电信营业厅或白墙）", width = 15)
+    @ApiModelProperty(value = " 经办人手持身份证照片（背景需为电信营业厅或白墙）")
+    private String operatorCardPhone;
+    @Excel(name = "经办人手持身份证照片稽核备注", width = 15)
+    @ApiModelProperty(value = "经办人手持身份证照片结果备注")
+    private String operatorCardPhoneResultRemark;
+    @Excel(name = "上传经办人手持身份证照片资料备注", width = 15)
+    @ApiModelProperty(value = " 经办人手持身份证照片（背景需为电信营业厅或白墙）备注")
+    private String operatorCardPhoneRemark;
 
 
+    @Excel(name = "端口类短信业务责任承诺书稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    @ApiModelProperty(value = "端口类短信业务责任承诺书结果")
+    private String textMessageBookResult;
+    @Excel(name = "是否有端口类短信业务责任承诺书", width = 15)
+    @ApiModelProperty(value = " 端口类短信业务责任承诺书")
+    private String textMessageBook;
+    @Excel(name = " 端口类短信业务责任承诺书稽核备注", width = 15)
+    @ApiModelProperty(value = "是否有端口类短信业务责任承诺书稽核备注")
+    private String textMessageBookResultRemark;
+    @Excel(name = " 上传端口类短信业务责任承诺书资料备注", width = 15)
+    @ApiModelProperty(value = " 上传端口类短信业务责任承诺书资料备注")
+    private String textMessageBookRemark;
 
 
 
-    @ApiModelProperty(value = " 增值业务许可证到期时间资料备注")
-    private String permitDateRemark;
 
+    @Excel(name = "特殊资费审批稽核结果", width = 15,dicCode = "check_result")
+    @Dict(dicCode = "check_result")
+    @ApiModelProperty(value = "特殊资费审批结果")
+    private String specialResult;
+    @Excel(name = "特殊资费审批结果备注", width = 15)
+    @Dict(dicCode = "check_result")
+    @ApiModelProperty(value = "特殊资费审批结果备注")
+    private String specialResultRemark;
+    @Excel(name = "是否有特殊资费审批（标准资费无需提供）", width = 15)
+    @ApiModelProperty(value = " 特殊资费审批（标准资费无需提供）")
+    private String special;
+    @Excel(name = "上传特殊资费审批（标准资费无需提供）资料备注", width = 15)
+    @ApiModelProperty(value = " 特殊资费审批（标准资费无需提供）备注")
+    private String specialRemark;
 
 
     /** 创建人 */
@@ -309,95 +401,5 @@ public class SmsCheckCustomerDataAndLog  {
     /** 所属部门 */
     @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;
-
-    @ApiModelProperty(value = " 责任人授权书备注")
-    private String personResponsibleRemark;
-
-    @ApiModelProperty(value = " 经办人证件备注")
-    private String operatorCardRemark;
-
-    @ApiModelProperty(value = " 经办人手持身份证照片（背景需为电信营业厅或白墙）备注")
-    private String operatorCardPhoneRemark;
-
-    @ApiModelProperty(value = " 机房设备照片备注")
-    private String devicePhoneRemark;
-
-    @ApiModelProperty(value = " 短信模板备注")
-    private String textMessageRemark;
-
-
-    @ApiModelProperty(value = " 端口类短信业务责任承诺书备注")
-    private String textMessageBookRemark;
-
-    @ApiModelProperty(value = " 信息安全责任承诺书备注")
-    private String secureBookRemark;
-
-    @ApiModelProperty(value = " 特殊资费审批（标准资费无需提供）备注")
-    private String specialRemark;
-
-    @ApiModelProperty(value = " 入网签报备注")
-    private String networkAccessRemark;
-
-    @ApiModelProperty(value = " 集团价格审批备注")
-    private String groupPriceApprovalRemark;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 }

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

@@ -245,5 +245,9 @@ public class SmsCheckCustomerInfoError implements Serializable {
     /**客户信息所属类型：1:行短稽核 2：物联网业务稽核 3.复开审批 4.中继线稽核*/
     @ApiModelProperty(value = "客户信息所属稽核")
     private Integer type;
+
+    @Excel(name = "错误原因", width = 15)
+    @ApiModelProperty(value = "错误原因")
+    private String errorMsg;
 }
 

tnc-sms/src/main/java/org/jeecg/modules/smscheck/serialize/DesensitizationSerialize.java

@@ -47,7 +47,13 @@ public class DesensitizationSerialize extends JsonSerializer<String> implements
                 break;
             // 身份证脱敏
             case ID_CARD:
-                jsonGenerator.writeString(DesensitizedUtil.idCardNum(String.valueOf(str), 6, 4));
+                if (StringUtils.isNotBlank(str)){
+                    if (str.length()==18){
+                        jsonGenerator.writeString(DesensitizedUtil.idCardNum(String.valueOf(str), 6, 4));
+                    }else {
+                        jsonGenerator.writeString(StrUtil.hide(str, 1, str.length()-1));
+                    }
+                }
                 break;
             // 固定电话脱敏
             case FIXED_PHONE: