首页公开招标，显示最近五条

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

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

@@ -13,6 +13,7 @@ import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
+import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.web.bind.RequestState;
@@ -24,6 +25,7 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -626,10 +628,10 @@ public class PurchaseTenderController {
      */
     @RequestMapping(value = "/latestOpenTender", method = RequestMethod.GET)
     @ResponseBody
-    public List<PurchaseTender> getLatestOpenTender() {
-//        PageInfo info = new PageInfo(params);
-//        info.sorting("date", Direction.DESC); // 按发布日期倒序
-        return purchaseTenderService.findOpen();
+    public Page<PurchaseTender> getLatestOpenTender(PageParams params) {
+        PageInfo info = new PageInfo(params);
+        info.sorting("date", org.springframework.data.domain.Sort.Direction.DESC); // 按发布日期倒序
+        return purchaseTenderService.findOpen(info);
     }
 
     /**

src/main/java/com/uas/platform/b2b/erp/controller/TenderController.java

@@ -62,8 +62,6 @@ public class TenderController {
         } else {
             if (null != vendorUUs) {
                 vendorUUs = URLDecoder.decode(vendorUUs, "UTF-8");
-                vendorUUs = "[".concat(vendorUUs);
-                vendorUUs = vendorUUs.concat("]");
                 List<Long> vendUUs = FlexJsonUtils.fromJsonArray(vendorUUs, Long.class);
                 return tenderService.publish(purchaseTender, vendUUs);
             }

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

@@ -1,7 +1,9 @@
 package com.uas.platform.b2b.service;
 
 import com.uas.platform.b2b.model.*;
+import com.uas.platform.core.model.PageInfo;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.data.domain.Page;
 import org.springframework.ui.ModelMap;
 
 import java.util.List;
@@ -96,7 +98,7 @@ public interface PurchaseTenderService {
      */
     List<PurchaseTender> findAll();
 
-    List<PurchaseTender> findOpen();
+    Page<PurchaseTender> findOpen(PageInfo info);
 
     /**
      *  删除指定id招标单

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

@@ -7,11 +7,13 @@ import com.uas.platform.b2b.service.PurchaseTenderService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.temporary.model.PurcTenderProd;
 import com.uas.platform.core.model.Constant;
+import com.uas.platform.core.model.PageInfo;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 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.ui.ModelMap;
@@ -188,7 +190,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
     }
 
     @Override
-    public List<PurchaseTender> findOpen() {
+    public Page<PurchaseTender> findOpen(PageInfo info) {
         return purchaseTenderDao.findAll(new Specification<PurchaseTender>() {
 
             public Predicate toPredicate(Root<PurchaseTender> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
@@ -201,7 +203,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
                 query.where(predicate);
                 return null;
             }
-        });
+        }, info);
     }
 
     @Override

src/main/webapp/resources/js/common/services.js

@@ -175,10 +175,10 @@ define(['angular', 'toaster'], function(angular) {
                     success.call(null, data.content);
                 });
             },
-            getOpenTender: function(success) {
-                var request = $http.get(rootPath + '/tender/latestOpenTender');
+            getOpenTender: function(count, success) {
+                var request = $http.get(rootPath + '/tender/latestOpenTender?page=1&count=' + count);
                 request.success(function(data) {
-                    success.call(null, data);
+                    success.call(null, data.content);
                 });
             },
             getMessage: function(success) {

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

@@ -1498,7 +1498,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         //     });
         // });
 
-        SnapshotService.getOpenTender(function(data){
+        SnapshotService.getOpenTender(5, function(data){
             $scope.openTenders = data;
             var newDate = new Date();
             newDate = newDate.getTime() - 3*24*60*60*1000;