日志

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

@@ -903,10 +903,27 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         QueryWrapper<BusinessReminderCardLog> queryWrapper = QueryGenerator.initQueryWrapper(new BusinessReminderCardLog(), request.getParameterMap());
         String businessReminderCardId = request.getParameterMap().get("businessReminderCardId")==null?"":
                 Arrays.toString(request.getParameterMap().get("businessReminderCardId")).replace("[", "").replace("]", "").replace("*", "");
-        queryWrapper.lambda()
-                .eq(BusinessReminderCardLog::getDelFlag, CommonConstant.DEL_FLAG_0)
-                .eq(BusinessReminderCardLog::getBusinessReminderCardId,businessReminderCardId).orderByDesc(BusinessReminderCardLog::getUpdateTime);
-
+        String cardName = request.getParameterMap().get("cardName")==null?"":
+                Arrays.toString(request.getParameterMap().get("cardName")).replace("[", "").replace("]", "").replace("*", "");
+
+        String cardNo = request.getParameterMap().get("cardNo")==null?"":
+                Arrays.toString(request.getParameterMap().get("cardNo")).replace("[", "").replace("]", "").replace("*", "");
+
+        List<String>listIds =new ArrayList<>();
+        if (StringUtils.isNotBlank(cardName) && StringUtils.isNotBlank(cardNo)){
+            LambdaQueryWrapper<BusinessReminderCard> cardQueryWrapper = new LambdaQueryWrapper<BusinessReminderCard>();
+            cardQueryWrapper.eq(BusinessReminderCard::getCardName,cardName).eq(BusinessReminderCard::getCardNo,cardNo);
+            List<BusinessReminderCard> list = businessReminderCardService.list(cardQueryWrapper);
+            for (BusinessReminderCard card : list) {
+                listIds.add(card.getId());
+            }
+            queryWrapper.lambda().in(BusinessReminderCardLog::getBusinessReminderCardId,listIds).orderByDesc(BusinessReminderCardLog::getUpdateTime);
+        }
+        if (StringUtils.isNotBlank(businessReminderCardId)){
+            queryWrapper.lambda()
+                    .eq(BusinessReminderCardLog::getDelFlag, CommonConstant.DEL_FLAG_0)
+                    .eq(BusinessReminderCardLog::getBusinessReminderCardId,businessReminderCardId).orderByDesc(BusinessReminderCardLog::getUpdateTime);
+        }
         List<SysCompany> sysCompanyList =sysCompanyService.list();
         List<BusinessReminderCardLog> list = businessReminderCardLogService.list(queryWrapper);
         Map<String, SysCompany> collect1 = sysCompanyList.stream()