Merge branch 'feature-suntg-20190125' of ssh://10.10.101.21/source/platform-b2b into dev

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

@@ -47,6 +47,8 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
+import java.io.*;
+import java.net.*;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -207,9 +209,9 @@ public class SaleApCheckController {
      * @return 符合条件的客户信息
      */
     @RequestMapping(value = "/customer", method = RequestMethod.GET)
-    public SPage<Vendor> getCustomers(PageParams params, String keyword, String checkDate, String searchFilter) throws InterruptedException {
+    public SPage<Vendor> getCustomers(PageParams params, String keyword, String checkDate, String searchFilter) throws InterruptedException, UnsupportedEncodingException {
         LOGGER.log("应收对账单", "获取客户信息", "获取所有符合条件的客户");
-        SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+        SearchFilter filter = JSONObject.parseObject(URLDecoder.decode(searchFilter, "UTF-8"), SearchFilter.class);
         return purchaseApCheckService.getCustomerInfo(params, keyword, checkDate, filter.getFromDate(), filter.getEndDate());
     }
 
@@ -283,9 +285,9 @@ public class SaleApCheckController {
 	 * @return SPage<PurchaseApCheck>
 	 */
 	@RequestMapping(value = "/info/search", method = RequestMethod.GET)
-	public SPage<PurchaseApCheck> getPurchaseApChecks(PageParams params, String searchFilter) {
+	public SPage<PurchaseApCheck> getPurchaseApChecks(PageParams params, String searchFilter) throws UnsupportedEncodingException {
 		LOGGER.log("应收对账单", "作为买家，获取全部应收对账单");
-		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		SearchFilter filter = JSONObject.parseObject(URLDecoder.decode(searchFilter, "UTF-8"), SearchFilter.class);
 		if (StringUtils.isEmpty(filter.getKeyword())) {
             PageInfo pageInfo = new PageInfo(params);
             pageInfo.filter("enUu", SystemSession.getUser().getEnterprise().getUu());
@@ -444,7 +446,7 @@ public class SaleApCheckController {
 	 * @return ModelAndView
 	 */
 	@RequestMapping(value = "/xls/list", method = RequestMethod.GET)
-	public ModelAndView exportApCheck(String searchFilter) {
+	public ModelAndView exportApCheck(String searchFilter) throws UnsupportedEncodingException {
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		PageParams params = new PageParams(pageInfo);
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");