公开招标列表过滤修改

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

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

@@ -37,6 +37,7 @@ import org.springframework.web.servlet.ModelAndView;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 
@@ -369,9 +370,12 @@ public class PurchaseTenderController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
+        pageParams.setNotEqualFilters(map);
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
         pageParams.getFilters().put("pt_ifopen", Constant.YES);
-        return searchService.searchOpenPurcTenderIds(keyword, pageParams);
+        return searchService.searchPurcTenderIds(keyword, pageParams);
     }
 
 

src/main/java/com/uas/platform/b2b/dao/PurchaseInquiryMouldDao.java

@@ -45,7 +45,7 @@ public interface PurchaseInquiryMouldDao
 	public PurchaseInquiryMould findByVenduuAndId(@Param("venduu") long vendUU, @Param("id") long id);
 
 	/**
-	 * 根据企业UU号查询已报价询价单数量
+	 * 根据企业UU号查询已报价模具询价单数量
 	 * 
 	 * @param enUU
 	 * @return
@@ -54,7 +54,7 @@ public interface PurchaseInquiryMouldDao
 	public Long getOfferCountByEnUU(@Param("enuu") long enuu);
 
 	/**
-	 * 根据企业UU查询未报价询价单数量
+	 * 根据企业UU查询未报价模具询价单数量
 	 * 
 	 * @param enUU
 	 * @return

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

@@ -624,7 +624,7 @@ public class TenderServiceImpl implements TenderService {
 //        saleTender.setBidAttaches(attachSet); // 先清掉关联关系
 //        saleTenderDao.save(saleTender);
         if (tenderItems.size() > 0) {
-            saleTender.setStatus("已投标");
+            saleTender.setStatus("待评标");
             saleTender.setModified(new Date());
         }
         List<Attach> attachList = new ArrayList<>();
@@ -673,7 +673,7 @@ public class TenderServiceImpl implements TenderService {
         }
         SaleTender saleTender = saleTenderDao.findOne(saleTenderId);
         if (tenderItems.size() > 0) {
-            saleTender.setStatus("已投标");
+            saleTender.setStatus("待评标");
             saleTender.setModified(new Date());
         }
         saleTenderDao.save(saleTender);
@@ -704,11 +704,20 @@ public class TenderServiceImpl implements TenderService {
     @Override
     public ModelMap decide(List<SaleTenderItem> saleTenderItems) {
         boolean isApply = false;
+        Set<SaleTender> saleTenders = new HashSet<>();
         for (SaleTenderItem tenderItem : saleTenderItems) {
             if (tenderItem.getApplyStatus() != null && tenderItem.getApplyStatus() == Constant.YES) {
                 isApply = true; // 只要有定标的明细，就确认状态为已结标
+                tenderItem = saleTenderItemDao.findOne(tenderItem.getId());
+                tenderItem.getSaleTender().setStatus("已结标");
+                saleTenders.add(tenderItem.getSaleTender());
+            } else if (!"已结标".equals(tenderItem.getSaleTender().getStatus()) && !"流标".equals(tenderItem.getSaleTender().getStatus())) {
+                tenderItem = saleTenderItemDao.findOne(tenderItem.getId());
+                tenderItem.getSaleTender().setStatus("流标");
+                saleTenders.add(tenderItem.getSaleTender());
             }
         }
+        saleTenderDao.save(saleTenders);
         SaleTenderItem tenderItem = saleTenderItemDao.findOne(saleTenderItems.get(0).getId());
         PurchaseTender tender = tenderItem.getTenderProd().getTender();
         if (isApply) {

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

@@ -151,7 +151,7 @@ public class PurchaseTender implements Serializable {
     /**
      * 招标附件
      */
-    @OneToMany(fetch = FetchType.EAGER, cascade = {CascadeType.ALL})
+    @OneToMany(fetch = FetchType.EAGER, cascade = {CascadeType.REFRESH})
     @JoinTable(name = "purc$tenderattach", joinColumns = @JoinColumn(name = "pt_id", referencedColumnName = "pt_id"), inverseJoinColumns = @JoinColumn(name="at_id", referencedColumnName = "at_id"))
     private Set<Attach> tenderAttaches;
 

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

