代采订单增加下载状态过滤

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

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

@@ -126,14 +126,14 @@ public class DeputyOrderController {
 	}
 	
 	/**
-	 * 分页获取代采订单
+	 * 买家查看代采订单（全部）
 	 * 
 	 * @param params
 	 * @return
 	 */
 	@RequestMapping(value = "/getDeOrder", method = RequestMethod.GET)
 	public SPage<DeputyOrder> getDeOrder(PageParams params, String keyword) {
-		logger.log("客户代采订单", "查看代采订单");
+		logger.log("客户代采订单", "查看代采订单（全部）");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("deo_enuu", SystemSession.getUser().getEnterprise().getUu());
@@ -156,14 +156,14 @@ public class DeputyOrderController {
 	}
 	
 	/**
-	 * 作为卖家，收到的采购询价（待回复）
+	 * 买家查看代采订单（未提交）
 	 * 
 	 * @param params
 	 * @return
 	 */
 	@RequestMapping(value = "/getDeOrder", params = RequestState.TODO, method = RequestMethod.GET)
 	public SPage<DeputyOrder> getDeOrderTodo(PageParams params, String keyword) {
-		logger.log("客户代采订单", "查看代采订单");
+		logger.log("客户代采订单", "查看代采订单（待提交）");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("deo_enuu", SystemSession.getUser().getEnterprise().getUu());
@@ -187,14 +187,45 @@ public class DeputyOrderController {
 	}
 	
 	/**
-	 * 作为卖家，收到的采购询价（待回复）
+	 * 买家查看代采订单（已提交，未下载）
 	 * 
 	 * @param params
 	 * @return
 	 */
 	@RequestMapping(value = "/getDeOrder", params = RequestState.DONE, method = RequestMethod.GET)
 	public SPage<DeputyOrder> getDeOrderDone(PageParams params, String keyword) {
-		logger.log("客户代采订单", "查看代采订单");
+		logger.log("客户代采订单", "查看代采订单（已提交,待下载）");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		// 当前登录企业作为供应商
+		pageParams.getFilters().put("deo_enuu", 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("deo_enuu", new MultiValue(list, true));
+		}
+		pageParams.getFilters().put("deo_entrystatus", "已提交");
+		// 排序条件
+		List<Sort> sortList = new ArrayList<>();
+		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
+		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
+	}
+
+	/**
+	 * 买家查看代采订单（已提交，已下载）
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/getDeOrder", params = RequestState.END, method = RequestMethod.GET)
+	public SPage<DeputyOrder> getDeOrderEnd(PageParams params, String keyword) {
+		logger.log("客户代采订单", "查看代采订单（已提交，已下载）");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("deo_enuu", SystemSession.getUser().getEnterprise().getUu());

src/main/webapp/resources/js/index/services/DeputyOrder.js

@@ -83,6 +83,11 @@ define(['ngResource'], function() {
             	params: {
             		_state: 'done'
             	}
+            },
+            getEnd: {
+            	params: {
+            		_state: 'end'
+            	}
             }
 		})
 	}]);

src/main/webapp/resources/js/index/services/Purc.js

@@ -478,10 +478,10 @@ define([ 'ngResource'], function() {
 		return $resource('sale/return/:id', {}, {
 			getAll: {},
 			getEnterpriseName: {
-				url:"sale/return/:id/enname",
+				url: "sale/return/:id/enname",
 				method: "GET"
 			},
-			getDetail : {
+			getDetail: {
 				url: 'sale/return/:id',
 				method: 'GET'
 			}

src/main/webapp/resources/tpl/index/purc/deputyOrder.html

@@ -192,7 +192,11 @@
                         </div>
                          <div class="btn-group">
                             <button type="button" class="btn btn-select"
-                                    ng-class="{'btn-selected':active=='done'}" ng-click="setActive('done')">已提交</button>
+                                    ng-class="{'btn-selected':active=='done'}" ng-click="setActive('done')">未下载</button>
+                        </div>
+                        <div class="btn-group">
+                            <button type="button" class="btn btn-select"
+                                    ng-class="{'btn-selected':active=='done'}" ng-click="setActive('end')">已下载</button>
                         </div>
                     </div>
                    <!-- <div class="col-xs-1 pull-right" style="padding-top: 5px;">