|
|
@@ -1,14 +1,64 @@
|
|
|
package com.uas.platform.b2b.service.impl;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.Date;
|
|
|
+import java.util.HashSet;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Set;
|
|
|
+
|
|
|
+import javax.persistence.criteria.CriteriaBuilder;
|
|
|
+import javax.persistence.criteria.CriteriaQuery;
|
|
|
+import javax.persistence.criteria.Predicate;
|
|
|
+import javax.persistence.criteria.Root;
|
|
|
+
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.data.domain.Page;
|
|
|
+import org.springframework.data.domain.Sort.Direction;
|
|
|
+import org.springframework.data.jpa.domain.Specification;
|
|
|
+import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
+import org.springframework.ui.ModelMap;
|
|
|
+import org.springframework.util.CollectionUtils;
|
|
|
+import org.springframework.util.StringUtils;
|
|
|
+
|
|
|
import com.uas.platform.b2b.core.util.ContextUtils;
|
|
|
import com.uas.platform.b2b.core.util.ThreadTask;
|
|
|
import com.uas.platform.b2b.core.util.ThreadUtils;
|
|
|
-import com.uas.platform.b2b.dao.*;
|
|
|
+import com.uas.platform.b2b.dao.AttachDao;
|
|
|
+import com.uas.platform.b2b.dao.CommonDao;
|
|
|
+import com.uas.platform.b2b.dao.DistributeDao;
|
|
|
+import com.uas.platform.b2b.dao.ProductDao;
|
|
|
+import com.uas.platform.b2b.dao.PurcInquiryItemDao;
|
|
|
+import com.uas.platform.b2b.dao.PurchaseInquiryDao;
|
|
|
+import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
|
|
|
+import com.uas.platform.b2b.dao.PurchaseInquiryReplyDao;
|
|
|
+import com.uas.platform.b2b.dao.RoleDao;
|
|
|
+import com.uas.platform.b2b.dao.UserBaseInfoDao;
|
|
|
+import com.uas.platform.b2b.dao.UserDao;
|
|
|
+import com.uas.platform.b2b.dao.UserOrderDao;
|
|
|
+import com.uas.platform.b2b.dao.VendorDao;
|
|
|
import com.uas.platform.b2b.erp.model.Inquiry;
|
|
|
import com.uas.platform.b2b.erp.model.QuotationDown;
|
|
|
import com.uas.platform.b2b.erp.model.QuotationDownDetail;
|
|
|
-import com.uas.platform.b2b.event.*;
|
|
|
-import com.uas.platform.b2b.model.*;
|
|
|
+import com.uas.platform.b2b.event.PurchaseInquiryItemDecideReleaseEvent;
|
|
|
+import com.uas.platform.b2b.event.PurchaseInquiryItemInvalidReleaseEvent;
|
|
|
+import com.uas.platform.b2b.event.PurchaseInquiryItemReplyReleaseEvent;
|
|
|
+import com.uas.platform.b2b.event.PurchaseInquiryItemSaveEvent;
|
|
|
+import com.uas.platform.b2b.event.PurchaseInquiryItemSaveReleaseEvent;
|
|
|
+import com.uas.platform.b2b.model.Attach;
|
|
|
+import com.uas.platform.b2b.model.Distribute;
|
|
|
+import com.uas.platform.b2b.model.FileUpload;
|
|
|
+import com.uas.platform.b2b.model.Product;
|
|
|
+import com.uas.platform.b2b.model.PurcInquiryItem;
|
|
|
+import com.uas.platform.b2b.model.PurchaseInquiry;
|
|
|
+import com.uas.platform.b2b.model.PurchaseInquiryItem;
|
|
|
+import com.uas.platform.b2b.model.PurchaseInquiryReply;
|
|
|
+import com.uas.platform.b2b.model.Role;
|
|
|
+import com.uas.platform.b2b.model.SearchFilter;
|
|
|
+import com.uas.platform.b2b.model.User;
|
|
|
+import com.uas.platform.b2b.model.UserBaseInfo;
|
|
|
+import com.uas.platform.b2b.model.UserOrders;
|
|
|
+import com.uas.platform.b2b.model.Vendor;
|
|
|
import com.uas.platform.b2b.search.SearchService;
|
|
|
import com.uas.platform.b2b.service.AttachService;
|
|
|
import com.uas.platform.b2b.service.PurchaseInquiryService;
|
|
|
@@ -24,21 +74,6 @@ import com.uas.platform.core.model.Status;
|
|
|
import com.uas.platform.core.persistence.criteria.PredicateUtils;
|
|
|
import com.uas.search.b2b.model.PageParams;
|
|
|
import com.uas.search.b2b.model.SPage;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.data.domain.Page;
|
|
|
-import org.springframework.data.domain.Sort.Direction;
|
|
|
-import org.springframework.data.jpa.domain.Specification;
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.transaction.annotation.Transactional;
|
|
|
-import org.springframework.ui.ModelMap;
|
|
|
-import org.springframework.util.CollectionUtils;
|
|
|
-import org.springframework.util.StringUtils;
|
|
|
-
|
|
|
-import javax.persistence.criteria.CriteriaBuilder;
|
|
|
-import javax.persistence.criteria.CriteriaQuery;
|
|
|
-import javax.persistence.criteria.Predicate;
|
|
|
-import javax.persistence.criteria.Root;
|
|
|
-import java.util.*;
|
|
|
|
|
|
|
|
|
@Service
|
|
|
@@ -406,6 +441,8 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
|
|
|
inquiryItem.setStatus((short) Status.REPLIED.value());
|
|
|
inquiryItem.setBackStatus((short) Status.NOT_UPLOAD.value());
|
|
|
inquiryItem.setReplySendStatus((short) Status.NOT_UPLOAD.value());
|
|
|
+ // 将采纳状态设置成申请状态,方便过滤
|
|
|
+ inquiryItem.setDecideStatus((short) Status.UNAUDIT.value());
|
|
|
Long userUU = inquiryItem.getUserUU();
|
|
|
if (userUU == null) {
|
|
|
userUU = item.getInquiry().getRecorderUU();
|