其他材料

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

@@ -848,6 +848,9 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
             if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getAccessPhotoResult()) && !smsCheckCustomerDataAndLog.getAccessPhotoResult().equals(smsCheckCustomerDataLogBill.getAccessPhotoResult())) {
                 smsCheckCustomerDataAndLog.setAccessPhotoIs("是");
             }
+//            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getCommitmentResult()) && !smsCheckCustomerDataAndLog.getCommitmentResult().equals(smsCheckCustomerDataLogBill.getCommitmentResult())) {
+//                smsCheckCustomerDataAndLog.setAccessPhotoIs("是");
+//            }
         }
         LambdaQueryWrapper<SmsCheckZGHistory> lambdaQueryWrapper = new LambdaQueryWrapper<SmsCheckZGHistory>();
         //全部人员

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

@@ -361,6 +361,11 @@ public class SmsTruckCustomerDataController  extends JeecgController<SmsTruckCus
                     map.put("getRiskTableResult","未通过");
                 }
             }
+            if (stepsNowVo.getId().equals("commitment")){
+                if (StringUtils.isNotBlank(smsCheckCustomerDataLog.getCommitmentResult() ) && !smsCheckCustomerDataLog.getCommitmentResult().equals("1")){
+                    map.put("getCommitmentResult","未通过");
+                }
+            }
         }
 
 

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

@@ -106,7 +106,13 @@ public class SmcTruckCheckLog implements Serializable {
     private String trunkContractResultRemark;
 
 
-     private String accessTableResult;
+    //中继线合同
+    @ApiModelProperty(value = "其他资料稽核结果")
+    private String commitmentResult;
+    @ApiModelProperty(value = "其他资料稽核结果备注")
+    private String commitmentResultRemark;
+
+    private String accessTableResult;
      private String accessTableResultRemark;
 
      private String accessPhoneResult;

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

@@ -31,6 +31,9 @@ public class SmsTruckCheckCustomerDataAndLog {
     @Excel(name = "使用场景", width = 15,dicCode = "scene")
     @Dict(dicCode = "scene")
     private String scene;
+
+
+    private String control;
     /** 客户营业执照 */
     private String businessLicense;
     /** 经办人介绍信和身份证复印件 */
@@ -407,6 +410,16 @@ public class SmsTruckCheckCustomerDataAndLog {
     @Excel(name = "电话回访截图是否整改过", width = 15)
     private String accessPhotoIs;
 
+    @Excel(name = "电话回访截图是否整改过", width = 15)
+    private String commitment;
+    @ApiModelProperty(value = "其他资料备注")
+    private String commitmentRemark;
+    //中继线合同
+    @ApiModelProperty(value = "其他资料稽核结果")
+    private String commitmentResult;
+    @ApiModelProperty(value = "其他资料稽核结果备注")
+    private String commitmentResultRemark;
+
 
     @Excel(name = "整改历史", width = 15)
     private String zgShow;

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

@@ -34,6 +34,8 @@ public class SmsTruckCustomerData implements Serializable {
     private Integer customType;
     /** 使用场景;0:办公自用，1:自用型呼叫中心，2:经营型呼叫中心，3:经济型会议电话 */
     private String scene;
+
+    private String control;
     /** 客户营业执照 */
     private String businessLicense;
     /** 经办人介绍信和身份证复印件 */
@@ -237,7 +239,11 @@ public class SmsTruckCustomerData implements Serializable {
     private String accessPhoto;
     @ApiModelProperty(value = "现场回访照片备注")
     private String accessPhotoRemark;
-
+    @MyCustomAnnotation
+    @ApiModelProperty(value = "其他资料上传资料")
+    private String commitment;
+    @ApiModelProperty(value = "其他资料备注")
+    private String commitmentRemark;
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;