1.拦截入网改造

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

@@ -846,6 +846,14 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         }
         boolean save = false;
         String numberResults = businessReminderCard.getNumberResults();
+        String judgmentStatus = businessReminderCard.getJudgmentStatus();
+        // 高危且已成功拦截入网不上报蓝紫
+        if (Objects.equals("2",judgmentStatus)){
+            businessReminderCard.setNumberResults(null);
+        }
+        if (!Objects.equals("3",judgmentStatus)){
+            businessReminderCard.setShutdownType(null);
+        }
         if (numberResults.equals("3,4") || numberResults.equals("4,3")){
             // 蓝紫名单进行拆分
             businessReminderCard.setNumberResults("3");
@@ -853,7 +861,6 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
             businessReminderCard.setNumberResults("4");
             businessReminderCard.setId(null);
             save =  businessReminderCardService.save(businessReminderCard);
-
         } else {
             save = businessReminderCardService.save(businessReminderCard);
         }

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

@@ -243,7 +243,10 @@ public class BusinessReminderCard {
     private String judgmentStatus;
     //关停类型
     private String shutdownType;
-;
+    // 工作区域
+    private String wordRegion;
+    // 居住区域
+    private String currentRegion;
 
 
 

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

@@ -35,13 +35,6 @@ public class BusinessReminderCardSelectVo {
     private String commandPerson;
     private String commandPersonNote;
 
-    //CRM系统高危地址证件提示结果
-    private String crmRisk;
-    //CRM系统内客户入网评级展示结果
-    private String crmShow;
-    //记录：新客户 老客户
-    private String isNewOrOld;
-
     //最后强调法律责任后，不敢签字
     private String noSign;
     private String noSignNote;
@@ -268,15 +261,25 @@ public class BusinessReminderCardSelectVo {
     @ApiModelProperty(value = "上报时间")
     @Excel(name = "上报时间", width = 15)
     private Date upTime;
-
-
     private String currentDept;
-
-
     //新版 排查原因
     private String screening;
-
     // 1是new。空不是
     private String isNew;
 
+    //CRM系统高危地址证件提示结果
+    private String crmRisk;
+    //CRM系统内客户入网评级展示结果
+    private String crmShow;
+    //记录：新客户 老客户
+    private String isNewOrOld;
+    //入网研判处置结果
+    private String judgmentStatus;
+    //关停类型
+    private String shutdownType;
+    // 工作区域
+    private String wordRegion;
+    // 居住区域
+    private String currentRegion;
+
 }