sunyize 2 years ago
parent
commit
bb5e4f191b

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

@@ -626,6 +626,30 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
 
         for (SmsLotCheckCustomerDataAndLog smsCheckCustomerDataAndLog : exportList) {
 
+            if (smsCheckCustomerDataAndLog.getIsComplete()!=null &&!smsCheckCustomerDataAndLog.getIsComplete().equals("1")){
+                smsCheckCustomerDataAndLog.setIsComplete("是");
+            }
+            if (smsCheckCustomerDataAndLog.getIsComplete()!=null &&!smsCheckCustomerDataAndLog.getIsComplete().equals("0")){
+                smsCheckCustomerDataAndLog.setIsComplete("否");
+            }
+            if (smsCheckCustomerDataAndLog.getIsAll()!=null &&!smsCheckCustomerDataAndLog.getIsAll().equals("1")){
+                smsCheckCustomerDataAndLog.setIsAll("是");
+            }
+            if (smsCheckCustomerDataAndLog.getIsAll()!=null &&!smsCheckCustomerDataAndLog.getIsAll().equals("0")){
+                smsCheckCustomerDataAndLog.setIsAll("否");
+            }
+            if (smsCheckCustomerDataAndLog.getBlockType()!=null &&!smsCheckCustomerDataAndLog.getBlockType().equals("test")){
+                smsCheckCustomerDataAndLog.setBlockType("测试卡");
+            }
+            if (smsCheckCustomerDataAndLog.getBlockType()!=null &&!smsCheckCustomerDataAndLog.getBlockType().equals("model")){
+                smsCheckCustomerDataAndLog.setBlockType("正式卡");
+            }
+            if (smsCheckCustomerDataAndLog.getControl()!=null &&!smsCheckCustomerDataAndLog.getControl().equals("controlY")){
+                smsCheckCustomerDataAndLog.setControl("是");
+            }
+            if (smsCheckCustomerDataAndLog.getControl()!=null &&!smsCheckCustomerDataAndLog.getControl().equals("controlN")){
+                smsCheckCustomerDataAndLog.setControl("无");
+            }
             if (smsCheckCustomerDataAndLog.getTestCard()!=null &&!smsCheckCustomerDataAndLog.getTestCard().equals("[{}]")){
                 smsCheckCustomerDataAndLog.setTestCard("有");
             }else {

+ 22 - 14
tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmsLotCheckCustomerDataAndLog.java

@@ -75,14 +75,26 @@ public class SmsLotCheckCustomerDataAndLog {
     @ApiModelProperty(value = "所属部门")
     private String sysOrgCode;
 
-    private String isAll;
 
-    private String  contractDate;
 
-    private String businessLicenseDate;
 
+    @ApiModelProperty(value = "客户名称(全)")
+    @Excel(name = "客户名称(全)", width = 15)
+    private String customerName;
+    @ApiModelProperty(value = "用户编号")
+    @Excel(name = "用户编号", width = 15)
+    private String userNo;
+    @ApiModelProperty(value = "服务号码(全)")
+    @Excel(name = "服务号码(全)", width = 15)
+    private String smsNumber;
+    @ApiModelProperty(value = "客户编号")
+    @Excel(name = "客户编号", width = 15)
+    private String customerNo;
     @ApiModelProperty(value = "是否完成整改")
+    @Excel(name = "是否完成整改", width = 15)
     private String isComplete;
+    @Excel(name = "资料是否完整", width = 15)
+    private String isAll;
     @ApiModelProperty(value = "使用场景")
     @Excel(name = "使用场景", width = 15)
     private String scene;
@@ -93,18 +105,11 @@ public class SmsLotCheckCustomerDataAndLog {
     @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;
+
+
     @ApiModelProperty(value = "入网时间")
     private String networkAccessTime;
-    @ApiModelProperty(value = "客户名称(全)")
-    private String customerName;
+
     @ApiModelProperty(value = "用户状态")
     private String userState;
     @Excel(name = "员工编号", width = 15)
@@ -152,7 +157,10 @@ public class SmsLotCheckCustomerDataAndLog {
     private Integer commitmentState;
     /**承诺函、其它材料 稽核备注*/
     private String commitmentNote;
-
+    @Excel(name = "合同到期时间", width = 15)
+    private String  contractDate;
+    @Excel(name = "营业执照到期时间", width = 15)
+    private String businessLicenseDate;
 
     @ApiModelProperty(value = "基本信息稽核稽核结果")
     @Excel(name = "基本信息稽核稽核结果", width = 15,dicCode = "check_result")