中继线营业执照

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

@@ -816,6 +816,9 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
             if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getIsPriceApprovalResult()) && !smsCheckCustomerDataAndLog.getIsPriceApprovalResult().equals(smsCheckCustomerDataLogBill.getIsPriceApprovalResult())) {
                 smsCheckCustomerDataAndLog.setIsPriceApprovalResult("是");
             }
+            if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getCenterBusinessResult()) && !smsCheckCustomerDataAndLog.getIsPriceApprovalResult().equals(smsCheckCustomerDataLogBill.getIsPriceApprovalResult())) {
+                smsCheckCustomerDataAndLog.setIsPriceApprovalResult("是");
+            }
             if (StringUtils.isNotBlank(smsCheckCustomerDataAndLog.getLegalIdCardResult()) && !smsCheckCustomerDataAndLog.getLegalIdCardResult().equals(smsCheckCustomerDataLogBill.getLegalIdCardResult())) {
                 smsCheckCustomerDataAndLog.setLegalIdCardResultIs("是");
             }
@@ -966,6 +969,11 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
             } else {
                 smsCheckCustomerDataAndLog.setTrunkContract("无");
             }
+            if (smsCheckCustomerDataAndLog.getBusinessLicense() != null && !smsCheckCustomerDataAndLog.getBusinessLicense().equals("[{}]")) {
+                smsCheckCustomerDataAndLog.setBusinessLicense("有");
+            } else {
+                smsCheckCustomerDataAndLog.setBusinessLicense("无");
+            }
             if (smsCheckCustomerDataAndLog.getThreePhotos() != null && !smsCheckCustomerDataAndLog.getThreePhotos().equals("[{}]")) {
                 smsCheckCustomerDataAndLog.setThreePhotos("有");
             } else {

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

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

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

@@ -41,6 +41,12 @@ public class SmcTruckCheckLog implements Serializable {
     private String applySignResult;
     @ApiModelProperty(value = "入网申请签报稽核结果备注")
     private String applySignResultRemark;
+
+    @ApiModelProperty(value = "入网申请签报稽核结果")
+    private String businessLicenseResult;
+    @ApiModelProperty(value = "入网申请签报稽核结果备注")
+    private String businessLicenseResultRemark;
+
     //三张现场照片 threePhotos
     @ApiModelProperty(value = "三张现场照片稽核结果")
     private String threePhotosResult;

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

@@ -34,8 +34,7 @@ public class SmsTruckCheckCustomerDataAndLog {
 
 
     private String control;
-    /** 客户营业执照 */
-    private String businessLicense;
+
     /** 经办人介绍信和身份证复印件 */
     private String idCard;
     /** 标准文本合同 */
@@ -310,6 +309,16 @@ public class SmsTruckCheckCustomerDataAndLog {
     @Excel(name = "中继线合同备注", width = 15)
     private String trunkContractRemark;
 
+    @Excel(name = "营业执照上传资料", width = 15)
+    private String businessLicense;
+    //入网申请签报备注
+    @Excel(name = "营业执照上传资料备注")
+    private String businessLicenseRemark;
+    @Excel(name = "营业执照上传资料稽核结果")
+    @Dict(dicCode = "check_result")
+    private String businessLicenseResult;
+    @Excel(name = "营业执照上传资料稽核结果备注")
+    private String businessLicenseResultRemark;
     //中继线合同
     @Dict(dicCode = "check_result")
     @Excel(name = "中继线合同稽核结果", width = 15,dicCode = "check_result")

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

@@ -43,6 +43,11 @@ public class SmsTruckCheckCustomerDataLogBill {
     //责任承诺书
     private String commitmentBookResult;
     private String commitmentBookResultRemark;
+
+    //责任承诺书
+    private String businessLicenseResult;
+    private String businessLicenseResultRemark;
+
     //突破客户经理管控价是否有固网价格审批
     private String isPriceApprovalResult;
     private String isPriceApprovalResultRemark;

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

@@ -36,8 +36,7 @@ public class SmsTruckCustomerData implements Serializable {
     private String scene;
 
     private String control;
-    /** 客户营业执照 */
-    private String businessLicense;
+
     /** 经办人介绍信和身份证复印件 */
     private String idCard;
     /** 标准文本合同 */
@@ -139,6 +138,16 @@ public class SmsTruckCustomerData implements Serializable {
     //入网申请签报备注
     @ApiModelProperty(value = "入网申请签报备注")
     private String applySignRemark;
+
+
+    @MyCustomAnnotation
+    @ApiModelProperty(value = "营业执照上传资料")
+    private String businessLicense;
+    //入网申请签报备注
+    @ApiModelProperty(value = "营业执照备注")
+    private String businessLicenseRemark;
+
+
     //三张现场照片 threePhotos
     @MyCustomAnnotation
     @ApiModelProperty(value = "三张现场照片上传资料")