Просмотр исходного кода

feat: 供应商,客户资料对接联系人去重方式更新

hejq 7 лет назад
Родитель
Сommit
ed8ee1f351

+ 36 - 7
src/main/java/com/uas/platform/b2b/model/Vendor.java

@@ -24,6 +24,7 @@ import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.io.*;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -194,13 +195,25 @@ public class Vendor implements Serializable {
      * (针对买家、客户)采购联系人
      */
 	@Transient
-    private Set<VendorContactMan> purchaseContacts = new HashSet<>();
+    private Set<VendorContactMan> buyerContacts = new HashSet<>();
+
+    /**
+     * (针对买家、客户)采购联系人
+     */
+    @Transient
+    private List<String> purchaseContacts = new ArrayList<>();
 
     /**
      * (针对卖家、供应商) 业务对接人
      */
-	@Transient
-    private Set<VendorContactMan> saleContacts = new HashSet<>();
+    @Transient
+    private Set<VendorContactMan> sellerContacts = new HashSet<>();
+
+    /**
+     * (针对卖家、供应商) 业务对接人
+     */
+    @Transient
+    private List<String> saleContacts = new ArrayList<>();
 
     /**
      * 本月应收(前端传入指定月份)
@@ -395,19 +408,35 @@ public class Vendor implements Serializable {
         this.uncheckedCount = uncheckedCount;
     }
 
-    public Set<VendorContactMan> getPurchaseContacts() {
+    public Set<VendorContactMan> getBuyerContacts() {
+        return buyerContacts;
+    }
+
+    public void setBuyerContacts(Set<VendorContactMan> buyerContacts) {
+        this.buyerContacts = buyerContacts;
+    }
+
+    public List<String> getPurchaseContacts() {
         return purchaseContacts;
     }
 
-    public void setPurchaseContacts(Set<VendorContactMan> purchaseContacts) {
+    public void setPurchaseContacts(List<String> purchaseContacts) {
         this.purchaseContacts = purchaseContacts;
     }
 
-    public Set<VendorContactMan> getSaleContacts() {
+    public Set<VendorContactMan> getSellerContacts() {
+        return sellerContacts;
+    }
+
+    public void setSellerContacts(Set<VendorContactMan> sellerContacts) {
+        this.sellerContacts = sellerContacts;
+    }
+
+    public List<String> getSaleContacts() {
         return saleContacts;
     }
 
-    public void setSaleContacts(Set<VendorContactMan> saleContacts) {
+    public void setSaleContacts(List<String> saleContacts) {
         this.saleContacts = saleContacts;
     }
 

+ 5 - 2
src/main/java/com/uas/platform/b2b/service/impl/VendorsServiceImpl.java

@@ -54,6 +54,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * 供应商
@@ -458,7 +459,8 @@ public class VendorsServiceImpl implements VendorService {
                         iterator.remove();
                     }
                 }
-                vendor.setPurchaseContacts(contacts);
+                List<String> contactMans = contacts.stream().map(VendorContactMan::getName).collect(Collectors.toList());
+                vendor.setPurchaseContacts(contactMans);
             });
         }
     }
@@ -511,7 +513,8 @@ public class VendorsServiceImpl implements VendorService {
                         iterator.remove();
                     }
                 }
-                vendor.setSaleContacts(contacts);
+                List<String> contactMans = contacts.stream().map(VendorContactMan::getName).collect(Collectors.toList());
+                vendor.setSaleContacts(contactMans);
             });
         }
     }