fan zha 0802

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

@@ -24,10 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
@@ -254,20 +251,27 @@ public class BusinessReminderCardController {
             queryWrapperData.eq(BusinessReminderCard::getId,id);
         }
         List<BusinessReminderCard> businessReminderCard = businessReminderCardService.list(queryWrapperData);
-        int i = 0;
-        for (BusinessReminderCard reminderCard : businessReminderCard) {
-            if (ObjectUtil.isNotNull(reminderCard.getNumberResults())){
-                if (!reminderCard.getNumberResults().contains("1")){
-                    i++;
+        List<BusinessReminderCard> businessReminderCards =new ArrayList<>();
+        if (id==null){
+            int i = 0;
+            for (BusinessReminderCard reminderCard : businessReminderCard) {
+                if (ObjectUtil.isNotNull(reminderCard.getNumberResults())){
+                    if (!reminderCard.getNumberResults().contains("1")){
+                        i++;
+                        if (i>=2){
+//                businessReminderCard.stream().forEach(u->u.setIsSizeNumberResults("is"));
+//                reminderCard.setIsSizeNumberResults("is");
+                            reminderCard.setIsSizeNumberResults("is");
+                            businessReminderCards.add(reminderCard);
+                        }
+                    }
                 }
             }
-            if (i>=2){
-                businessReminderCard.stream().forEach(u->u.setIsSizeNumberResults("is"));
-                reminderCard.setIsSizeNumberResults("is");
-            }
+            return Result.OK(businessReminderCards);
+        }else {
+            return Result.OK(businessReminderCard);
         }
 
-        return Result.OK(businessReminderCard);
 
     }
 

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

@@ -165,4 +165,11 @@ public class BusinessReminderCard {
     private String qita;
 
     private String newBusinessAddress;
+
+    //身份证是否有期
+    private String cardStartTimeAndEnd ;
+    //staffNo
+    private String staffNo;
+    //地址判研
+    private String judgmentResearchAddress;
 }