ods调整

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/oqs/issue/CardQueryManagerImpl.java

@@ -45,20 +45,27 @@ public class CardQueryManagerImpl  extends AbstractManager implements CardQueryM
     private OqsCardQueryResponse listByVehicleIdInUse(OqsCardQueryRequest req) {
         List<DsiCardInfo> dsiCardInfos = dsiCardInfoRepo.listByVehicleIdInUse(req.getVehicleId());
         List<QtkCardInfo> qtkCardInfos = qtkCardInfoRepo.listByVehicleIdInUse(req.getVehicleId(), new CardStatus[]{CardStatus.ZC,CardStatus.KGS});
+        Boolean flag = true;
         if (CollectionUtils.isEmpty(dsiCardInfos) && !CollectionUtils.isEmpty(qtkCardInfos)){
-            return resHandle(dsiCardInfos, qtkCardInfos);
+            resHandle(qtkCardInfos);
         }
-        return getResponse(dsiCardInfos, qtkCardInfos);
+        if (flag){
+            return getResponse(dsiCardInfos, qtkCardInfos);
+        }else {
+            return new OqsCardQueryResponse();
+        }
+
     }
 
-    private OqsCardQueryResponse resHandle(List<DsiCardInfo> dsiCardInfos, List<QtkCardInfo> qtkCardInfos) {
+    private Boolean resHandle(List<QtkCardInfo> qtkCardInfos) {
         for (QtkCardInfo qtkCardInfo : qtkCardInfos) {
             DsiCardInfo dsiCardInfo = dsiCardInfoRepo.findByCardId(qtkCardInfo.getCardId());
-            if (dsiCardInfo != null && (dsiCardInfo.getStatus() != 1 || dsiCardInfo.getStatus() != 6)) {
-                return new OqsCardQueryResponse();
+            if (dsiCardInfo != null && dsiCardInfo.getStatus() != 1 && dsiCardInfo.getStatus() != 6) {
+                continue;
             }
+            return true;
         }
-        return getResponse(dsiCardInfos, qtkCardInfos);
+        return false;
     }
 
     private OqsCardQueryResponse findByCardId(OqsCardQueryRequest req) {