1.特审复开修改

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

@@ -210,18 +210,19 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
         customerInfo.setCheckState(CheckStateCode.CHECK_STSTE_2);
         //获取关停标签
         customerInfo.setShutdownLabel(specialExamination.getShutdownLabel().toString());
+        customerInfo.setShutdownLabelOther(specialExamination.getShutdownLabelOther());
         customerInfo.setShutdownLabelDate(specialExamination.getShutdownTime());
         boolean updateById = infoService.updateById(customerInfo);
         if (updateById) {
             // 发送邮件
             EmailSendMsgHandle emailSendMsgHandle = new EmailSendMsgHandle();
             //liutt3.bj@chinatelecom.cn
-            emailSendMsgHandle.SendMsg("liutt3.bj@chinatelecom.cn",
+   /*         emailSendMsgHandle.SendMsg("liutt3.bj@chinatelecom.cn",
                     customerInfo.getCreateBy() +
                             "提交复开申请", "工号：" + customerInfo.getStaffNo() +
                             " 工单创建人：" + customerInfo.getCreateBy() +
                             " 提交了复开号码为" + customerInfo.getSmsNumber() +
-                            "的复开申请，请及时进行稽核。");
+                            "的复开申请，请及时进行稽核。");*/
         }
         return Result.OK("已成功提交申请");
     }
@@ -672,8 +673,13 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
             if (StringUtils.isNotEmpty(shutdownLabel)) {
                 StringBuilder name = new StringBuilder();
                 String[] split = shutdownLabel.split(",");
+                String nameByValue = "";
                 for (String lable : split) {
-                    String nameByValue = SpecialExaminationReopen.findNameByValue(lable);
+                    if ("999".equals(lable)){
+                        nameByValue = smsCheckCustomerInfo.getShutdownLabelOther();
+                    }else {
+                        nameByValue = SpecialExaminationReopen.findNameByValue(lable);
+                    }
                     name.append(" ").append(nameByValue);
                 }
                 specialExaminationExport.setShutdownLabel(name.toString());

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

@@ -224,6 +224,8 @@ public class SmsCheckCustomerInfo implements Serializable {
    // @Excel(name = "关停标签", width = 15)
     @ApiModelProperty(value = "关停标签)")
     private String shutdownLabel;
+    private String shutdownLabelOther;
+
 
     /**漫游被关停日期(ABM查询)*/
    // @Excel(name = "漫游被关停日期(ABM查询)", width = 15)

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

@@ -53,6 +53,7 @@ public class SmsCheckCustomerSpeciaInfo implements Serializable {
     @Excel(name = "关停标签", width = 15)
     @ApiModelProperty(value = "关停标签)")
     private String shutdownLabel;
+    private String shutdownLabelOther;
     /**漫游被关停日期(ABM查询)*/
     @Excel(name = "漫游被关停日期(ABM查询)", width = 15, format = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "漫游被关停日期(ABM查询))")