委外验收单默认取数据方法更新

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

@@ -1,20 +1,7 @@
 package com.uas.platform.b2b.controller;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-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.dubbo.common.utils.CollectionUtils;
+import com.alibaba.dubbo.common.utils.StringUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.MakeAccept;
 import com.uas.platform.b2b.model.SearchFilter;
@@ -22,16 +9,31 @@ import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.MakeAcceptService;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
+import com.uas.platform.b2b.support.SPageUtils;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.search.b2b.model.MultiValue;
 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.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+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.ArrayList;
+import java.util.List;
 
 /**
  * 卖家获取对应的客户委外验收单
@@ -50,6 +52,7 @@ public class MakeAcceptController {
 
 	@Autowired
 	private UserService userService;
+
 	@Autowired
 	private SearchService searchService;
 
@@ -63,28 +66,32 @@ public class MakeAcceptController {
 	@ResponseBody
 	public SPage<MakeAccept> getAllMakeAccepts(PageParams params, String searchFilter) {
 		logger.log("客户委外验收单", "查看收到的客户委外验收单列表（全部 ）");
-		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
-		String keyword = jsonObject.getString("keyword");
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		PageInfo pageInfo = new PageInfo(params);
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-		// 当前登录企业作为供应商
-		pageParams.getFilters().put("ma_venduu", SystemSession.getUser().getEnterprise().getUu());
 		// TODO 其他过滤条件
-		SearchFilter filter = userService.distribute();
-		if (filter != null && filter.getDistribute() == null) {
+		SearchFilter distribute = userService.distribute();
+		if (distribute != null && distribute.getDistribute() == null) {
 			return null;
 		}
-		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+		if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
 			List<Object> list = new ArrayList<>();
-			for (Object object : filter.getDistribute()) {
+			for (Object object : distribute.getDistribute()) {
 				list.add(object);
 			}
 			pageParams.getFilters().put("ma_enuu", new MultiValue(list, true));
+			pageInfo.expression(PredicateUtils.in("enUU", distribute.getDistribute(), true));
 		}
+		if (StringUtils.isEmpty(filter.getKeyword())) {
+		    return SPageUtils.covertSPage(makeAcceptService.findAllByPageInfo(pageInfo, null, filter.getFromDate(), filter.getEndDate()));
+        }
+        // 当前登录企业作为供应商
+        pageParams.getFilters().put("ma_venduu", SystemSession.getUser().getEnterprise().getUu());
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchMakeAcceptIds(keyword, pageParams);
+		return searchService.searchMakeAcceptIds(filter.getKeyword(), pageParams);
 	}
 
 	/**