1.拦截入网改造

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

@@ -816,7 +816,21 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
                 return Result.error("新办号码 不可重复!");
             }
         }
+        if (StringUtils.isEmpty(businessReminderCard.getJudgmentStatus())){
+            return Result.error("未选择选择高危号码上报关停类型");
+        }
+
+        if (Objects.equals(businessReminderCard.getJudgmentStatus(),"3")){
+            if (StringUtils.isEmpty(businessReminderCard.getShutdownType())){
+                return Result.error("未选择关停类型");
+            }
+        }
 
+        if (Objects.equals(businessReminderCard.getJudgmentStatus(),"3") || Objects.equals(businessReminderCard.getJudgmentStatus(),"1")){
+           if (StringUtils.isEmpty( businessReminderCard.getNumberResults())){
+               return Result.error("未选择蓝紫名单");
+           }
+        }
 
         String s = phoneCheck(businessReminderCard.getNewPhone());
         if (!s.isEmpty()){
@@ -829,21 +843,23 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
                 .filter(data -> !data.isEmpty())  // 过滤掉空字符串
                 .toArray(String[]::new);
         Set<String>userIdSet =new HashSet();
-
-        for (String userId : userIdSplit) {
-            if (!businessReminderCard.getJudgmentStatus().equals("2") && StringUtils.isEmpty(userId)){
-                return Result.error("有未输入用户编号");
+        if(!businessReminderCard.getJudgmentStatus().equals("2")){
+            for (String userId : userIdSplit) {
+                if (!businessReminderCard.getJudgmentStatus().equals("2") && StringUtils.isEmpty(userId)){
+                    return Result.error("有未输入用户编号");
+                }
+                if (StringUtils.isNotBlank(userId)){
+                    userIdSet.add(userId);
+                }
             }
-            if (StringUtils.isNotBlank(userId)){
-                userIdSet.add(userId);
+            if (userIdSet.size()!=userIdSplit.length){
+                return Result.error("用户编号 不可重复!");
+            }
+            if (userIdSet.size() != set.size()){
+                return Result.error("新办号码和用户编号数量不一致");
             }
         }
-        if (userIdSet.size()!=userIdSplit.length){
-            return Result.error("用户编号 不可重复!");
-        }
-        if (userIdSet.size() != set.size()){
-            return Result.error("新办号码和用户编号数量不一致");
-        }
+
         boolean save = false;
         String numberResults = businessReminderCard.getNumberResults();
         String judgmentStatus = businessReminderCard.getJudgmentStatus();
@@ -944,44 +960,65 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         if (businessReminderCard.getPhone().contains("*")){
             return Result.error("拨测联系电话必须重新输入，不可出现*号");
         }
-        if (businessReminderCard.getNewPhone().contains("*")){
+        if (businessReminderCard.getNewPhone().contains("*") && !Objects.equals(businessReminderCard.getJudgmentStatus(),"2")){
             return Result.error("修改时新办手机号必须重新输入，不可出现*号");
         }
+
+        if (StringUtils.isEmpty(businessReminderCard.getJudgmentStatus())){
+            return Result.error("未选择选择高危号码上报关停类型");
+        }
+
+        if (Objects.equals(businessReminderCard.getJudgmentStatus(),"3")){
+            if (StringUtils.isEmpty(businessReminderCard.getShutdownType())){
+                return Result.error("未选择关停类型");
+            }
+        }
+
+        if (Objects.equals(businessReminderCard.getJudgmentStatus(),"3") || Objects.equals(businessReminderCard.getJudgmentStatus(),"1")){
+            if (StringUtils.isEmpty( businessReminderCard.getNumberResults())){
+                return Result.error("未选择蓝紫名单");
+            }
+        }
         String newPhone = businessReminderCard.getNewPhone();
         String[] split = newPhone.split(",");
         Set<String>set =new HashSet();
-        for (String s : split) {
-            if (StringUtils.isEmpty(s)){
-                return Result.error("有未输入新办手机号");
+        if (!Objects.equals(businessReminderCard.getJudgmentStatus(),"2")){
+            for (String s : split) {
+                if (StringUtils.isEmpty(s)){
+                    return Result.error("有未输入新办手机号");
+                }
+                set.add(s);
             }
-            set.add(s);
-        }
-        if (set.size()!=split.length){
-            return Result.error("新办号码 不可重复!");
-        }
-        String s = phoneCheck(businessReminderCard.getNewPhone());
-        if (!s.isEmpty()){
-            return Result.error(s);
+            if (set.size()!=split.length){
+                return Result.error("新办号码 不可重复!");
+            }
+            String s = phoneCheck(businessReminderCard.getNewPhone());
+            if (!s.isEmpty()){
+                return Result.error(s);
+            }
+        }else {
+            businessReminderCard.setNewPhone(null);
         }
 
         // 新办号码的用户编号
         String phoneUserId = businessReminderCard.getPhoneUserId();
         String[] userIdSplit = phoneUserId.split(",");
         Set<String>userIdSet =new HashSet();
-        for (String userId : userIdSplit) {
-            if (StringUtils.isEmpty(userId)){
-                return Result.error("有未输入用户编号");
+        if (!Objects.equals(businessReminderCard.getJudgmentStatus(),"2")){
+            for (String userId : userIdSplit) {
+                if (StringUtils.isEmpty(userId)){
+                    return Result.error("有未输入用户编号");
+                }
+                userIdSet.add(userId);
+            }
+            if (userIdSet.size()!=userIdSplit.length){
+                return Result.error("用户编号 不可重复!");
+            }
+            if (userIdSet.size() != set.size()){
+                return Result.error("新办号码和用户编号数量不一致");
             }
-            userIdSet.add(userId);
-        }
-        if (userIdSet.size()!=userIdSplit.length){
-            return Result.error("用户编号 不可重复!");
-        }
-        if (userIdSet.size() != set.size()){
-            return Result.error("新办号码和用户编号数量不一致");
         }
 
-
         businessReminderCard.setDelFlag(CommonConstant.DEL_FLAG_0);
         BusinessReminderCard byId = businessReminderCardService.getById(businessReminderCard.getId());
         businessReminderCard.setCardNo(byId.getCardNo());