公开招标单过滤时，修改页面参数。加入已过期判断

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

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

@@ -641,19 +641,19 @@ public class PurchaseTenderController {
         return purchaseTenderService.addTenderItemAttaches(uploadItem);
     }
 
-    /**
-     * 查看最近指定招标
-     *
-     * @param params 参数
-     * @return List
-     */
-    @RequestMapping(value = "/latestTender", method = RequestMethod.GET)
-    @ResponseBody
-    public List<PurchaseTender> getLatestTender(PageParams params) {
-//        PageInfo info = new PageInfo(params);
-//        info.sorting("date", Direction.DESC); // 按发布日期倒序
-        return purchaseTenderService.findAll();
-    }
+//    /**
+//     * 查看最近指定招标
+//     *
+//     * @param params 参数
+//     * @return List
+//     */
+//    @RequestMapping(value = "/latestTender", method = RequestMethod.GET)
+//    @ResponseBody
+//    public List<PurchaseTender> getLatestTender(PageParams params) {
+////        PageInfo info = new PageInfo(params);
+////        info.sorting("date", Direction.DESC); // 按发布日期倒序
+//        return purchaseTenderService.findAll();
+//    }
 
     /**
      * 查看最近公开招标

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

@@ -1,16 +1,5 @@
 package com.uas.platform.b2b.erp.controller;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
 import com.uas.platform.b2b.erp.model.QuotationDown;
 import com.uas.platform.b2b.erp.model.QuotationDownDecide;
 import com.uas.platform.b2b.erp.service.QuotationDownService;
@@ -18,6 +7,16 @@ import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
 import com.uas.platform.b2b.service.PurchaseInquiryService;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.List;
 
 /**
  * 对卖家ERP的数据接口<br>

src/main/java/com/uas/platform/b2b/erp/model/Quotation.java

@@ -1,17 +1,12 @@
 package com.uas.platform.b2b.erp.model;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.commons.collections.CollectionUtils;
-
 import com.uas.platform.b2b.model.SaleQuotation;
 import com.uas.platform.b2b.model.SaleQuotationItem;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Status;
+import org.apache.commons.collections.CollectionUtils;
+
+import java.util.*;
 
 /**
  * 供应商主动报价
@@ -178,6 +173,7 @@ public class Quotation {
 		quotation.setBackStatus((short) Status.DOWNLOADED.value());
 		quotation.setStatus((short) Status.SUBMITTED.value());
 		quotation.setTaxrate(this.qu_taxrate);
+		quotation.setErpId(this.qu_id);
 		quotation.setEnvironment(this.qu_environment);
 		Set<SaleQuotationItem> quotationItems = new HashSet<SaleQuotationItem>();
 		if (!CollectionUtils.isEmpty(this.details)) {
@@ -206,7 +202,9 @@ public class Quotation {
 		this.qu_remark = quotation.getRemark();
 		this.qu_useruu = quotation.getUserUU();
 		this.b2b_qu_id = quotation.getId();
-		this.qu_id = quotation.getErpId();
+		if (null != quotation.getErpId()) {
+			this.qu_id = quotation.getErpId();
+		}
 		List<QuotationDetail> details = new ArrayList<QuotationDetail>();
 		if (!CollectionUtils.isEmpty(quotation.getQuotationItems())) {
 			for (SaleQuotationItem item : quotation.getQuotationItems()) {

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

@@ -1,34 +1,20 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.uas.platform.b2b.dao.EnterpriseDao;
-import com.uas.platform.b2b.dao.ProductDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
-import com.uas.platform.b2b.dao.SaleQuotationItemDao;
-import com.uas.platform.b2b.dao.UserDao;
-import com.uas.platform.b2b.dao.VendorDao;
+import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.Inquiry;
 import com.uas.platform.b2b.erp.model.InquiryDecide;
 import com.uas.platform.b2b.erp.model.InquiryDetail;
 import com.uas.platform.b2b.erp.service.InquiryService;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.Product;
-import com.uas.platform.b2b.model.PurchaseInquiry;
-import com.uas.platform.b2b.model.PurchaseInquiryItem;
-import com.uas.platform.b2b.model.SaleQuotation;
-import com.uas.platform.b2b.model.SaleQuotationItem;
-import com.uas.platform.b2b.model.User;
-import com.uas.platform.b2b.model.Vendor;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Status;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class InquiryServiceImpl implements InquiryService {
@@ -162,7 +148,7 @@ public class InquiryServiceImpl implements InquiryService {
 	/**
 	 * 添加供应商资料
 	 * 
-	 * @param order
+	 * @param inquiryItem
 	 */
 	private Vendor addVendor(PurchaseInquiryItem inquiryItem) {
 		Vendor vendor = new Vendor();

src/main/java/com/uas/platform/b2b/model/EnterpriseBaseInfo.java

@@ -72,7 +72,7 @@ public class EnterpriseBaseInfo implements Serializable {
     private String enFax;
 
     /**
-     * 联系人
+     * 联系人（暂时设置为企业系统管理员）
      */
     @Column(name = "en_user")
     private String enUser;

src/main/java/com/uas/platform/b2b/search/SearchServiceImpl.java

@@ -718,6 +718,13 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 				tenderList.add(tender);
 			}
 		}
