采购询价单去掉平台过滤，查询所有的询价单

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

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

@@ -43,7 +43,6 @@ import com.uas.search.b2b.util.SearchConstants;
 public class PurcInquiryController {
 
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-	private final String SOURCERAPP = "B2B";
 
 	@Autowired
 	private PurcInquiryService purcInquiryService;
@@ -135,7 +134,6 @@ public class PurcInquiryController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
-		pageParams.getFilters().put("id_sourceapp", SOURCERAPP);
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
@@ -155,7 +153,6 @@ public class PurcInquiryController {
 		pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
 		pageParams.getFilters().put("id_overdue", Constant.NO);
-		pageParams.getFilters().put("id_sourceapp", SOURCERAPP);
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
@@ -174,7 +171,6 @@ public class PurcInquiryController {
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
-		pageParams.getFilters().put("id_sourceapp", SOURCERAPP);
 		pageParams.getFilters().put("id_overdue", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
@@ -194,7 +190,6 @@ public class PurcInquiryController {
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("id_status", Status.REPLIED.value());
-		pageParams.getFilters().put("id_sourceapp", SOURCERAPP);
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);

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

@@ -17,7 +17,6 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
-import com.alibaba.fastjson.JSON;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.ProductDao;
 import com.uas.platform.b2b.dao.PurcInquiryDao;
@@ -63,7 +62,6 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 
 	@Override
 	public ModelMap save(PurcInquiryInfo inquiryInfo, List<VendorAndContact> contacts) {
-		System.out.println(JSON.toJSON(inquiryInfo));
 		ModelMap map = new ModelMap();
 		Long enuu = SystemSession.getUser().getEnterprise().getUu();
 		Long useruu = SystemSession.getUser().getUserUU();
@@ -261,7 +259,14 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 	@Override
 	public ModelMap clearOrder(Long id) {
 		try {
-			inquiryDao.delete(id);
+			PurcInquiry inquiry = inquiryDao.findOne(id);
+			if (inquiry != null) {
+				if (!CollectionUtils.isEmpty(inquiry.getInquiryItems())) {
+					for (PurcInquiryItem item : inquiry.getInquiryItems()) {
+						purcInquiryItemDao.delete(item.getId());
+					}
+				}
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 		}