处理打样申请上传的问题

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

@@ -1,26 +1,8 @@
 package com.uas.platform.b2b.controller;
 
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-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.*;
-import org.springframework.web.servlet.ModelAndView;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-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.model.*;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.PurchaseProofingService;
@@ -39,6 +21,18 @@ 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.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * 卖家获取对应的客户打样申请单
@@ -248,13 +242,13 @@ public class SaleSampleController {
 		pageInfo.filter("status", Status.UNSEND.value());
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
-		SearchFilter filters = userService.distribute();
-		if (filters != null && filters.getDistribute() == null) {
+		SearchFilter distribute = userService.distribute();
+		if (distribute != null && distribute.getDistribute() == null) {
 			return null;
 		}
-		if (filters != null && !CollectionUtils.isEmpty(filters.getDistribute())) {
+		if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
 			List<Object> list = new ArrayList<>();
-			for (Object object : filters.getDistribute()) {
+			for (Object object : distribute.getDistribute()) {
 				list.add(object);
 			}
 			filter.setDistribute(list);

src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseSampleServiceImpl.java

@@ -83,7 +83,8 @@ public class PurchaseSampleServiceImpl implements PurchaseSampleService {
 									proofingItem.setVendUserUU(vendor.getVendUserUU());
 							} else
 								proofingItem.setVendUserUU(vendor.getVendUserUU());
-							proofingItem.setErpDate(new Date());
+							proofingItem.setErpDate(new Date(System.currentTimeMillis()));
+							proofingItem.setDate(new Date(System.currentTimeMillis()));
 							proofingItems.add(proofingItem);
 						}
 					}
@@ -97,7 +98,7 @@ public class PurchaseSampleServiceImpl implements PurchaseSampleService {
 	/**
 	 * 添加供应商资料
 	 * 
-	 * @param forecast
+	 * @param proofingItem
 	 */
 	private Vendor addVendor(PurchaseProofingItem proofingItem) {
 		Enterprise enterprise = enterpriseDao.findOne(proofingItem.getVendUU());

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

@@ -9,6 +9,7 @@ import com.uas.platform.b2b.event.PurchaseProofingItemSaveReleaseEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseProofingService;
+import com.uas.platform.b2b.support.SPageUtils;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.XingePusher;
 import com.uas.platform.core.exception.IllegalOperatorException;
@@ -318,14 +319,7 @@ public class PurchaseProofingServiceImpl implements PurchaseProofingService {
 
 	@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;
+		return SPageUtils.covertSPage(findAllByPageInfo(pageInfo, keyword, filter));
 	}
 
 	@Override