+		Integer totalElement = tenderList.size(); // 根据新的单据List修改页面参数
+		Integer totalPage = totalElement/idsPage.getSize();
+		if (totalPage < 1) {
+			totalPage = 1;
+		}
+		idsPage.setTotalElement(totalElement);
+		idsPage.setTotalPage(totalPage);
 		sortByProperty(tenderList, PurchaseTender.class, "id", idsPage.getContent());
 		return toSPage(idsPage, tenderList);
 	}

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

@@ -1,51 +1,13 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-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.domain.Sort.Direction;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-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.core.util.ThreadUtils;
-import com.uas.platform.b2b.dao.AttachDao;
-import com.uas.platform.b2b.dao.CommonDao;
-import com.uas.platform.b2b.dao.ProductDao;
-import com.uas.platform.b2b.dao.PurcInquiryItemDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryReplyDao;
-import com.uas.platform.b2b.dao.UserBaseInfoDao;
+import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.Inquiry;
 import com.uas.platform.b2b.erp.model.QuotationDown;
 import com.uas.platform.b2b.erp.model.QuotationDownDetail;
-import com.uas.platform.b2b.event.PurchaseInquiryItemDecideReleaseEvent;
-import com.uas.platform.b2b.event.PurchaseInquiryItemInvalidReleaseEvent;
-import com.uas.platform.b2b.event.PurchaseInquiryItemReplyReleaseEvent;
-import com.uas.platform.b2b.event.PurchaseInquiryItemSaveEvent;
-import com.uas.platform.b2b.event.PurchaseInquiryItemSaveReleaseEvent;
-import com.uas.platform.b2b.model.Attach;
-import com.uas.platform.b2b.model.Product;
-import com.uas.platform.b2b.model.PurcInquiryItem;
-import com.uas.platform.b2b.model.PurchaseInquiry;
-import com.uas.platform.b2b.model.PurchaseInquiryItem;
-import com.uas.platform.b2b.model.PurchaseInquiryReply;
-import com.uas.platform.b2b.model.SearchFilter;
-import com.uas.platform.b2b.model.UserBaseInfo;
+import com.uas.platform.b2b.event.*;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseInquiryService;
 import com.uas.platform.b2b.support.SystemSession;
@@ -59,6 +21,20 @@ 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.domain.Sort.Direction;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+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.*;
 
 @Service
 public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {

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

@@ -2591,7 +2591,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				}
 			}
 		};
-		
 		$scope.removeStep = function(inquiryItem, stepIndex) {
 			inquiryItem.replies.splice(stepIndex, 1);
 			$scope.replyPrices.splice(stepIndex, 1);
@@ -12103,7 +12102,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 $scope.loading  = false;
                 toaster.pop('error', '数据加载失败', response.data);
             });
-        }
+        };
         evaluation();
 
 

src/main/webapp/resources/tpl/index/sale/open_tender_list.html

@@ -175,6 +175,19 @@
         cursor: pointer;
         background-color: #f5f5f5;
     }
+
+    .text-trans{
+        opacity: 1;
+        right: 70px;
+        line-height: 36px;
+        padding: 0;
+    }
+    .overdue{
+        color: #f47a86;
+        border: #f47a86 1px solid;
+        background: transparent;
+    }
+
 </style>
 
 <div class="ng-scope">
@@ -228,6 +241,7 @@
                                     <th colspan="12">
                                         <span>招标标题</span>
                                         <strong>时间</strong>
+                                        <!--<strong>状态</strong>-->
                                     </th>
                                 </tr>
                                 </thead>
@@ -236,6 +250,7 @@
                                     <td ng-click="toDetail(tender.id)">
                                         <span><em>招标公告</em><a ui-sref="baseInfo.open_tender_detail({id:tender.id})" title="点击查看详情">{{tender.title}}</a></span>
                                         <strong>{{tender.date | date:'yyyy-MM-dd'}}</strong>
+                                        <strong  ng-if="tender.overdue == 1" class="text-trans overdue">已过期</strong>
                                     </td>
                                 </tr>
                                 </tbody>