采购询价单链接修改

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

@@ -65,15 +65,15 @@ public class SaleInquiryController {
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
 	/**
-	 * 作为卖家，收到的采购询价（全部）
+	 * 作为卖家，收到的采购询价（全部）- 搜索
 	 * 
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryItem> getReceivedPurchaseInquiries(PageParams params, String searchFilter) {
-		logger.log("客户询价单", "查看收到的客户询价单列表（全部）");
+		logger.log("客户询价单", "查看收到的客户询价单列表（全部）- 搜索");
 		JSONObject jsonObject = JSON.parseObject(searchFilter);
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
@@ -97,15 +97,15 @@ public class SaleInquiryController {
 	}
 
 	/**
-	 * 作为卖家，收到的采购询价（待回复）
+	 * 作为卖家，收到的采购询价（待报价）- 搜索
 	 * 
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(params = RequestState.TODO, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", params = RequestState.TODO, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryItem> getTodoInquiries(PageParams params, String searchFilter) {
-		logger.log("客户询价单", "查看收到的客户询价单列表（待回复）");
+		logger.log("客户询价单", "查看收到的客户询价单列表（待报价）- 搜索");
 		JSONObject jsonObject = JSON.parseObject(searchFilter);
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
@@ -131,14 +131,14 @@ public class SaleInquiryController {
 	}
 
 	/**
-	 * 作为卖家，收到的采购询价（已过期）
+	 * 作为卖家，收到的采购询价（已过期）- 搜索
 	 *
 	 * @param params
 	 */
-	@RequestMapping(params = RequestState.END, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", params = RequestState.END, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryItem> getEndInquiries(PageParams params, String searchFilter) {
-		logger.log("客户询价单", "查看收到的客户询价单列表（已过期）");
+		logger.log("客户询价单", "查看收到的客户询价单列表（已过期）- 搜索");
 		JSONObject jsonObject = JSON.parseObject(searchFilter);
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
@@ -167,15 +167,15 @@ public class SaleInquiryController {
 	}
 
 	/**
-	 * 作为卖家，收到的采购询价（已回复）
+	 * 作为卖家，收到的采购询价（已报价）- 搜索
 	 *
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(params = RequestState.DONE, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", params = RequestState.DONE, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryItem> getDoneInquiries(PageParams params, String searchFilter) {
-		logger.log("客户询价单", "查看收到的客户询价单列表（已回复）");
+		logger.log("客户询价单", "查看收到的客户询价单列表（已报价）- 搜索");
 		JSONObject jsonObject = JSON.parseObject(searchFilter);
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
@@ -203,14 +203,14 @@ public class SaleInquiryController {
 	}
 
 	/**
-	 * 作为卖家，收到的采购询价（已失效）
+	 * 作为卖家，收到的采购询价（已失效）- 搜索
 	 *
 	 * @param params
 	 */
-	@RequestMapping(params = RequestState.INVALID, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", params = RequestState.INVALID, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryItem> getInvalidInquiries(PageParams params, String searchFilter) {
-		logger.log("客户询价单", "查看收到的客户询价单列表（已失效）");
+		logger.log("客户询价单", "查看收到的客户询价单列表（已失效）- 搜索");
 		JSONObject jsonObject = JSON.parseObject(searchFilter);
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
@@ -233,15 +233,15 @@ public class SaleInquiryController {
 	}
 
 	/**
-	 * 作为卖家，收到的采购询价（已采纳）
+	 * 作为卖家，收到的采购询价（已采纳）- 搜索
 	 * 
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(params = RequestState.AGREED, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", params = RequestState.AGREED, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryItem> getAgreedInquiries(PageParams params, String searchFilter) {
-		logger.log("客户询价单", "查看收到的客户询价单列表（已采纳）");
+		logger.log("客户询价单", "查看收到的客户询价单列表（已采纳）- 搜索");
 		JSONObject jsonObject = JSON.parseObject(searchFilter);
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
@@ -270,15 +270,15 @@ public class SaleInquiryController {
 	}
 
 	/**
-	 * 作为卖家，收到的采购询价（未采纳）
+	 * 作为卖家，收到的采购询价（未采纳）- 搜索
 	 * 
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(params = RequestState.REFUSED, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/search", params = RequestState.REFUSED, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryItem> getRefusedInquiries(PageParams params, String searchFilter) {
-		logger.log("客户询价单", "查看收到的客户询价单列表（未采纳）");
+		logger.log("客户询价单", "查看收到的客户询价单列表（未采纳）- 搜索");
 		JSONObject jsonObject = JSON.parseObject(searchFilter);
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
@@ -304,12 +304,12 @@ public class SaleInquiryController {
 	}
 
 	/**
-	 * 作为卖家，收到的采购询价（全部）
+	 * 作为卖家，收到的采购询价（全部）不搜索
 	 * 
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/info", method = RequestMethod.GET)
+	@RequestMapping(value = "/info/nosearch", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryItem> getPurchaseInquiries(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "查看收到的客户询价单列表（全部）");
@@ -332,7 +332,7 @@ public class SaleInquiryController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/info", params = RequestState.TODO, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/nosearch", params = RequestState.TODO, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryItem> getPurchaseInquiriesTodo(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "查看收到的客户询价单列表（待报价）");
@@ -358,7 +358,7 @@ public class SaleInquiryController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/info", params = RequestState.END, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/nosearch", params = RequestState.END, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryItem> getPurchaseInquiriesEnd(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "查看收到的客户询价单列表（已过期）");
@@ -378,15 +378,15 @@ public class SaleInquiryController {
 	}
 
 	/**
-	 * 作为卖家，收到的采购询价（已回复）
+	 * 作为卖家，收到的采购询价（已报价）
 	 * 
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/info", params = RequestState.DONE, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/nosearch", params = RequestState.DONE, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryItem> getPurchaseInquiriesDone(PageParams params, String searchFilter) {
-		logger.log("客户询价单", "查看收到的客户询价单列表（已回复）");
+		logger.log("客户询价单", "查看收到的客户询价单列表（已报价）");
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("overdue", Constant.NO);
 		pageInfo.filter("status", Status.REPLIED.value());
@@ -410,10 +410,10 @@ public class SaleInquiryController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/info", params = RequestState.INVALID, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/nosearch", params = RequestState.INVALID, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryItem> getPurchaseInquiriesInvalid(PageParams params, String searchFilter) {
-		logger.log("客户询价单", "查看收到的客户询价单列表（已过期）");
+		logger.log("客户询价单", "查看收到的客户询价单列表（已失效）");
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("overdue", Constant.YES);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
@@ -435,7 +435,7 @@ public class SaleInquiryController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/info", params = RequestState.REFUSED, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/nosearch", params = RequestState.REFUSED, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryItem> getPurchaseInquiriesRefused(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "查看收到的客户询价单列表（未采纳）");
@@ -461,7 +461,7 @@ public class SaleInquiryController {
 	 * @param params
 	 * @return
 	 */
-	@RequestMapping(value = "/info", params = RequestState.AGREED, method = RequestMethod.GET)
+	@RequestMapping(value = "/info/nosearch", params = RequestState.AGREED, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<PurchaseInquiryItem> getPurchaseInquiriesAgreed(PageParams params, String searchFilter) {
 		logger.log("客户询价单", "查看收到的客户询价单列表（已采纳）");
@@ -700,7 +700,7 @@ public class SaleInquiryController {
 
 	/**
 	 *  上传附件
-	 *  @param json
+	 *  @param item
 	 * @param uploadItem
 	 * @return
 	 * @throws Exception