fix:商机默认返回待报价单据

src/main/java/com/uas/ps/inquiry/service/impl/InquiryForSaleServiceImpl.java

@@ -573,16 +573,18 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
             if (filter.getEndDate() != null) {
                 pageInfo.expression(PredicateUtils.lte("reDate", new Date(filter.getEndDate()), false));
             }
-            if (filter.getEnableOffer() != null && filter.getEnableOffer() == 1) {
+            // 默认返回可报价
+            if (filter.getEnableOffer() != null && filter.getEnableOffer() == 0) {
+                pageInfo.expression(PredicateUtils.lte("endDate", new Date(), false));
+            } else {
                 pageInfo.expression(PredicateUtils.gt("endDate", new Date(), false));
             }
-            // 过滤是否已报价
-            if (filter.getQuoted() != null) {
-                if (filter.getQuoted() == 1) {
-                    pageInfo.expression(PredicateUtils.isNotNull("newId"));
-                } else if (filter.getQuoted() == 0) {
-                    pageInfo.expression(PredicateUtils.isNull("newId"));
-                }
+
+            // 默认返回待报价
+            if (filter.getQuoted() != null && filter.getQuoted() == 1) {
+                pageInfo.expression(PredicateUtils.isNotNull("newId"));
+            } else {
+                pageInfo.expression(PredicateUtils.isNull("newId"));
             }
         }
         Page reminds = remindDao.findAll(new Specification<InquiryRemind>() {
@@ -666,16 +668,18 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
                 pageInfo.filter("remindStatus", 0);
                 isAll = filter.getIsAll();
             }
-            if (filter.getEnableOffer() != null && filter.getEnableOffer() == 1) {
+            // 默认返回可报价
+            if (filter.getEnableOffer() != null && filter.getEnableOffer() == 0) {
+                pageInfo.expression(PredicateUtils.lte("endDate", new Date(), false));
+            } else {
                 pageInfo.expression(PredicateUtils.gt("endDate", new Date(), false));
             }
-            // 过滤是否已报价
-            if (filter.getQuoted() != null) {
-                if (filter.getQuoted() == 1) {
-                    pageInfo.expression(PredicateUtils.isNotNull("newId"));
-                } else if (filter.getQuoted() == 0) {
-                    pageInfo.expression(PredicateUtils.isNull("newId"));
-                }
+
+            // 默认返回待报价
+            if (filter.getQuoted() != null && filter.getQuoted() == 1) {
+                pageInfo.expression(PredicateUtils.isNotNull("newId"));
+            } else {
+                pageInfo.expression(PredicateUtils.isNull("newId"));
             }
         }
         Page reminds = inquiryEnRemindDao.findAll(new Specification<InquiryEnRemind>() {