打样申请获取数据方法更新

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

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

@@ -1,8 +1,33 @@
 package com.uas.platform.b2b.controller;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.Attach;
+import com.uas.platform.b2b.model.FileUpload;
+import com.uas.platform.b2b.model.PurchaseProofingApproval;
+import com.uas.platform.b2b.model.PurchaseProofingItem;
+import com.uas.platform.b2b.model.PurchaseProofingSend;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.PurchaseProofingService;
@@ -21,21 +46,6 @@ 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;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
-import java.text.SimpleDateFormat;
-import java.util.*;
 
 /**
  * 卖家获取对应的客户打样申请单
@@ -161,6 +171,7 @@ public class SaleSampleController {
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingItemIds(keyword, pageParams);
 	}
+
 	/**
 	 * 作为卖家，分页获取客户的打样申请单（已作废）
 	 *
@@ -195,6 +206,116 @@ public class SaleSampleController {
 		return searchService.searchPurchaseProofingItemIds(keyword, pageParams);
 	}
 
+	/**
+	 * 作为卖家，分页获取客户的打样申请单
+	 * 
+	 * @param json
+	 * @return
+	 */
+	@RequestMapping(value = "/info", method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<PurchaseProofingItem> getAllProofingItems(PageParams params, String searchFilter) {
+		logger.log("客户打样申请", "查看所有客户打样申请");
+		PageInfo pageInfo = new PageInfo(params);
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		SearchFilter filters = userService.distribute();
+		if (filters != null && filters.getDistribute() == null) {
+			return null;
+		}
+		if (filters != null && !CollectionUtils.isEmpty(filters.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			for (Object object : filters.getDistribute()) {
+				list.add(object);
+			}
+			filter.setDistribute(list);
+		}
+		return purchaseProofingService.findByPageInfo(pageInfo, null, filter);
+	}
+
+	/**
+	 * 作为卖家，分页获取客户的打样申请单（待处理）
+	 * 
+	 * @param json
+	 * @return
+	 */
+	@RequestMapping(value = "/info", method = RequestMethod.GET, params = RequestState.TODO)
+	@ResponseBody
+	public SPage<PurchaseProofingItem> getTodoItems(PageParams params, String searchFilter) {
+		// 我作为卖家，把我的企业ID作为供应商ID传入
+		logger.log("客户打样申请", "查看客户打样申请（待处理）");
+		PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("status", Status.UNSEND.value());
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		SearchFilter filters = userService.distribute();
+		if (filters != null && filters.getDistribute() == null) {
+			return null;
+		}
+		if (filters != null && !CollectionUtils.isEmpty(filters.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			for (Object object : filters.getDistribute()) {
+				list.add(object);
+			}
+			filter.setDistribute(list);
+		}
+		return purchaseProofingService.findByPageInfo(pageInfo, null, filter);
+	}
+
+	/**
+	 * 作为卖家，分页获取客户的打样申请单（已处理）
+	 * 
+	 * @param json
+	 * @return
+	 */
+	@RequestMapping(value = "/info", method = RequestMethod.GET, params = RequestState.DONE)
+	@ResponseBody
+	public SPage<PurchaseProofingItem> getDoneItems(PageParams params, String searchFilter) {
+		// 我作为卖家，把我的企业ID作为供应商ID传入
+		logger.log("客户打样申请", "查看客户打样申请（已处理）");
+		PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("status", Status.SEND.value());
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		SearchFilter filters = userService.distribute();
+		if (filters != null && filters.getDistribute() == null) {
+			return null;
+		}
+		if (filters != null && !CollectionUtils.isEmpty(filters.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			for (Object object : filters.getDistribute()) {
+				list.add(object);
+			}
+			filter.setDistribute(list);
+		}
+		return purchaseProofingService.findByPageInfo(pageInfo, null, filter);
+	}
+
+	/**
+	 * 作为卖家，分页获取客户的打样申请单（已作废）
+	 *
+	 * @param json
+	 * @return
+	 */
+	@RequestMapping(value = "/info", method = RequestMethod.GET, params = RequestState.INVALID)
+	@ResponseBody
+	public SPage<PurchaseProofingItem> getInvalidItems(PageParams params, String searchFilter) {
+		// 我作为卖家，把我的企业ID作为供应商ID传入
+		logger.log("客户打样申请", "查看客户打样申请（已作废）");
+		PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("status", Status.CANCELLED.value());
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		SearchFilter filters = userService.distribute();
+		if (filters != null && filters.getDistribute() == null) {
+			return null;
+		}
+		if (filters != null && !CollectionUtils.isEmpty(filters.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			for (Object object : filters.getDistribute()) {
+				list.add(object);
+			}
+			filter.setDistribute(list);
+		}
+		return purchaseProofingService.findByPageInfo(pageInfo, null, filter);
+	}
+
 	/**
 	 * 作为卖家，根据打样申请明细ID查找客户客户打样申请明细
 	 * 

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

@@ -12,6 +12,7 @@ import com.uas.platform.b2b.model.PurchaseProofingItemTodo;
 import com.uas.platform.b2b.model.PurchaseProofingSend;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.core.model.PageInfo;
+import com.uas.search.b2b.model.SPage;
 
 public interface PurchaseProofingService {
 
@@ -54,6 +55,16 @@ public interface PurchaseProofingService {
 	 */
 	public Page<PurchaseProofingItem> findAllByPageInfo(PageInfo pageInfo, String keyword, SearchFilter filter);
 	
+	/**
+	 * 分页查找客户打样申请（全部）
+	 * 
+	 * @param pageInfo
+	 * @param keyword
+	 * @param filter
+	 * @return
+	 */
+	public SPage<PurchaseProofingItem> findByPageInfo(PageInfo pageInfo, String keyword, SearchFilter filter);
+
 	/**
 	 * 分页查找客户打样申请（待处理）
 	 * 

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

@@ -1,10 +1,43 @@
 package com.uas.platform.b2b.service.impl;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+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.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.dao.*;
+import com.uas.platform.b2b.dao.AttachDao;
+import com.uas.platform.b2b.dao.PurchaseProofingApprovalDao;
+import com.uas.platform.b2b.dao.PurchaseProofingDao;
+import com.uas.platform.b2b.dao.PurchaseProofingItemDao;
+import com.uas.platform.b2b.dao.PurchaseProofingItemDoneDao;
+import com.uas.platform.b2b.dao.PurchaseProofingItemTodoDao;
+import com.uas.platform.b2b.dao.PurchaseProofingSendDao;
+import com.uas.platform.b2b.dao.UserBaseInfoDao;
 import com.uas.platform.b2b.event.PurchaseProofingApprovalSaveEvent;
 import com.uas.platform.b2b.event.PurchaseProofingItemSaveEvent;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.Attach;
+import com.uas.platform.b2b.model.PurchaseProofing;
+import com.uas.platform.b2b.model.PurchaseProofingApproval;
+import com.uas.platform.b2b.model.PurchaseProofingItem;
+import com.uas.platform.b2b.model.PurchaseProofingItemDone;
+import com.uas.platform.b2b.model.PurchaseProofingItemTodo;
+import com.uas.platform.b2b.model.PurchaseProofingSend;
+import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.model.UserBaseInfo;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseProofingService;
 import com.uas.platform.b2b.support.SystemSession;
@@ -14,22 +47,7 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.search.b2b.model.PageParams;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-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.ArrayList;
-import java.util.Date;
-import java.util.List;
+import com.uas.search.b2b.model.SPage;
 
 @Service
 public class PurchaseProofingServiceImpl implements PurchaseProofingService {
@@ -240,6 +258,18 @@ public class PurchaseProofingServiceImpl implements PurchaseProofingService {
 		}, pageInfo);
 	}
 
+	@Override
+	public SPage<PurchaseProofingItem> findByPageInfo(PageInfo pageInfo, String keyword, SearchFilter filter) {
+		SPage<PurchaseProofingItem> proofItems = new SPage<PurchaseProofingItem>();
+		Page<PurchaseProofingItem> items = findAllByPageInfo(pageInfo, keyword, filter);
+		proofItems.setContent(items.getContent());
+		proofItems.setPage(items.getNumber());
+		proofItems.setSize(items.getSize());
+		proofItems.setTotalElement(items.getTotalElements());
+		proofItems.setTotalPage(items.getTotalPages());
+		return proofItems;
+	}
+
 	@Override
 	public PurchaseProofingItem findById(Long id) {
 		return purchaseProofingItemDao.findOne(id);
@@ -510,5 +540,4 @@ public class PurchaseProofingServiceImpl implements PurchaseProofingService {
 		}
 		purchaseProofingItemDao.save(saveItems);
     }
-
 }

src/main/webapp/resources/js/index/app.js

@@ -6327,7 +6327,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 	/**
 	 * 客户打样申请
 	 */
-	app.controller('SaleSampleCtrl', ['$scope', '$filter', 'PurcSample', 'ngTableParams', 'toaster', '$modal', 'BaseService','ReportService', 'Symbol', '$rootScope', function($scope, $filter, PurcSample, ngTableParams, toaster, $modal, BaseService,ReportService, Symbol, $rootScope){
+	app.controller('SaleSampleCtrl', ['$scope', '$filter', 'PurcSample', 'ngTableParams', 'toaster', '$modal', 'BaseService','ReportService', 'Symbol', '$rootScope', 'PurcSampleInfo', function($scope, $filter, PurcSample, ngTableParams, toaster, $modal, BaseService,ReportService, Symbol, $rootScope, PurcSampleInfo){
 		BaseService.scrollBackToTop();
 		if($rootScope.active) {
 			$scope.active = $rootScope.active;
@@ -6371,8 +6371,10 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 					$scope.tableParams.page(1);
 			}
 		};
+		
+		$scope.SearchMethod = false;
 		var getService = function() {
-			return PurcSample;
+			return $scope.SearchMethod ? PurcSample : PurcSampleInfo;
 		};
 		
 		$scope.tableParams = new ngTableParams({
@@ -6479,6 +6481,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		
 		// 搜索框回车
 		$scope.onSearch = function() {
+			$scope.SearchMethod = true;
 			$scope.tableParams.page(1);
 			$scope.tableParams.reload();
 		};

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

@@ -611,6 +611,24 @@ define([ 'ngResource'], function() {
                 }
 			}
 		});
+	}]).factory('PurcSampleInfo', ['$resource', function($resource) {
+		return $resource('sale/sample/info', {}, {
+			getTodo: {
+				params: {
+					_state: 'todo'
+				}
+			},
+			getDone: {
+				params: {
+					_state: 'done'
+				}
+			},
+            getInvalid: {
+                params: {
+                    _state: 'invalid'
+                }
+			}
+		});
 	}]).factory('PurcApproval', ['$resource', function($resource) {
 		return $resource('sale/sample/approval/:id', {}, {
 			getItem: {