@@ -143,7 +143,7 @@ public class SaleTender implements Serializable, Comparable<SaleTender> {
     /**
      * 投标附件
      */
-    @OneToMany(fetch = FetchType.EAGER, cascade = {CascadeType.ALL})
+    @OneToMany(fetch = FetchType.EAGER, cascade = {CascadeType.REFRESH})
     @JoinTable(name = "sale$tenderattach", joinColumns = @JoinColumn(name = "st_id", referencedColumnName = "st_id"), inverseJoinColumns = @JoinColumn(name="at_id", referencedColumnName = "at_id"))
     private Set<Attach> bidAttaches;
 
@@ -187,7 +187,7 @@ public class SaleTender implements Serializable, Comparable<SaleTender> {
         this.setPayment(tender.getPayment());
         this.setPublishDate(tender.getPublishDate());
         this.setShipAddress(tender.getShipAddress());
-        this.setStatus(tender.getStatus());
+        this.setStatus("待投标");// 转了投标单，默认是待投标状态
         this.setTitle(tender.getTitle());
         this.setUser(tender.getUser());
         this.setUserTel(tender.getUserTel());

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

@@ -272,14 +272,6 @@ public interface SearchService {
 	 */
 	public SPage<PurchaseTender> searchPurcTenderIds(String keyword, PageParams pageParams);
 
-	/**
-	 * 公开招标单
-	 *
-	 * @param keyword
-	 * @param pageParams
-	 * @return
-	 */
-	SPage<PurchaseTender> searchOpenPurcTenderIds(String keyword, PageParams pageParams);
 	/**
 	 * 招标单
 	 *

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

@@ -717,33 +717,6 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 		return toSPage(idsPage, content);
 	}
 
-	/**
-	 *  公开招标单
-	 * @param keyword
-	 * @param pageParams
-	 * @return
-	 */
-	@Override
-	public SPage<PurchaseTender> searchOpenPurcTenderIds(String keyword, PageParams pageParams) {
-		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$TENDER, pageParams);
-		List<PurchaseTender> content = purchaseTenderDao.findAll(idsPage.getContent());
-		List<PurchaseTender> tenderList = new ArrayList<>();
-		Long currentUU = SystemSession.getUser().getEnterprise().getUu();
-		for (PurchaseTender tender : content) {  //过滤掉本企业的公开招标单
-			if (currentUU.intValue() != tender.getEnUU().intValue()) {
-				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);
-	}
 
 	/**
 	 *  erp查看招标单

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

@@ -198,7 +198,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
                 Predicate p2 = builder.equal(root.get("isPublish"), Constant.YES);
                 Predicate p3 = builder.notEqual(root.get("enUU"), SystemSession.getUser().getEnterprise().getUu());
                 Predicate p4 = builder.equal(root.get("overdue"), Constant.NO);
-//                Predicate p5 = builder.equal(root.get("status"), "待投标"); // 只要有人投标就变成了已投标
+//                Predicate p5 = builder.equal(root.get("status"), "待投标"); // 只要有人投标就变成了待评标
                 Predicate predicate = builder.and(p1, p2, p3, p4);
                 query.where(predicate);
                 return null;
@@ -584,7 +584,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
         enterpriseBaseInfoDao.save(enBaseInfo);
         SaleTenderItem item = saleTenderItemDao.findOne(tenderItems.get(0).getId());
         SaleTender saleTender = item.getSaleTender();
-        saleTender.setStatus("已投标");
+        saleTender.setStatus("待评标");
         saleTender.setModified(new Date());
         Set<Attach> attachSet = new HashSet<>();
         attachSet.addAll(attaches);
@@ -675,13 +675,22 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
     @Override
     public void decide(PurchaseTender purchaseTender) {
         boolean isApply = false;
+        Set<SaleTender> saleTenders = new HashSet<>();
         for (PurchaseTenderProd tenderProd : purchaseTender.getPurchaseTenderProds()) {
             for (SaleTenderItem tenderItem : tenderProd.getSaleTenderItems()) {
                 if (tenderItem.getApplyStatus() != null && tenderItem.getApplyStatus() == Constant.YES) {
                     isApply = true; // 只要有定标的明细，就确认状态为已结标
+                    tenderItem = saleTenderItemDao.findOne(tenderItem.getId());
+                    tenderItem.getSaleTender().setStatus("已结标");
+                    saleTenders.add(tenderItem.getSaleTender());
+                } else if (!"已结标".equals(tenderItem.getSaleTender().getStatus()) && !"流标".equals(tenderItem.getSaleTender().getStatus())) {
+                    tenderItem = saleTenderItemDao.findOne(tenderItem.getId());
+                    tenderItem.getSaleTender().setStatus("流标");
+                    saleTenders.add(tenderItem.getSaleTender());
                 }
             }
         }
+        saleTenderDao.save(saleTenders);
         if (isApply) {
             purchaseTender.setStatus("已结标");
         } else {

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

@@ -425,9 +425,6 @@
                     <div ng-if="tender.overdue != 1 && !tender.vendorHasBid">
                         <img src="static/img/tender/daitoubiao.png">
                     </div>
-                    <div ng-if="tender.status == '待发布'">
-                        <img src="static/img/tender/zailuru.png">
-                    </div>
                 </td>
                 <!--<td width="150">-->
                 <!--<div ng-if="tender.status == '已结标' && tender.result == 1 && tender.applyVendor">-->