消息加载慢问题处理。

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

src/main/java/com/uas/platform/b2b/listener/MessageListener.java

@@ -11,10 +11,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /*
 * *
@@ -57,7 +54,9 @@ public class MessageListener implements ApplicationListener<SaveReleaseEvent<?,
 		Set<Long> userUUs = new HashSet<>(); // 存储需要接收消息的用户UU
 		List<PagingReleaseDetail> otherReleaseDetails = new ArrayList<>(); // 用来保存单据新增的其他消息，推送消息时用。
 		for (PagingReleaseDetail detail : pagingReleaseDetails) {
-			userUUs.add(detail.getVendUserUU()); // 新增的一条，接收人添加到接收用户uu中
+			if (detail.getVendUserUU() != null) {
+				userUUs.add(detail.getVendUserUU()); // 新增的一条，接收人添加到接收用户uu中
+			}
 			PagingRelease release = detail.getPagingRelease();
 			release = pagingReleaseDao.save(release); // 先保存一次主表，不然触发器查询无数据，会报错
 			if (null != detail.getVendUU() && null != release.getEnUU()) {

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

@@ -45,19 +45,19 @@ public class PagingRelease implements Serializable {
     @Column(name = "pr_enuu")
     private Long enUU;
 
-    /**
-     * 采购企业
-     */
-    @OneToOne(cascade = CascadeType.REFRESH)
-    @JoinColumn(name = "pr_enuu", insertable = false, updatable = false)
-    private EnterpriseInfo enterprise;
-
-    /**
-     * 采购单所属采购员
-     */
-    @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "pr_emuu", insertable = false, updatable = false)
-    private User user;
+//    /**
+//     * 采购企业
+//     */
+//    @OneToOne(cascade = CascadeType.REFRESH)
+//    @JoinColumn(name = "pr_enuu", insertable = false, updatable = false)
+//    private EnterpriseInfo enterprise;
+
+//    /**
+//     * 采购单所属采购员
+//     */
+//    @OneToOne(cascade = { CascadeType.REFRESH })
+//    @JoinColumn(name = "pr_emuu", insertable = false, updatable = false)
+//    private User user;
 
     /**
      * 推送时间
@@ -205,21 +205,21 @@ public class PagingRelease implements Serializable {
         this.enUU = enUU;
     }
 
-    public EnterpriseInfo getEnterprise() {
-        return enterprise;
-    }
-
-    public void setEnterprise(EnterpriseInfo enterprise) {
-        this.enterprise = enterprise;
-    }
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
+//    public EnterpriseInfo getEnterprise() {
+//        return enterprise;
+//    }
+//
+//    public void setEnterprise(EnterpriseInfo enterprise) {
+//        this.enterprise = enterprise;
+//    }
+//
+//    public User getUser() {
+//        return user;
+//    }
+//
+//    public void setUser(User user) {
+//        this.user = user;
+//    }
 
     public Date getDate() {
         return date;

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

@@ -32,12 +32,12 @@ public class PagingReleaseDetail implements Serializable{
     @Column(name = "prd_emuu")
     private Long vendUserUU;
 
-    /**
-     * 采购单所属采购员
-     */
-    @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "prd_emuu", insertable = false, updatable = false)
-    private User vendUser;
+//    /**
+//     * 采购单所属采购员
+//     */
+//    @OneToOne(cascade = { CascadeType.REFRESH })
+//    @JoinColumn(name = "prd_emuu", insertable = false, updatable = false)
+//    private User vendUser;
 
     /**
      * 供应商企业UU
@@ -45,12 +45,12 @@ public class PagingReleaseDetail implements Serializable{
     @Column(name = "prd_venduu")
     private Long vendUU;
 
-    /**
-     * 供应商企业
-     */
-    @OneToOne(cascade = CascadeType.REFRESH)
-    @JoinColumn(name = "prd_venduu", insertable = false, updatable = false)
-    private EnterpriseInfo vendor;
+//    /**
+//     * 供应商企业
+//     */
+//    @OneToOne(cascade = CascadeType.REFRESH)
+//    @JoinColumn(name = "prd_venduu", insertable = false, updatable = false)
+//    private EnterpriseInfo vendor;
 
     /**
      * 接收人姓名
@@ -124,13 +124,13 @@ public class PagingReleaseDetail implements Serializable{
         this.vendUserUU = vendUserUU;
     }
 
-    public User getVendUser() {
-        return vendUser;
-    }
-
-    public void setVendUser(User vendUser) {
-        this.vendUser = vendUser;
-    }
+//    public User getVendUser() {
+//        return vendUser;
+//    }
+//
+//    public void setVendUser(User vendUser) {
+//        this.vendUser = vendUser;
+//    }
 
     public Long getVendUU() {
         return vendUU;
@@ -156,13 +156,13 @@ public class PagingReleaseDetail implements Serializable{
         this.vendUserName = vendUserName;
     }
 
-    public EnterpriseInfo getVendor() {
-        return vendor;
-    }
-
-    public void setVendor(EnterpriseInfo vendor) {
-        this.vendor = vendor;
-    }
+//    public EnterpriseInfo getVendor() {
+//        return vendor;
+//    }
+//
+//    public void setVendor(EnterpriseInfo vendor) {
+//        this.vendor = vendor;
+//    }
 
 
     public Short getReadStatus() {

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

@@ -204,11 +204,11 @@
                     </div>
                     <div class="btn-group btn-group-sm">
                         <button type="button" class="btn btn-default btn-line"
-                                ng-class="{'btn-info':active=='done'}" ng-click="setActive('done')">已报价</button>
+                                ng-class="{'btn-info':active=='done'}" ng-click="setActive('done')">已投标</button>
                     </div>
                     <div class="btn-group btn-group-sm">
                         <button type="button" class="btn btn-default btn-line"
-                                ng-class="{'btn-info':active=='todo'}" ng-click="setActive('todo')">待报价</button>
+                                ng-class="{'btn-info':active=='todo'}" ng-click="setActive('todo')">待投标</button>
                     </div>
                     <div class="btn-group btn-group-sm">
                         <button type="button" class="btn btn-default btn-line"