ERP企业商机显示部分信息即可

src/main/java/com/uas/ps/inquiry/controller/InquiryForSaleController.java

@@ -215,13 +215,13 @@ public class InquiryForSaleController {
      */
     @HttpLog
     @RequestMapping(value = "/enremind", method = RequestMethod.GET)
-    public IPage<InquiryEnRemind> findEnRemind(Long useruu, Long enuu, PageInfo pageInfo, SearchFilter searchFilter, Integer isAll) {
+    public IPage<InquiryEnRemind> findEnRemind(Long useruu, Long enuu, PageInfo pageInfo, SearchFilter searchFilter) {
         if (useruu == null || enuu == null) {
             throw new IllegalAccessError("非法访问");
         } else {
             pageInfo.filter("vendUU", enuu);
             logger.log("公共询价", "查询企业推荐询价信息", null, useruu, enuu, InquirySource.PLAIN.name());
-            return saleService.findEnRemindByPageInfo(pageInfo, searchFilter, isAll);
+            return saleService.findEnRemindByPageInfo(pageInfo, searchFilter);
         }
     }
 

src/main/java/com/uas/ps/inquiry/model/InquiryEnRemind.java

@@ -105,13 +105,13 @@ public class InquiryEnRemind implements Serializable {
     private Date endDate;
 
     /**
-     * 记录来源id
+     * 记录来源公共询价询价明细id
      */
     @Column(name = "ir_itemid")
     private Long itemId;
 
     /**
-     * 记录来源询价单id
+     * 记录来源公共询价询价单id
      */
     @Column(name = "ir_inid")
     private Long inid;
@@ -124,7 +124,7 @@ public class InquiryEnRemind implements Serializable {
     private PurcInquiry inquiry;
 
     /**
-     * 记录转报价后的id
+     * 记录转报价后的明细id
      */
     @Column(name = "ir_newid")
     private Long newId;

src/main/java/com/uas/ps/inquiry/model/InquiryRemind.java

@@ -113,13 +113,13 @@ public class InquiryRemind implements Serializable {
     private Date endDate;
 
     /**
-     * 记录来源id
+     * 记录来源公共询价询价明细id
      */
     @Column(name = "ir_itemid")
     private Long itemId;
 
     /**
-     * 记录来源询价单id
+     * 记录来源公共询价询价单id
      */
     @Column(name = "ir_inid")
     private Long inid;
@@ -132,7 +132,7 @@ public class InquiryRemind implements Serializable {
     private PurcInquiry inquiry;
 
     /**
-     * 记录转报价后的id
+     * 记录转报价后的明细id
      */
     @Column(name = "ir_newid")
     private Long newId;

src/main/java/com/uas/ps/inquiry/service/InquiryForSaleService.java

@@ -117,7 +117,7 @@ public interface InquiryForSaleService {
      * @param searchFilter
      * @return
      */
-    IPage<InquiryEnRemind> findEnRemindByPageInfo(PageInfo pageInfo, SearchFilter searchFilter, Integer isAll);
+    IPage<InquiryEnRemind> findEnRemindByPageInfo(PageInfo pageInfo, SearchFilter searchFilter);
 
     /**
      * 分配商机

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

@@ -586,12 +586,13 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
         return remindIPage;
     }
 
-    public IPage<InquiryEnRemind> findEnRemindByPageInfo(final PageInfo pageInfo, final SearchFilter filter, Integer isAll) {
+    public IPage<InquiryEnRemind> findEnRemindByPageInfo(final PageInfo pageInfo, final SearchFilter filter) {
         Sort sort = new Sort(Sort.Direction.DESC, "date");
         if (pageInfo.getOffset() == 0) {
             pageInfo.setOffset(pageInfo.getPageSize() * (pageInfo.getPageNumber() - 1));
         }
         pageInfo.setSort(sort);
+        Integer isAll = null;
         if (null != filter) {
             if (StringUtils.hasText(filter.getKeyword())) {
                 SimpleExpression title = new SimpleExpression("prodTitle", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
@@ -610,9 +611,10 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
             if (filter.getEndDate() != null) {
                 pageInfo.expression(PredicateUtils.lte("reDate", new Date(filter.getEndDate()), false));
             }
-        }
-        if (!StringUtils.isEmpty(isAll) && isAll == 0) {
-            pageInfo.filter("remindStatus", 0);
+            if (!StringUtils.isEmpty(filter.getIsAll()) && filter.getIsAll() == 0) {
+                pageInfo.filter("remindStatus", 0);
+                isAll = filter.getIsAll();
+            }
         }
         Page reminds = inquiryEnRemindDao.findAll(new Specification<InquiryEnRemind>() {
             public Predicate toPredicate(Root<InquiryEnRemind> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
@@ -620,7 +622,7 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
                 return null;
             }
         }, pageInfo);
-        return covertEnRemindIPage(reminds);
+        return covertEnRemindIPage(reminds, isAll);
     }
 
     @Override
@@ -742,7 +744,7 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
      * @param enReminds 推荐询价信息
      * @return
      */
-    private IPage<InquiryEnRemind> covertEnRemindIPage(Page enReminds) {
+    private IPage<InquiryEnRemind> covertEnRemindIPage(Page enReminds, Integer isAll) {
         IPage<InquiryEnRemind> remindIPage = IPageUtils.covertIgnoreContent(enReminds);
         if (!CollectionUtils.isEmpty(enReminds.getContent())) {
             List<InquiryEnRemind> remindList = enReminds.getContent();
@@ -766,6 +768,10 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
                         remind.setStatus(Status.FINISH.value());
                     }
                 }
+                if (!StringUtils.isEmpty(isAll) && isAll == 0) {
+                    remind.setInquiry(null);
+                    remind.setQuotation(null);
+                }
             }
             remindIPage.setContent(remindList);
         }