新增回访

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

@@ -555,7 +555,15 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
             if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getTrunkTableResult())&&!smsCheckCustomerDataAndLog.getTrunkTableResult().equals(smsCheckCustomerDataLogBill.getTrunkTableResult())){
                 smsCheckCustomerDataAndLog.setTrunkTableResultIs("是");
             }
-
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getAccessTableResult())&&!smsCheckCustomerDataAndLog.getAccessTableResult().equals(smsCheckCustomerDataLogBill.getAccessTableResult())){
+                smsCheckCustomerDataAndLog.setAccessTableIs("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getAccessPhoneResult())&&!smsCheckCustomerDataAndLog.getAccessPhoneResult().equals(smsCheckCustomerDataLogBill.getAccessPhoneResult())){
+                smsCheckCustomerDataAndLog.setAccessPhoneIs("是");
+            }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getAccessPhotoResult())&&!smsCheckCustomerDataAndLog.getAccessPhotoResult().equals(smsCheckCustomerDataLogBill.getAccessPhotoResult())){
+                smsCheckCustomerDataAndLog.setAccessPhotoIs("是");
+            }
         }
         LambdaQueryWrapper<SmsCheckZGHistory> lambdaQueryWrapper = new LambdaQueryWrapper<SmsCheckZGHistory>();
         //全部人员
@@ -724,6 +732,21 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
             }else {
                 smsCheckCustomerDataAndLog.setTrunkTable("无");
             }
+            if (smsCheckCustomerDataAndLog.getAccessPhoto()!=null &&!smsCheckCustomerDataAndLog.getAccessPhoto().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setAccessPhoto("有");
+            }else {
+                smsCheckCustomerDataAndLog.setAccessPhoto("无");
+            }
+            if (smsCheckCustomerDataAndLog.getAccessTable()!=null &&!smsCheckCustomerDataAndLog.getAccessTable().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setAccessTable("有");
+            }else {
+                smsCheckCustomerDataAndLog.setAccessTable("无");
+            }
+            if (smsCheckCustomerDataAndLog.getAccessPhone()!=null &&!smsCheckCustomerDataAndLog.getAccessPhone().equals("[{}]")){
+                smsCheckCustomerDataAndLog.setAccessPhone("有");
+            }else {
+                smsCheckCustomerDataAndLog.setAccessPhone("无");
+            }
         }
         return exportList;
 

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

@@ -308,6 +308,40 @@ public class SmsTruckCheckCustomerDataAndLog {
     private String trunkContractResultRemark;
 
 
+    @Excel(name = "是否有回访表资料", width = 15)
+    private String accessTable;
+    @Excel(name = "回访表合同备注", width = 15)
+    private String accessTableRemark;
+    @Dict(dicCode = "check_result")
+    @Excel(name = "回访表稽核结果", width = 15,dicCode = "check_result")
+    private String accessTableResult;
+    @Excel(name = "回访表稽核结果备注", width = 15)
+    private String accessTableResultRemark;
+
+    @Excel(name = "是否有电话回访截图资料", width = 15)
+    private String accessPhone;
+    @Excel(name = "电话回访截图备注", width = 15)
+    private String accessPhoneRemark;
+    @Dict(dicCode = "check_result")
+    @Excel(name = "电话回访截图稽核结果", width = 15,dicCode = "check_result")
+    private String accessPhoneResult;
+    @Excel(name = "电话回访截图稽核结果备注", width = 15)
+    private String accessPhoneResultRemark;
+
+    @Excel(name = "是否有现场回访照片资料", width = 15)
+    private String accessPhoto;
+    @Excel(name = "现场回访照片备注", width = 15)
+    private String accessPhotoRemark;
+    @Dict(dicCode = "check_result")
+    @Excel(name = "现场回访照片稽核结果", width = 15,dicCode = "check_result")
+    private String accessPhotoResult;
+    @Excel(name = "现场回访照片稽核结果备注", width = 15)
+    private String accessPhotoResultRemark;
+
+
+
+
+
     @Excel(name = "基本信息稽核稽核是否整改过", width = 15)
     private String infoResultIs;
 
@@ -362,6 +396,18 @@ public class SmsTruckCheckCustomerDataAndLog {
     @Excel(name = "中继线预审表稽核结果是否整改过", width = 15)
     private String trunkTableResultIs;
 
+    @Excel(name = "回访表是否整改过", width = 15)
+    private String accessTableIs;
+
+    @Excel(name = "电话回访截图是否整改过", width = 15)
+    private String accessPhoneIs;
+
+    //中继线预审表
+    @Excel(name = "电话回访截图是否整改过", width = 15)
+    private String accessPhotoIs;
+
+
+    @Excel(name = "整改历史", width = 15)
     private String zgShow;
 
 }

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

@@ -78,4 +78,15 @@ public class SmsTruckCheckCustomerDataLogBill {
     private String trunkContractResultRemark;
     private Date createDate;
 
+
+    private String accessTableResult;
+    private String accessTableResultRemark;
+
+    private String accessPhoneResult;
+    private String accessPhoneResultRemark;
+
+    private String accessPhotoResult;
+    private String accessPhotoResultRemark;
+
+
 }