增加首页询价单数量的获取

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7551 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/controller/SnapshotController.java

@@ -19,6 +19,7 @@ import com.uas.platform.b2b.service.PurchaseAcceptService;
 import com.uas.platform.b2b.service.PurchaseApBillService;
 import com.uas.platform.b2b.service.PurchaseBadInService;
 import com.uas.platform.b2b.service.PurchaseBadOutService;
+import com.uas.platform.b2b.service.PurchaseInquiryMouldService;
 import com.uas.platform.b2b.service.PurchaseInquiryService;
 import com.uas.platform.b2b.service.PurchaseMRBService;
 import com.uas.platform.b2b.service.PurchaseNoticeService;
@@ -27,6 +28,7 @@ import com.uas.platform.b2b.service.PurchaseOrderService;
 import com.uas.platform.b2b.service.PurchaseProofingService;
 import com.uas.platform.b2b.service.PurchaseReturnService;
 import com.uas.platform.b2b.service.SaleARCheckService;
+import com.uas.platform.b2b.service.SaleQuotationService;
 import com.uas.platform.b2b.support.SystemSession;
 
 /**
@@ -93,6 +95,12 @@ public class SnapshotController {
 	@Autowired
 	private CartService cartService;
 
+	@Autowired
+	private PurchaseInquiryMouldService purchaseInquiryMouldService;
+
+	@Autowired
+	private SaleQuotationService saleQuotationService;
+
 	/**
 	 * 统计待处理事项
 	 * 
@@ -149,6 +157,13 @@ public class SnapshotController {
 
 		// 购物车待处理货物
 		modelMap.put("cartTodo", cartService.getCartTodoCount());
+
+		// 模具询价
+		modelMap.put("inquiryModldTodo",
+				purchaseInquiryMouldService.getNotOfferCountByEnUU(SystemSession.getUser().getEnterprise().getUu()));
+
+		// 主动报价
+		modelMap.put("inquiryTodo", saleQuotationService.getInquiryTodo());
 		return modelMap;
 	}
 

src/main/java/com/uas/platform/b2b/controller/VendorController.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.controller;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -9,6 +10,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.http.HttpStatus;
 import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,14 +22,22 @@ import org.springframework.web.servlet.ModelAndView;
 
 import com.alibaba.fastjson.JSON;
 import com.uas.platform.b2b.model.Distribute;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.model.VendorContact;
+import com.uas.platform.b2b.search.SearchService;
+import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.service.VendorService;
 import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import com.uas.search.b2b.model.MultiValue;
+import com.uas.search.b2b.model.SPage;
+import com.uas.search.b2b.model.Sort;
+import com.uas.search.b2b.model.Sort.Type;
+import com.uas.search.b2b.util.SearchConstants;
 
 /**
  * 供应商、客户
@@ -42,16 +52,36 @@ public class VendorController {
 	@Autowired
 	private VendorService vendorService;
 
+	@Autowired
+	private SearchService searchService;
+
+	@Autowired
+	private UserService userService;
+
 	/**
 	 * 获取供应商
 	 */
 	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
-	public Page<Vendor> getVendors(PageParams params){
+	public SPage<Vendor> getVendors(PageParams params, String keyword) {
 		PageInfo info = new PageInfo(params);
-		info.filter("myEnUU", SystemSession.getUser().getEnterprise().getUu());
-		Page<Vendor> vendors = vendorService.findAllByPageInfo(info);
-		return vendors;
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		pageParams.getFilters().put("ve_myenuu", SystemSession.getUser().getEnterprise().getUu());
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			for (Object object : filter.getDistribute()) {
+				list.add(object);
+			}
+			pageParams.getFilters().put("ve_vendenuu", new MultiValue(list, true));
+		}
+		List<Sort> sortList = new ArrayList<>();
+		sortList.add(new Sort("ve_id", false, Type.LONG, new Long(1)));
+		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+		return searchService.searchVendorCheckIds(keyword, pageParams);
 	}
 	
 	/**

src/main/java/com/uas/platform/b2b/service/SaleQuotationService.java

@@ -90,4 +90,11 @@ public interface SaleQuotationService {
 	 */
 	public Page<SaleQuotationItem> findAllDetailByPageInfo(PageInfo pageInfo, String keyword, SearchFilter filter);
 
+	/**
+	 * 查询待回复的询价单
+	 * 
+	 * @return
+	 */
+	public Long getInquiryTodo();
+
 }

src/main/java/com/uas/platform/b2b/service/impl/PurchaseInquiryMouldServiceImpl.java

@@ -204,7 +204,6 @@ public class PurchaseInquiryMouldServiceImpl implements PurchaseInquiryMouldServ
 
 	@Override
 	public void onReplyDecide(List<PurchaseInquiryMould> inquiryMoulds) {
-		System.out.println("enter decide impl" + JSON.toJSONString(inquiryMoulds));
 		purchaseInquiryMouldDao.save(inquiryMoulds);
 		// 将客户处理报价结果推送通知供应商联系人UU号
 		for (PurchaseInquiryMould mould : inquiryMoulds) {

src/main/java/com/uas/platform/b2b/service/impl/SaleQuotationServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.uas.platform.b2b.core.util.ContextUtils;
+import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.dao.SaleQuotationDao;
 import com.uas.platform.b2b.dao.SaleQuotationItemDao;
 import com.uas.platform.b2b.dao.SaleQuotationItemIndexDao;
@@ -43,6 +44,9 @@ public class SaleQuotationServiceImpl implements SaleQuotationService {
 	@Autowired
 	private SaleQuotationItemIndexDao SaleQuotationItemIndexDao;
 
+	@Autowired
+	private CommonDao commonDao;
+
 	@Override
 	public void save(List<SaleQuotationItem> items) {
 		List<SaleQuotationItem> newItems = saleQuotationItemDao.save(items);
@@ -159,4 +163,14 @@ public class SaleQuotationServiceImpl implements SaleQuotationService {
 		}
 	}
 
+	@Override
+	public Long getInquiryTodo() {
+		Long inquiryTodo = commonDao
+				.queryForObject(
+						"  select count(*) from sale$quotationitem i left join sale$quotation o on o.qu_id = i.qd_quid where o.qu_enuu = "
+								+ SystemSession.getUser().getEnterprise().getUu() + " and o.qu_status = 100",
+						Long.class);
+		return inquiryTodo;
+	}
+
 }